1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## loc.dpatch by Samuel Mimram <smimram@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use new loc name.
@DPATCH@
diff -urNad missinglib-0.4.10.debian~/libsrc/camlp4/pa_bparser.ml missinglib-0.4.10.debian/libsrc/camlp4/pa_bparser.ml
--- missinglib-0.4.10.debian~/libsrc/camlp4/pa_bparser.ml 2004-09-01 01:49:20.000000000 +0200
+++ missinglib-0.4.10.debian/libsrc/camlp4/pa_bparser.ml 2005-12-19 21:27:12.000000000 +0100
@@ -26,8 +26,8 @@
;
value strm_n = "strm__";
-value peek_fun loc = <:expr< Stream.peek >>;
-value junk_fun loc = <:expr< Stream.junk >>;
+value peek_fun _loc = <:expr< Stream.peek >>;
+value junk_fun _loc = <:expr< Stream.junk >>;
(* Parsers. *)
(* In syntax generated, many cases are optimisations. *)
@@ -85,7 +85,7 @@
;
value rec subst v e =
- let loc = MLast.loc_of_expr e in
+ let _loc = MLast.loc_of_expr e in
match e with
[ <:expr< $lid:x$ >> ->
let x = if x = v then strm_n else x in
@@ -108,12 +108,12 @@
value stream_pattern_component skont ckont =
fun
- [ SpTrm loc p wo ->
- <:expr< match $peek_fun loc$ $lid:strm_n$ with
+ [ SpTrm _loc p wo ->
+ <:expr< match $peek_fun _loc$ $lid:strm_n$ with
[ Some $p$ $when:wo$ ->
- do { $junk_fun loc$ $lid:strm_n$; $skont$ }
+ do { $junk_fun _loc$ $lid:strm_n$; $skont$ }
| _ -> $ckont$ ] >>
- | SpNtr loc p e ->
+ | SpNtr _loc p e ->
let e =
match e with
[ <:expr< fun [ ($lid:v$ : Stream.t _) -> $e$ ] >> when v = strm_n -> e
@@ -137,7 +137,7 @@
<:expr< match try Some $e$ with [ Stream.Failure -> None ] with
[ Some $p$ -> $skont$
| _ -> $ckont$ ] >>
- | SpStr loc p ->
+ | SpStr _loc p ->
try
match p with
[ <:patt< $lid:v$ >> -> subst v skont
@@ -146,7 +146,7 @@
[ Not_found -> <:expr< let $p$ = $lid:strm_n$ in $skont$ >> ] ]
;
-value rec stream_pattern loc epo e ekont =
+value rec stream_pattern _loc epo e ekont =
fun
[ [] ->
match epo with
@@ -162,15 +162,15 @@
in
<:expr< raise (Stream.Error $str$) >>
in
- stream_pattern loc epo e ekont spcl
+ stream_pattern _loc epo e ekont spcl
in
let ckont = ekont err in stream_pattern_component skont ckont spc ]
;
-value stream_patterns_term loc ekont tspel =
+value stream_patterns_term _loc ekont tspel =
let pel =
List.map
- (fun (p, w, loc, spcl, epo, e) ->
+ (fun (p, w, _loc, spcl, epo, e) ->
let p = <:patt< Some $p$ >> in
let e =
let ekont err =
@@ -181,37 +181,37 @@
in
<:expr< raise (Stream.Error $str$) >>
in
- let skont = stream_pattern loc epo e ekont spcl in
- <:expr< do { $junk_fun loc$ $lid:strm_n$; $skont$ } >>
+ let skont = stream_pattern _loc epo e ekont spcl in
+ <:expr< do { $junk_fun _loc$ $lid:strm_n$; $skont$ } >>
in
(p, w, e))
tspel
in
let pel = pel @ [(<:patt< _ >>, None, ekont ())] in
- <:expr< match $peek_fun loc$ $lid:strm_n$ with [ $list:pel$ ] >>
+ <:expr< match $peek_fun _loc$ $lid:strm_n$ with [ $list:pel$ ] >>
;
value rec group_terms =
fun
- [ [([(SpTrm loc p w, None) :: spcl], epo, e) :: spel] ->
+ [ [([(SpTrm _loc p w, None) :: spcl], epo, e) :: spel] ->
let (tspel, spel) = group_terms spel in
- ([(p, w, loc, spcl, epo, e) :: tspel], spel)
+ ([(p, w, _loc, spcl, epo, e) :: tspel], spel)
| spel -> ([], spel) ]
;
-value rec parser_cases loc =
+value rec parser_cases _loc =
fun
[ [] -> <:expr< raise Stream.Failure >>
| spel ->
match group_terms spel with
[ ([], [(spcl, epo, e) :: spel]) ->
- stream_pattern loc epo e (fun _ -> parser_cases loc spel) spcl
+ stream_pattern _loc epo e (fun _ -> parser_cases _loc spel) spcl
| (tspel, spel) ->
- stream_patterns_term loc (fun _ -> parser_cases loc spel) tspel ] ]
+ stream_patterns_term _loc (fun _ -> parser_cases _loc spel) tspel ] ]
;
-value cparser loc bpo pc =
- let e = parser_cases loc pc in
+value cparser _loc bpo pc =
+ let e = parser_cases _loc pc in
let e =
match bpo with
[ Some bp -> <:expr< let $bp$ = Stream.count $lid:strm_n$ in $e$ >>
@@ -221,11 +221,11 @@
<:expr< fun $p$ -> $e$ >>
;
-value b_cparser loc bpo pc =
+value b_cparser _loc bpo pc =
let bstrm_n = "bstrm__" in
let rec makethefun thelist = match thelist with
[ [] -> <:expr< raise Stream.Failure >>
- | [x::xs] -> let e = cparser loc bpo [x] in
+ | [x::xs] -> let e = cparser _loc bpo [x] in
let f = makethefun xs in
<:expr< try let cstream = new BNFsupport.lazyStream bstrm__ in
let res = ($e$) cstream#to_stream in do { cstream#consume_stream; res } with [Stream.Error _ | Stream.Failure -> $f$] >> ] in
@@ -234,8 +234,8 @@
<:expr< fun $p$ -> $thefun$ >>
;
-value cparser_match loc me bpo pc =
- let pc = parser_cases loc pc in
+value cparser_match _loc me bpo pc =
+ let pc = parser_cases _loc pc in
let e =
match bpo with
[ Some bp -> <:expr< let $bp$ = Stream.count $lid:strm_n$ in $pc$ >>
@@ -260,7 +260,7 @@
| _ -> False ]
;
-value slazy loc e =
+value slazy _loc e =
match e with
[ <:expr< $f$ () >> ->
match f with
@@ -271,18 +271,18 @@
value rec cstream gloc =
fun
- [ [] -> let loc = gloc in <:expr< Stream.sempty >>
- | [SeTrm loc e] ->
+ [ [] -> let _loc = gloc in <:expr< Stream.sempty >>
+ | [SeTrm _loc e] ->
if not_computing e then <:expr< Stream.ising $e$ >>
- else <:expr< Stream.lsing $slazy loc e$ >>
- | [SeTrm loc e :: secl] ->
+ else <:expr< Stream.lsing $slazy _loc e$ >>
+ | [SeTrm _loc e :: secl] ->
if not_computing e then <:expr< Stream.icons $e$ $cstream gloc secl$ >>
- else <:expr< Stream.lcons $slazy loc e$ $cstream gloc secl$ >>
- | [SeNtr loc e] ->
- if not_computing e then e else <:expr< Stream.slazy $slazy loc e$ >>
- | [SeNtr loc e :: secl] ->
+ else <:expr< Stream.lcons $slazy _loc e$ $cstream gloc secl$ >>
+ | [SeNtr _loc e] ->
+ if not_computing e then e else <:expr< Stream.slazy $slazy _loc e$ >>
+ | [SeNtr _loc e :: secl] ->
if not_computing e then <:expr< Stream.iapp $e$ $cstream gloc secl$ >>
- else <:expr< Stream.lapp $slazy loc e$ $cstream gloc secl$ >> ]
+ else <:expr< Stream.lapp $slazy _loc e$ $cstream gloc secl$ >> ]
;
(* Syntax extensions in Ocaml grammar *)
@@ -291,12 +291,12 @@
GLOBAL: expr;
expr: LEVEL "expr1"
[ [ "parser"; po = OPT ipatt; OPT "|"; pcl = LIST1 parser_case SEP "|" ->
- <:expr< $cparser loc po pcl$ >>
+ <:expr< $cparser _loc po pcl$ >>
| "bparser"; po = OPT ipatt; OPT "|"; pcl = LIST1 parser_case SEP "|" ->
- <:expr< $b_cparser loc po pcl$ >>
+ <:expr< $b_cparser _loc po pcl$ >>
| "match"; e = expr; "with"; "parser"; po = OPT ipatt; OPT "|";
pcl = LIST1 parser_case SEP "|" ->
- <:expr< $cparser_match loc e po pcl$ >> ] ]
+ <:expr< $cparser_match _loc e po pcl$ >> ] ]
;
parser_case:
[ [ "[<"; sp = stream_patt; ">]"; po = OPT ipatt; "->"; e = expr ->
@@ -317,9 +317,9 @@
;
stream_patt_comp:
[ [ "'"; p = patt; eo = OPT [ "when"; e = (expr LEVEL "expr1") -> e ] ->
- SpTrm loc p eo
- | p = patt; "="; e = (expr LEVEL "expr1") -> SpNtr loc p e
- | p = patt -> SpStr loc p ] ]
+ SpTrm _loc p eo
+ | p = patt; "="; e = (expr LEVEL "expr1") -> SpNtr _loc p e
+ | p = patt -> SpStr _loc p ] ]
;
stream_patt_comp_err:
[ [ spc = stream_patt_comp;
@@ -331,9 +331,9 @@
;
expr: LEVEL "simple"
- [ [ "[<"; ">]" -> <:expr< $cstream loc []$ >>
+ [ [ "[<"; ">]" -> <:expr< $cstream _loc []$ >>
| "[<"; sel = stream_expr_comp_list; ">]" ->
- <:expr< $cstream loc sel$ >> ] ]
+ <:expr< $cstream _loc sel$ >> ] ]
;
stream_expr_comp_list:
[ [ se = stream_expr_comp; ";"; sel = stream_expr_comp_list -> [se :: sel]
@@ -341,7 +341,7 @@
| se = stream_expr_comp -> [se] ] ]
;
stream_expr_comp:
- [ [ "'"; e = expr LEVEL "expr1" -> SeTrm loc e
- | e = expr LEVEL "expr1" -> SeNtr loc e ] ]
+ [ [ "'"; e = expr LEVEL "expr1" -> SeTrm _loc e
+ | e = expr LEVEL "expr1" -> SeNtr _loc e ] ]
;
END;
|
