parser.ml 19 KB
Newer Older
1
2
#load "pa_extend.cmo";;

3
4
open Location
open Ast
5
open Ident
6
open Printf
7

8
(*
9
let ()  = Grammar.error_verbose := true
10
*)
11

12
13
14
15
16
17
let tloc (i,j) = (i.Lexing.pos_cnum,j.Lexing.pos_cnum)
let nopos = (Lexing.dummy_pos, Lexing.dummy_pos)


let mk loc x = Location.mk (tloc loc) x

18
19
exception Error of string
let error (i,j) s = Location.raise_loc i j (Error s)
20
let error loc s = error (tloc loc) s
21

22
let gram    = Grammar.gcreate Ulexer.lex
23

24
let parse_ident = U.mk
25

26
let id_dummy = ident (U.mk "$$$")
27

28
let label = parse_ident
29
let ident s = ident (parse_ident s)
30

31
let prog    = Grammar.Entry.create gram "prog"
32
let top_phrases   = Grammar.Entry.create gram "toplevel phrases"
33
34
35
let expr    = Grammar.Entry.create gram "expression"
let pat     = Grammar.Entry.create gram "type/pattern expression"
let regexp  = Grammar.Entry.create gram "type/pattern regexp"
36
let keyword = Grammar.Entry.create gram "keyword"
37
		
38
let exp pos e = LocatedExpr (loc_of_pos (tloc pos),e)
39

40
41
42
43
44
let rec multi_prod loc = function
  | [ x ] -> x
  | x :: l -> mk loc (Prod (x, multi_prod loc l))
  | [] -> assert false
      
45
let rec tuple = function
46
  | [ x ] -> x
47
  | x :: l -> Pair (x, tuple l)
48
  | [] -> assert false
49
50

let tuple_queue = 
51
  List.fold_right (fun x q -> Pair (x, q))
52
53


54
let char = mknoloc (Internal (Types.char Chars.any))
55
let string_regexp = Star (Elem char)
56
	       
57
let seq_of_string s =
58
59
  let s = Encodings.Utf8.mk s in
  let rec aux i j =
60
61
    if Encodings.Utf8.equal_index i j then []
    else let (c,i) = Encodings.Utf8.next s i in c :: (aux i j)
62
  in
63
  aux (Encodings.Utf8.start_index s) (Encodings.Utf8.end_index s)
64

65

66
let parse_char loc s =
67
68
  match seq_of_string s with
    | [ c ] -> c
69
    | _ -> error loc "Character litteral must have length 1"
70

71
72
let include_stack = ref []

73
74
75
76
let protect_exn f g =
  try let x = f () in g (); x
  with e -> g (); raise e

77
78
79
80
let localize_exn f = 
  try f ()
  with
  | Stdpp.Exc_located (_, (Location _ as e)) -> raise e
81
82
(*  | Stdpp.Exc_located ((i,j), e) -> raise_loc i j e *)
  | Stdpp.Exc_located ((i,j), e) -> raise_loc i.Lexing.pos_cnum j.Lexing.pos_cnum e
83

84
85
86
87
let is_fun_decl =
   Grammar.Entry.of_parser gram "[is_fun_decl]"
     (fun strm ->
       match Stream.npeek 3 strm with
88
89
	 | [ ("", "fun"); ("IDENT", _); ("", "(") ]
	 | [ ("IDENT", _) ; ("", "(") ; _ ] -> ()
90
91
92
	 | _ -> raise Stream.Failure
     )

93
94
95
96
97
let if_then_else cond e1 e2 = Match (cond, [pat_true,e1; pat_false,e2])
 
let logical_and e1 e2 = if_then_else e1 e2 cst_false
let logical_or e1 e2 = if_then_else e1 cst_true e2
let logical_not e = if_then_else e cst_false cst_true
98
99
100

let apply_op2_noloc op e1 e2 = Apply (Apply (Var (parse_ident op), e1), e2)
let apply_op2 loc op e1 e2 = exp loc (apply_op2_noloc op e1 e2)
101
 
102

103
EXTEND
104
  GLOBAL: top_phrases prog expr pat regexp keyword;
105
106

  top_phrases: [
107
    [ l = LIST0 phrase; ";;" -> List.flatten l  ]
108
  ];
