diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2006-01-04 16:55:50 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2006-01-04 16:55:50 +0000 |
| commit | 125ea40d4c63e7bae69e30c2b6ba2b598b1bd5c2 (patch) | |
| tree | 6884b9b9821851f7f57add043646b54fe4cc85f3 /camlp4 | |
| parent | 3aaf0659a4c172c71cbf4828ed3bb6aa833c53e0 (diff) | |
fusion 3.09.0 -> 3.09.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7307 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'camlp4')
| -rw-r--r-- | camlp4/unmaintained/scheme/Makefile | 4 | ||||
| -rw-r--r-- | camlp4/unmaintained/scheme/pa_scheme.ml | 2 | ||||
| -rw-r--r-- | camlp4/unmaintained/scheme/pr_scheme.ml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/camlp4/unmaintained/scheme/Makefile b/camlp4/unmaintained/scheme/Makefile index a26ed8b14..01036c225 100644 --- a/camlp4/unmaintained/scheme/Makefile +++ b/camlp4/unmaintained/scheme/Makefile @@ -77,9 +77,9 @@ pr_schemep.cmo: pr_schp_main.cmo .ml.cmo: - $(OCAMLC) $(OCAMLCFLAGS) -pp "$(CAMLP4) $(P4INCLUDES) `awk 'NR == 1 { ORS=" "; for (i=2; i < NF; i++) print $$i; } ' $<`" -c $< + $(OCAMLC) $(OCAMLCFLAGS) -pp "$(CAMLP4) $(P4INCLUDES) `awk 'NR == 1 { ORS=" "; for (i=2; i < NF; i++) print $$i; } ' $<` -loc loc" -c $< .ml.cmx: - $(OCAMLOPT) $(OCAMLCFLAGS) -pp "$(CAMLP4) $(P4INCLUDES) `awk 'NR == 1 { ORS=" "; for (i=2; i < NF; i++) print $$i; } ' $<`" -c $< + $(OCAMLOPT) $(OCAMLCFLAGS) -pp "$(CAMLP4) $(P4INCLUDES) `awk 'NR == 1 { ORS=" "; for (i=2; i < NF; i++) print $$i; } ' $<` -loc loc" -c $< include .depend diff --git a/camlp4/unmaintained/scheme/pa_scheme.ml b/camlp4/unmaintained/scheme/pa_scheme.ml index 45b97e3c4..f91acd497 100644 --- a/camlp4/unmaintained/scheme/pa_scheme.ml +++ b/camlp4/unmaintained/scheme/pa_scheme.ml @@ -237,7 +237,7 @@ and question = and minus kwt = parser [ [: `'.' :] -> identifier kwt ("-.", False) - | [: `('0'..'9' as c); n = number (Buff.store (Buff.store 0 '-') c) :] ep -> + | [: `('0'..'9' as c); n = number (Buff.store (Buff.store 0 '-') c) :] -> n | [: id = ident (Buff.store 0 '-') :] -> identifier kwt id ] and less kwt = diff --git a/camlp4/unmaintained/scheme/pr_scheme.ml b/camlp4/unmaintained/scheme/pr_scheme.ml index 149b6c7cf..57f1b4c8c 100644 --- a/camlp4/unmaintained/scheme/pr_scheme.ml +++ b/camlp4/unmaintained/scheme/pr_scheme.ml @@ -203,7 +203,7 @@ pr_constr_decl.pr_levels := pr_box ppf f x = fprintf ppf "@[%t@]" f; pr_rules = extfun Extfun.empty with - [ (loc, c, []) as x -> + [ (loc, c, []) -> fun ppf curr next dg k -> fprintf ppf "(@[<hv>%s%t@]" c (ks ")" k) | (loc, c, tl) -> fun ppf curr next dg k -> |