diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2002-01-20 15:12:21 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2002-01-20 15:12:21 +0000 |
| commit | 13356e7c5e77472c57da30a4f1cf2833ea842890 (patch) | |
| tree | 7f82f743faf4dbf8a08aa5aec0bce7383e46f782 /camlp4 | |
| parent | 52e880292259a6ddf7f4edbbb36cc20847e4a707 (diff) | |
detabisation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4281 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'camlp4')
| -rw-r--r-- | camlp4/etc/pa_lisp.ml | 6 | ||||
| -rw-r--r-- | camlp4/etc/pa_ocamllex.ml | 32 |
2 files changed, 19 insertions, 19 deletions
diff --git a/camlp4/etc/pa_lisp.ml b/camlp4/etc/pa_lisp.ml index 9c15424e1..fe618e321 100644 --- a/camlp4/etc/pa_lisp.ml +++ b/camlp4/etc/pa_lisp.ml @@ -63,9 +63,9 @@ (value rec char (lambda len - (parser - (((` ''')) len) - (((` x) s) (char (Buff.store len x) s))))) + (parser + (((` ''')) len) + (((` x) s) (char (Buff.store len x) s))))) (value quote (parser diff --git a/camlp4/etc/pa_ocamllex.ml b/camlp4/etc/pa_ocamllex.ml index b5c27d5bd..c40c97ca9 100644 --- a/camlp4/etc/pa_ocamllex.ml +++ b/camlp4/etc/pa_ocamllex.ml @@ -64,14 +64,14 @@ let output_entry e = let cases = List.map (fun (num, (loc,e)) -> - <:patt< $int:string_of_int num$ >>, - None, (* when ... *) - e + <:patt< $int:string_of_int num$ >>, + None, (* when ... *) + e ) e.auto_actions @ [ <:patt< __ocaml_lex_n >>, None, <:expr< do - { lexbuf.Lexing.refill_buff lexbuf; $call_f$ __ocaml_lex_n }>> ] + { lexbuf.Lexing.refill_buff lexbuf; $call_f$ __ocaml_lex_n }>> ] in [ <:patt< $lid:e.auto_name$ >>, @@ -147,9 +147,9 @@ EXTEND let_regexp: [ [ x = LIDENT; "="; r = regexp -> if Hashtbl.mem named_regexps x then - Printf.eprintf - "pa_ocamllex (warning): multiple definition of named regexp '%s'\n" - x; + Printf.eprintf + "pa_ocamllex (warning): multiple definition of named regexp '%s'\n" + x; Hashtbl.add named_regexps x r; ] ]; @@ -157,11 +157,11 @@ EXTEND lexer_def: [ [ def = LIST0 definition SEP "and" -> (try - let (entries, transitions) = make_dfa def in - let tables = compact_tables transitions in - let output = output_lexdef tables entries in - <:str_item< declare $list: output$ end >> - with Table_overflow -> + let (entries, transitions) = make_dfa def in + let tables = compact_tables transitions in + let output = output_lexdef tables entries in + <:str_item< declare $list: output$ end >> + with Table_overflow -> failwith "Transition table overflow in lexer, automaton is too big") ] ]; @@ -182,8 +182,8 @@ EXTEND action: [ [ "{"; e = OPT Pcaml.expr; "}" -> let e = match e with - | Some e -> e - | None -> <:expr< () >> + | Some e -> e + | None -> <:expr< () >> in (loc,e) ] @@ -209,8 +209,8 @@ EXTEND | x = LIDENT -> try Hashtbl.find named_regexps x with Not_found -> - failwith - ("pa_ocamllex (error): reference to unbound regexp name `"^x^"'") + failwith + ("pa_ocamllex (error): reference to unbound regexp name `"^x^"'") ] ]; |