109
110

  prog: [
111
    [ l = LIST0 [ p = phrase ; OPT ";;" -> p ]; EOI -> List.flatten l ]
112
113
114
  ];

  phrase: [
115
116
117
118
    [ (f,p,e) = let_binding -> 
	if f then [ mk loc (FunDecl e) ] else
	  [ mk loc (LetDecl (p,e)) ]
    | (_,p,e1) = let_binding; "in"; e2 = expr LEVEL "top"->
119
        [ mk loc (EvalStatement (exp loc (Match (e1,[p,e2])))) ]
120
    | "type"; x = IDENT; "="; t = pat -> [ mk loc (TypeDecl (ident x,t)) ]
121
122
    | "using"; name = IDENT; "="; cu = [ IDENT | STRING2 ] ->
	[ mk loc (Using (U.mk name, U.mk cu)) ]
123
    | "schema"; name = IDENT; "="; uri = STRING2 ->
124
	protect_op "schema";
125
        [ mk loc (SchemaDecl (U.mk name, uri)) ]
126
127
128
129
130
    | (name,ns) = namespace_binding ->
	[ mk loc (Namespace (name, ns)) ]
    | (name,ns) = namespace_binding; "in"; e2 = expr LEVEL "top" ->
	let e = exp loc (NamespaceIn (name, ns, e2)) in
        [ mk loc (EvalStatement (exp loc e)) ]
131
    | "debug"; d = debug_directive -> [ mk loc (Directive (`Debug d)) ]
132
133
134
    | DIRECTIVE "#utf8" -> Ulexer.enc := Ulexing.Utf8; [ ]
    | DIRECTIVE "#latin1" -> Ulexer.enc := Ulexing.Latin1; [ ]
    | DIRECTIVE "#ascii" -> Ulexer.enc := Ulexing.Ascii; [ ]
135
136
    | DIRECTIVE "#quit" -> [ mk loc (Directive `Quit) ]
    | DIRECTIVE "#env" -> [ mk loc (Directive `Env) ]
137
    | DIRECTIVE "#print_schema"; name = IDENT ->
138
        [ mk loc (Directive (`Print_schema (U.mk name))) ]
139
140
141
142
143
144
145
    | DIRECTIVE "#print_type"; name = IDENT;
      schema_part = OPT [
        "#"; typ = [ IDENT | keyword ];
        kind = OPT [ "as"; k = schema_kind -> k] ->
          (kind, typ)
      ] ->
        (match schema_part with
146
        | None -> [ mk loc (Directive (`Print_type (U.mk name))) ]
147
        | Some (kind, typ) ->
148
149
            [ mk loc
              (Directive (`Print_schema_type (kind, U.mk name, U.mk typ))) ])
150
    | DIRECTIVE "#dump_value"; e = expr -> [ mk loc (Directive (`Dump e)) ]
151
    | DIRECTIVE "#reinit_ns" -> [ mk loc (Directive `Reinit_ns) ]
152
    | DIRECTIVE "#help" -> [ mk loc (Directive `Help) ]
153
    | "include"; s = STRING2 ->
154
155
156
157
	let s = 
	  if Filename.is_relative s 
	  then Filename.concat (Location.current_dir ()) s
	  else s in
158
159
	protect_op "File inclusion";
	(* avoid looping; should issue an error ? *)
160
161
	(* it is possible to have looping with x/../x/../x/.. ....
	   Need to canonicalize filename *)
162
163
164
165
	if List.mem s !include_stack then [] 
	else (
	  include_stack := s :: !include_stack;
	  Location.push_source (`File s);
166
167
	  let saved_enc = !Ulexer.enc in
	  Ulexer.enc := Ulexing.Latin1;
168
169
170
	  protect_exn
	    (fun () ->
	       let chan = open_in s in
171
172
173
	       protect_exn
		 (fun () ->
		    let input = Stream.of_channel chan in
174
		    localize_exn (fun () -> Grammar.Entry.parse prog input))
175
		 (fun () -> close_in chan))
176
	    (fun () ->
177
	       Ulexer.enc := saved_enc;
178
179
	       Location.pop_source ();
	       include_stack := List.tl !include_stack)
180
	)
181
    ] | 
182
    [ e = expr -> [ mk loc (EvalStatement e) ]
183
184
185
186
    ]
  ];

  debug_directive: [
187
188
189
190
191
    [ IDENT "filter"; t = pat; p = pat -> `Filter(t,p)
    | IDENT "accept"; p = pat -> `Accept p
    | IDENT "compile"; t = pat; p = LIST1 pat -> `Compile (t,p)
    | IDENT "sample"; t = pat -> `Sample t
    | IDENT "subtype"; t1 = pat; t2 = pat -> `Subtype (t1,t2)
192
    | IDENT "explain"; t = pat; e = expr -> `Explain (t,e)
193
    ]
194
  ];
195

196
197
198
199
200
  keyword: [
    [ a = 
	[ "map" | "match" | "with" | "try" | "xtransform"
	| "if" | "then"	| "else"
	| "transform" | "fun" | "in"
201
	| "let" | "type" | "debug" | "include"
202
        | "and" | "validate" | "schema" | "namespace" | "ref" | "alias"
203
	| "not" | "as" | "where" | "external"
204
205
206
207
208
	]
	-> a
    ]
  ];

209
210
  expr: [
    "top" RIGHTA
211
212
    [ "match"; e = SELF; "with"; b = branches -> 
	exp loc (Match (e,b))
213
    | "try"; e = SELF; "with"; b = branches -> 
214
	exp loc (Try (e,b))
215
216
217
218
    | "map"; e = SELF; "with"; b = branches -> 
	exp loc (Map (e,b))
    | "xtransform"; e = SELF; "with"; b = branches -> 
	exp loc (Xtrans (e,b))
219
    | "if"; e = SELF; "then"; e1 = SELF; "else"; e2 = SELF ->
220
	exp loc (if_then_else e e1 e2)
221
    | "transform"; e = SELF; "with"; b = branches -> 
222
	exp loc (Transform (e,b))
223
224
    | "validate"; e = SELF; "with"; (kind, schema, typ) = schema_ref ->
        exp loc (Validate (e, kind, schema, typ))
225
    | "fun"; (f,a,b) = fun_decl ->
226
	exp loc (Abstraction { fun_name = f; fun_iface = a; fun_body = b })
227
    | "external"; s = STRING2 ->
228
	exp loc (External (s,[]))
229
    | "external"; "{"; s = STRING2; pl = LIST0 pat; "}" ->
230
	exp loc (External (s,pl))
231
    | (_,p,e1) = let_binding; "in"; e2 = expr LEVEL "top"->
232
        exp loc (Match (e1,[p,e2]))
233
234
    | (name,ns) = namespace_binding; "in"; e2 = expr LEVEL "top" ->
	exp loc (NamespaceIn (name, ns, e2))
235
    | e = expr; ":"; p = pat ->
236
	exp loc (Forget (e,p))
237
238
239
240
    | e1 = expr; ";"; e2 = expr ->
	exp loc (Match (e1, [pat_nil,e2]))
    | "ref"; p = pat; e = expr ->
	exp loc (Ref (e,p))
241
    | "not"; e = expr -> exp loc (logical_not e)
242
243
244
245
    ]
    |
    [ e1 = expr; ":="; e2 = expr ->
	exp loc (Apply (Dot (e1, U.mk "set"), e2))
246
    ]
247
248
249
250
251
252
    | 
    [ e1 = expr; op = ["=" | "<=" | "<<" | ">>" | ">=" ]; e2 = expr -> 
	let op = match op with
	  | "<<" -> "<"
	  | ">>" -> ">"
	  | s -> s in
253
	apply_op2 loc op e1 e2
254
255
    ]

256
    | 
257
    [ e1 = expr; op = ["+" | "-" | "@" ]; e2 = expr -> apply_op2 loc op e1 e2
258
    | e1 = expr; "||"; e2 = expr -> exp loc (logical_or e1 e2)
259
    | e = expr; "\\"; l = [IDENT | keyword ] -> 
260
	exp loc (RemoveField (e, label l)) 
261
262
    ]
    |
263
    [ e1 = expr; op = ["*"]; e2 = expr -> apply_op2 loc op e1 e2
264
    | e1 = expr; "&&"; e2 = expr -> exp loc (logical_and e1 e2)
265
    | e = expr; op = "/"; p = pat LEVEL "simple" ->
266
267
268
269
270
271
272
273
	let tag = mk loc (Internal (Types.atom (Atoms.any))) in
	let att = mk loc (Internal Types.Record.any) in
	let any = mk loc (Internal (Types.any)) in
	let re = Star(Alt(SeqCapture(id_dummy,Elem p), Elem any)) in
	let ct = mk loc (Regexp (re,any)) in
        let p = mk loc (XmlT (tag, multi_prod loc [att;ct])) in
	let b = (p,  Var (Id.value id_dummy)) in
	exp loc (Transform (e,[b]))
274
    ]
275
    |
276
    [ e = expr;  "."; l = [IDENT | keyword ] -> 
277
	exp loc (Dot (e, label l)) 
278
    ]  
279
280
281
    | [ 
      e1 = SELF; IDENT "div"; e2 = expr -> apply_op2 loc "/" e1 e2
    | e1 = SELF; IDENT "mod"; e2 = expr -> apply_op2 loc "mod" e1 e2
282
    | e1 = SELF; e2 = expr -> exp loc (Apply (e1,e2))
283
284
    ]

285
    | "no_appl" 
286
287
    [ 
      "("; l = LIST1 expr SEP ","; ")" -> exp loc (tuple l)
288
    | "[";  l = LIST0 seq_elem; e = OPT [ ";"; e = expr -> e ]; 
289
      loc_end = ["]" -> loc] ->
290
	let e = match e with Some e -> e | None -> cst_nil in
291
292
        let e = exp loc_end e in
        let (_,loc_end) = loc_end in
293
294
295
	let l = List.fold_right 
		  (fun x q ->
		     match x with
296
		       | `String (loc,i,j,s) -> exp loc (String (i,j,s,q))
297
		       | `Elems ((loc,_),x) -> exp (loc,loc_end) (Pair(x,q))
298
		       | `Explode x -> apply_op2_noloc "@" x q
299
300
301
		  ) l e
	in
	exp loc l
302
    | "<"; t = [ "("; e = expr; ")" -> e
303
	       | a = tag -> exp loc a
304
	       ];
305
	a = expr_attrib_spec; ">"; c = expr ->
306
	  exp loc (Xml (t, Pair (a,c)))
307
    | "{"; r = [ expr_record_spec | -> exp loc (RecordLitt []) ]; "}" -> r
308
    | s = STRING2 ->
309
	let s = U.mk s in
310
	exp loc (String (U.start_index s, U.end_index s, s, cst_nil))
311
    | a = IDENT -> exp loc (Var (U.mk a))
312
313
    | "!"; e = expr ->
	exp loc (Apply (Dot (e, U.mk "get"), cst_nil))
314
315
316
    | i = INT -> exp loc (Integer (Intervals.V.mk i))
    | "`"; a = tag -> a
    | c = char -> exp loc (Char c)
317
318
319
    ]

  ];
320

321
  tag: [ [ a = [ IDENT | keyword ] -> exp loc (Atom (parse_ident a)) ] ];
322
323

  tag_type: [
324
    [ IDENT "_" ->  mk loc (Internal (Types.atom Atoms.any))
325
    | a = [ IDENT | keyword ] -> mk loc (Cst (Atom (parse_ident a)))
326
    | t = ANY_IN_NS -> mk loc (NsT (parse_ident t)) 
327
328
329
    ]
  ];

330
  seq_elem: [
331
    [ x = STRING1 -> 
332
	let s = U.mk x in
333
	`String (loc, U.start_index s, U.end_index s, s)
334
    | e = expr LEVEL "no_appl" -> `Elems (loc,e)
335
    | "!"; e = expr LEVEL "no_appl" -> `Explode e
336
337
    ]
  ];
338
339
340
	
  namespace_binding: [
    [ "namespace"; 
341
	name = [ name = [ IDENT | keyword ]; "=" ->
342
343
344
		   parse_ident name
	       | -> U.mk "" ];
	uri = STRING2 ->
345
	  let ns = Ns.mk (parse_ident uri) in
346
347
348
349
350
	  (name,ns)
    ]
  ];

  
351
  let_binding: [
352
353
    [ "let"; is_fun_decl; OPT "fun"; (f,a,b) = fun_decl ->
	let f = match f with Some x -> x | None -> assert false in
354
	let p = mk loc (PatVar (Id.value f)) in
355
	let abst = { fun_name = Some f; fun_iface = a; fun_body = b } in
356
        let e = exp loc (Abstraction abst) in
357
        (true,p,e)
358
359
    | "let"; p = pat; "="; e = expr -> (false,p,e)
    | "let"; p = pat; ":"; t = pat; "="; e = expr -> (false,p, Forget (e,t))
360
361
362
    ] 
  ];

363
 fun_decl_after_lparen: [
364
(* need an hack to do this, because both productions would
365
   match   [ OPT IDENT; "("; pat ] .... *)
366
367
368
369
370
371
   [ p1 = pat LEVEL "no_arrow";
     res = [ "->"; p2 = pat;
	     a = [ ";"; a = LIST0 arrow SEP ";" -> a | -> [] ];
	     ")"; b = branches -> `Classic (p2,a,b)
	   | ":"; targ1 = pat;
	     args = LIST0 [ ","; arg = pat; ":"; targ = pat -> (arg,targ) ]; 
372
373
374
375
376
377
378
379
380
	     ")";
	     others = LIST0 
			[ "(";
			  args = 
			    LIST1 
			      [ arg = pat; ":"; targ = pat -> (arg,targ) ]
			      SEP ",";
			  ")" -> args ];
	     ":"; tres = pat ; 
381
	     "="; body = expr ->
382
	       `Compact (targ1,args,others,tres,body)
383
384
385
	   ] ->
       match res with
	 | `Classic (p2,a,b) -> (p1,p2)::a,b
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
	 | `Compact (targ1,args,others,tres,body) ->
	     let mkfun args =
	       multi_prod nopos (List.map snd args),
	       multi_prod nopos (List.map fst args)
	     in
	     let (tres,body) =
	       List.fold_right
		 (fun args (tres,body) ->
		    let (targ,arg) = mkfun args in
		    let e = Abstraction 
			      { fun_name = None; fun_iface = [targ,tres]; 
				fun_body = [arg,body] } in
		    let t = mknoloc (Arrow (targ,tres)) in
		    (t,e)
		 )
		 others (tres,body) in
	     let (targ,arg) = mkfun ((p1,targ1) :: args) in
	     [(targ,tres)],[(arg,body)]
	      ] ];
405
406
407


 fun_decl: [
408
409
410
   [ f = OPT IDENT; "("; (a,b) = fun_decl_after_lparen ->
       let f = match f with Some x -> Some (ident x) | None -> None in
       (f,a,b)
411
   ]
412
413
 ];

414
 arrow: [
415
    [ t1 = pat LEVEL "no_arrow"; "->"; t2 = pat -> (t1,t2)]
416
417
418
  ];

  branches: [
419
    [ OPT "|"; l = LIST1 branch SEP "|" -> l ]
420
421
422
  ];

  branch: [
423
    [ p = pat LEVEL "no_arrow"; "->"; e = expr -> (p,e) ]
424
425
426
427
  ];

	  
  regexp: [ 
428
429
430
431
432
    [ x = regexp; "|"; y = regexp -> 
	match (x,y) with
	  | Elem x, Elem y -> Elem (mk loc (Or (x,y)))
	  | _ -> Alt (x,y) 
    ]
433
  | [ x = regexp; y = regexp -> Seq (x,y) ]
434
435
436
437
438
  | [ x = regexp; "&"; y = regexp ->
	match (x,y) with
	  | Elem x, Elem y -> Elem (mk loc (And (x,y)))
	  | _ -> error loc "Conjunction not allowed in regular expression"
    ]
439
  | [ a = IDENT; "::"; x = regexp -> SeqCapture (ident a,x) ]
440
441
442
443
  | [ x = regexp; "*" -> Star x
    | x = regexp; "*?" -> WeakStar x
    | x = regexp; "+" -> Seq (x, Star x)
    | x = regexp; "+?" -> Seq (x, WeakStar x)
444
    | x = regexp; "?" ->  Alt (x, Epsilon)
445
    | x = regexp; "??" -> Alt (Epsilon, x) ]
446
  | [ "("; x = LIST1 regexp SEP ","; ")" ->
447
448
449
450
451
452
453
454
455
456
457
	(match x with
	  | [ x ] -> x
	  | _ ->
	      let x = 
		List.map 
		  (function
		     | Elem x -> x
		     | _ -> error loc 
			 "Mixing regular expressions and products")
		  x in
	      Elem (multi_prod loc x))
458
459
    | "("; a = IDENT; ":="; c = expr; ")" -> 
	Elem (mk loc (Constant ((ident a,c))))
460
    | "/"; p = pat LEVEL "simple" -> Guard p
461
    | IDENT "PCDATA" -> string_regexp
462
    | i = STRING1; "--"; j = STRING1 ->
463
464
	let i = Chars.V.mk_int (parse_char loc i)
	and j = Chars.V.mk_int (parse_char loc j) in
465
        Elem (mk loc (Internal (Types.char (Chars.char_class i j))))
466
    |  s = STRING1 ->
467
	List.fold_right
468
	  (fun c accu -> 
469
	     let c = Chars.V.mk_int c in
470
	     let c = Chars.atom c in
471
472
	     Seq (Elem (mknoloc (Internal (Types.char c))), accu))
	  (seq_of_string s)
473
474
	  Epsilon ]
    | [ e = pat LEVEL "simple" -> Elem e
475
476
477
    ]
  ];

478
  schema_kind : [
479
    [ IDENT "element" -> `Element
480
    | "type" -> `Type
481
482
483
    | IDENT "attribute" -> `Attribute
    | IDENT "attribute_group" -> `Attribute_group
    | IDENT "model_group" -> `Model_group
484
485
486
    ]
  ];

487
488
489
  schema_ref: [
    [ schema = IDENT; "#"; typ = [ IDENT | keyword ];
      kind = OPT [ "as"; k = schema_kind -> k] ->
490
        (kind, U.mk schema, U.mk typ)
491
492
493
    ]
  ];

494
  pat: [ 
495
      [ x = pat; "where"; 
496
        b = LIST1 [ a = IDENT; "="; y = pat -> (ident a,y) ] SEP "and"
497
498
            -> mk loc (Recurs (x,b)) ]
    | RIGHTA [ x = pat; "->"; y = pat -> mk loc (Arrow (x,y)) ]
499
    | "no_arrow" [ x = pat; "|"; y = pat -> mk loc (Or (x,y)) ] 
500
    | "simple" [ x = pat; "&"; y = pat -> mk loc (And (x,y)) 
501
	       | x = pat; "\\"; y = pat -> mk loc (Diff (x,y)) ]
502
    | 
503
504
      [ "{"; r = record_spec; "}" -> mk loc (Record (true,r))
      | "{|"; r = record_spec; "|}" -> mk loc (Record (false,r))
505
506
507
508
509
      | "ref"; p = pat ->
	  let get_fun = mk loc (Arrow (pat_nil, p)) 
	  and set_fun = mk loc (Arrow (p, pat_nil)) in
	  let fields = [ label "get", get_fun; label "set", set_fun ] in
	  mk loc (Record (false, fields))
510
      | IDENT "_" -> mk loc (Internal Types.any)
511
      | "("; a = IDENT; ":="; c = expr; ")" -> 
512
	  mk loc (Constant (ident a,c))
513
      | schema = IDENT; "#"; typ = [ IDENT | keyword ];
514
        kind = OPT [ "as"; k = schema_kind -> k] ->
515
          mk loc (SchemaVar (kind, U.mk schema, U.mk typ))
516
517
      | "!"; a = IDENT ->
	  mk loc (Internal (Types.abstract (Types.Abstract.atom a)))
518
      | a = IDENT -> 
519
	  mk loc (PatVar (U.mk a))
520
      | i = INT ; "--"; j = INT -> 
521
522
          let i =  Intervals.V.mk i 
	  and j =  Intervals.V.mk j in
523
524
          mk loc (Internal (Types.interval (Intervals.bounded i j)))
      | i = INT -> 
525
          let i =  Intervals.V.mk i  in
526
          mk loc (Internal (Types.interval (Intervals.atom i)))
527
      | "*"; "--"; j = INT ->
528
	  let j =  Intervals.V.mk j in
529
          mk loc (Internal (Types.interval (Intervals.left j)))
530
      | i = INT; "--"; "*" ->
531
	  let i = Intervals.V.mk i in
532
          mk loc (Internal (Types.interval (Intervals.right i)))
533
534
      | i = char ->
          mk loc (Internal (Types.char (Chars.char_class i i)))
535
      | i = char ; "--"; j = char ->
536
          mk loc (Internal (Types.char (Chars.char_class i j)))
537
      | "`"; c = tag_type -> c
538
539
540
      | "("; l = LIST1 pat SEP ","; ")" -> multi_prod loc l
      | "["; r = [ r = regexp -> r | -> Epsilon ];
             q = [ ";"; q = pat -> q 
541
                 | -> pat_nil ]; 
542
             "]" -> mk loc (Regexp (r,q))
543
      | "<"; t =
544
545
            [ x = tag_type -> x
            | "("; t = pat; ")" -> t ];
546
	a = attrib_spec; ">"; c = pat ->
547
          mk loc (XmlT (t, multi_prod loc [a;c]))
548
      | s = STRING2 ->
549
550
551
552
553
554
	  let s = 
	    List.map 
	      (fun c -> 
		 mknoloc (Internal
			     (Types.char
				(Chars.atom
555
				   (Chars.V.mk_int c))))) 
556
557
	      (seq_of_string s) in
	  let s = s @ [mknoloc (Internal (Sequence.nil_type))] in
558
	  multi_prod loc s
559
560
561
562
563
      ]
    
  ];

  record_spec:
564
    [ [ r = LIST0 [ l = [IDENT | keyword ]; "=";
565
                  o = [ "?" -> true | -> false]; 
566
567
                  x = pat -> 
		    let x = if o then mk loc (Optional x) else x in
568
		    (label l, x)
569
                ] SEP ";" ->
570
	  r
571
572
      ] ];
  
573
574
  char:
    [ 
575
      [ c = STRING1 -> Chars.V.mk_int (parse_char loc c) ]
576
577
578
    ];
     

579
  attrib_spec:
580
    [ [ r = LIST0 [ l = [IDENT | keyword ]; "=";
581
582
583
584
585
586
                  o = [ "?" -> true | -> false]; 
                  x = pat; OPT ";" -> 
		    let x = if o then mk loc (Optional x) else x in
		    (label l, x)
                ] ->
	  mk loc (Record (true,r)) 
587
588
589
590
      | "("; t = pat; ")" -> t 
      | "{"; r = record_spec; "}" -> mk loc (Record (true,r))
      | "{|"; r = record_spec; "|}" -> mk loc (Record (false,r))
      ] ];
591
592
593

  expr_record_spec:
    [ [ r = LIST1
594
	      [ l = [IDENT | keyword ]; "="; x = expr LEVEL "no_appl" -> 
595
		  (label l,x) ] 
596
	       SEP ";"  ->
597
	  exp loc (RecordLitt r)
598
      ] ];
599

600
  expr_attrib_spec:
601
    [ [ r = LIST1
602
	      [ l = [IDENT | keyword ]; "="; x = expr LEVEL "no_appl"; OPT ";" -> 
603
604
605
		  (label l,x) ] ->
	  exp loc (RecordLitt r)
      ]
606
    | [ e = expr LEVEL "no_appl" -> e 
607
      | -> exp loc (RecordLitt []) 
608
609
610
611
      ] 
    ];
END

612
613
614
module Hook = struct
  let expr = expr
  let pat = pat
615
  let keyword = keyword
616
617
end

618
let pat = Grammar.Entry.parse pat
619
620
and expr = Grammar.Entry.parse expr
and prog = Grammar.Entry.parse prog
621
622
and top_phrases = Grammar.Entry.parse top_phrases

623
let sync () = 
624
  match !Ulexer.lexbuf with
625
626
627
    | None -> ()
    | Some lb ->
	let rec aux () =
628
	  match !Ulexer.last_tok with
629
630
	    | ("",";;") | ("EOI","") -> ()
	    | _ -> 
631
		Ulexer.last_tok := fst (Ulexer.token lb); 
632
633
634
		aux ()
	in
	aux ()
635
636
637
638

let sync () =
  try sync ()
  with Ulexing.Error -> ()