From b6c2d415c77c5caefdcc44068e44652ac776128b Mon Sep 17 00:00:00 2001 From: Damien Doligez Date: Fri, 23 Jun 2000 15:08:43 +0000 Subject: [PATCH] MacOS: ASCII seulement (PR#147) + deps git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3210 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 --- Makefile.Mac | 9 +++++- Makefile.Mac.depend | 37 +++++++++++++----------- byterun/Makefile.Mac.depend | 4 +-- maccaml/Makefile.Mac.depend | 10 ++----- otherlibs/bigarray/Makefile.Mac.depend | 4 +-- otherlibs/macosunix/Makefile.Mac.depend | 4 +-- otherlibs/num/Makefile.Mac.depend | 4 +-- otherlibs/str/Makefile.Mac.depend | 4 +-- otherlibs/systhreads/Makefile.Mac.depend | 4 +-- parsing/.cvsignore | 2 ++ 10 files changed, 44 insertions(+), 38 deletions(-) diff --git a/Makefile.Mac b/Makefile.Mac index 42a3ff796..d43c1dd28 100644 --- a/Makefile.Mac +++ b/Makefile.Mac @@ -284,7 +284,14 @@ beforedepend # The lexer :parsing:lexer.ml Ä :parsing:lexer.mll - {CAMLLEX} :parsing:lexer.mll + streamedit -e "1,$ replace /¶¶''\223'¶¶'-¶¶''\246'¶¶'/ '' -c °" ¶ + -e "1,$ replace /¶¶''\248'¶¶'-¶¶''\255'¶¶'/ '' -c °" ¶ + -e "1,$ replace /¶¶''\192'¶¶'-¶¶''\214'¶¶'/ '' -c °" ¶ + -e "1,$ replace /¶¶''\216'¶¶'-¶¶''\222'¶¶'/ '' -c °" ¶ + -e "1,$ replace /¶¶''\216'¶¶'-¶¶''\246'¶¶'/ '' -c °" ¶ + <:parsing:lexer.mll >:parsing:lexer_tmp.mll + {CAMLLEX} :parsing:lexer_tmp.mll + rename -y :parsing:lexer_tmp.ml :parsing:lexer.ml partialclean ÄÄ delete -i :parsing:lexer.ml diff --git a/Makefile.Mac.depend b/Makefile.Mac.depend index 9354c651f..d188f5086 100644 --- a/Makefile.Mac.depend +++ b/Makefile.Mac.depend @@ -102,11 +102,11 @@ :typing:btype.cmxÄ :utils:misc.cmx :typing:path.cmx :typing:types.cmx ¶ :typing:btype.cmi :typing:ctype.cmoÄ :parsing:asttypes.cmi :typing:btype.cmi :utils:clflags.cmo ¶ - :typing:env.cmi :typing:ident.cmi :utils:misc.cmi :typing:path.cmi ¶ - :typing:subst.cmi :typing:types.cmi :typing:ctype.cmi + :typing:env.cmi :typing:ident.cmi :parsing:longident.cmi :utils:misc.cmi ¶ + :typing:path.cmi :typing:subst.cmi :typing:types.cmi :typing:ctype.cmi :typing:ctype.cmxÄ :parsing:asttypes.cmi :typing:btype.cmx :utils:clflags.cmx ¶ - :typing:env.cmx :typing:ident.cmx :utils:misc.cmx :typing:path.cmx ¶ - :typing:subst.cmx :typing:types.cmx :typing:ctype.cmi + :typing:env.cmx :typing:ident.cmx :parsing:longident.cmx :utils:misc.cmx ¶ + :typing:path.cmx :typing:subst.cmx :typing:types.cmx :typing:ctype.cmi :typing:datarepr.cmoÄ :parsing:asttypes.cmi :utils:misc.cmi ¶ :typing:predef.cmi :typing:types.cmi :typing:datarepr.cmi :typing:datarepr.cmxÄ :parsing:asttypes.cmi :utils:misc.cmx ¶ @@ -205,18 +205,20 @@ :typing:predef.cmx :typing:printtyp.cmx :typing:typedtree.cmx ¶ :typing:types.cmx :typing:typetexp.cmx :utils:warnings.cmx ¶ :typing:typecore.cmi -:typing:typedecl.cmoÄ :utils:config.cmi :typing:ctype.cmi :typing:env.cmi ¶ - :typing:ident.cmi :typing:includecore.cmi :parsing:location.cmi ¶ - :parsing:longident.cmi :utils:misc.cmi :parsing:parsetree.cmi ¶ - :typing:path.cmi :typing:predef.cmi :typing:primitive.cmi ¶ - :typing:printtyp.cmi :typing:subst.cmi :typing:typedtree.cmi ¶ - :typing:types.cmi :typing:typetexp.cmi :typing:typedecl.cmi -:typing:typedecl.cmxÄ :utils:config.cmx :typing:ctype.cmx :typing:env.cmx ¶ - :typing:ident.cmx :typing:includecore.cmx :parsing:location.cmx ¶ - :parsing:longident.cmx :utils:misc.cmx :parsing:parsetree.cmi ¶ - :typing:path.cmx :typing:predef.cmx :typing:primitive.cmx ¶ - :typing:printtyp.cmx :typing:subst.cmx :typing:typedtree.cmx ¶ - :typing:types.cmx :typing:typetexp.cmx :typing:typedecl.cmi +:typing:typedecl.cmoÄ :typing:btype.cmi :utils:clflags.cmo :utils:config.cmi ¶ + :typing:ctype.cmi :typing:env.cmi :typing:ident.cmi ¶ + :typing:includecore.cmi :parsing:location.cmi :parsing:longident.cmi ¶ + :utils:misc.cmi :parsing:parsetree.cmi :typing:path.cmi ¶ + :typing:predef.cmi :typing:primitive.cmi :typing:printtyp.cmi ¶ + :typing:subst.cmi :typing:typedtree.cmi :typing:types.cmi ¶ + :typing:typetexp.cmi :typing:typedecl.cmi +:typing:typedecl.cmxÄ :typing:btype.cmx :utils:clflags.cmx :utils:config.cmx ¶ + :typing:ctype.cmx :typing:env.cmx :typing:ident.cmx ¶ + :typing:includecore.cmx :parsing:location.cmx :parsing:longident.cmx ¶ + :utils:misc.cmx :parsing:parsetree.cmi :typing:path.cmx ¶ + :typing:predef.cmx :typing:primitive.cmx :typing:printtyp.cmx ¶ + :typing:subst.cmx :typing:typedtree.cmx :typing:types.cmx ¶ + :typing:typetexp.cmx :typing:typedecl.cmi :typing:typedtree.cmoÄ :parsing:asttypes.cmi :typing:env.cmi ¶ :typing:ident.cmi :parsing:location.cmi :utils:misc.cmi :typing:path.cmi ¶ :typing:primitive.cmi :typing:types.cmi :typing:typedtree.cmi @@ -268,7 +270,8 @@ :bytecomp:translcore.cmiÄ :parsing:asttypes.cmi :typing:ident.cmi ¶ :bytecomp:lambda.cmi :parsing:location.cmi :typing:path.cmi ¶ :typing:primitive.cmi :typing:typedtree.cmi :typing:types.cmi -:bytecomp:translmod.cmiÄ :bytecomp:lambda.cmi :typing:typedtree.cmi +:bytecomp:translmod.cmiÄ :typing:ident.cmi :bytecomp:lambda.cmi ¶ + :typing:typedtree.cmi :bytecomp:translobj.cmiÄ :typing:ident.cmi :bytecomp:lambda.cmi :bytecomp:typeopt.cmiÄ :bytecomp:lambda.cmi :typing:path.cmi ¶ :typing:typedtree.cmi diff --git a/byterun/Makefile.Mac.depend b/byterun/Makefile.Mac.depend index 8d7ece8c0..9d5f7a2ae 100644 --- a/byterun/Makefile.Mac.depend +++ b/byterun/Makefile.Mac.depend @@ -1,5 +1,5 @@ #*** Dependencies: Cut here *** -# These dependencies were produced at 14:23:03 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:46:09 on 23 juin 2000 by MakeDepend :alloc.c.x Ä ¶ :alloc.c ¶ @@ -1090,7 +1090,7 @@ "{CIncludes}"DateTimeUtils.h #*** Dependencies: Cut here *** -# These dependencies were produced at 14:23:18 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:46:23 on 23 juin 2000 by MakeDepend :alloc.c.o Ä ¶ :alloc.c ¶ diff --git a/maccaml/Makefile.Mac.depend b/maccaml/Makefile.Mac.depend index 8b1b1665c..970a4a2c1 100644 --- a/maccaml/Makefile.Mac.depend +++ b/maccaml/Makefile.Mac.depend @@ -1,5 +1,5 @@ #*** Dependencies: Cut here *** -# These dependencies were produced at 14:25:14 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:48:11 on 23 juin 2000 by MakeDepend :aboutbox.c.x Ä ¶ :aboutbox.c ¶ @@ -1351,9 +1351,6 @@ "{CIncludes}"MachineExceptions.h ¶ "{CIncludes}"DriverSynchronization.h -:nothreads.c.x Ä ¶ - :nothreads.c - :prefs.c.x Ä ¶ :prefs.c ¶ :main.h ¶ @@ -1694,7 +1691,7 @@ "{CIncludes}"DriverSynchronization.h #*** Dependencies: Cut here *** -# These dependencies were produced at 14:25:23 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:48:21 on 23 juin 2000 by MakeDepend :aboutbox.c.o Ä ¶ :aboutbox.c ¶ @@ -3046,9 +3043,6 @@ "{CIncludes}"MachineExceptions.h ¶ "{CIncludes}"DriverSynchronization.h -:nothreads.c.o Ä ¶ - :nothreads.c - :prefs.c.o Ä ¶ :prefs.c ¶ :main.h ¶ diff --git a/otherlibs/bigarray/Makefile.Mac.depend b/otherlibs/bigarray/Makefile.Mac.depend index 21307c037..7fc7e04d1 100644 --- a/otherlibs/bigarray/Makefile.Mac.depend +++ b/otherlibs/bigarray/Makefile.Mac.depend @@ -1,5 +1,5 @@ #*** Dependencies: Cut here *** -# These dependencies were produced at 14:23:44 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:46:46 on 23 juin 2000 by MakeDepend :bigarray_stubs.c.x Ä ¶ :bigarray_stubs.c ¶ @@ -36,7 +36,7 @@ "{CIncludes}"WCharTDef.h #*** Dependencies: Cut here *** -# These dependencies were produced at 14:23:46 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:46:48 on 23 juin 2000 by MakeDepend :bigarray_stubs.c.o Ä ¶ :bigarray_stubs.c ¶ diff --git a/otherlibs/macosunix/Makefile.Mac.depend b/otherlibs/macosunix/Makefile.Mac.depend index 54c7d62ec..5f258758a 100644 --- a/otherlibs/macosunix/Makefile.Mac.depend +++ b/otherlibs/macosunix/Makefile.Mac.depend @@ -1,5 +1,5 @@ #*** Dependencies: Cut here *** -# These dependencies were produced at 14:24:24 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:47:23 on 23 juin 2000 by MakeDepend :accept.c.x Ä ¶ :accept.c ¶ @@ -433,7 +433,7 @@ "{CIncludes}"MixedMode.h #*** Dependencies: Cut here *** -# These dependencies were produced at 14:24:31 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:47:30 on 23 juin 2000 by MakeDepend :accept.c.o Ä ¶ :accept.c ¶ diff --git a/otherlibs/num/Makefile.Mac.depend b/otherlibs/num/Makefile.Mac.depend index 53b2dd744..fc5fb274f 100644 --- a/otherlibs/num/Makefile.Mac.depend +++ b/otherlibs/num/Makefile.Mac.depend @@ -1,5 +1,5 @@ #*** Dependencies: Cut here *** -# These dependencies were produced at 14:24:38 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:47:35 on 23 juin 2000 by MakeDepend :nat_stubs.c.x Ä ¶ :nat_stubs.c ¶ @@ -11,7 +11,7 @@ "{CIncludes}"MixedMode.h #*** Dependencies: Cut here *** -# These dependencies were produced at 14:24:40 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:47:37 on 23 juin 2000 by MakeDepend :nat_stubs.c.o Ä ¶ :nat_stubs.c ¶ diff --git a/otherlibs/str/Makefile.Mac.depend b/otherlibs/str/Makefile.Mac.depend index 3000c06a0..346e75744 100644 --- a/otherlibs/str/Makefile.Mac.depend +++ b/otherlibs/str/Makefile.Mac.depend @@ -1,5 +1,5 @@ #*** Dependencies: Cut here *** -# These dependencies were produced at 14:24:46 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:47:42 on 23 juin 2000 by MakeDepend :strstubs.c.x Ä ¶ :strstubs.c ¶ @@ -13,7 +13,7 @@ "{CIncludes}"MixedMode.h #*** Dependencies: Cut here *** -# These dependencies were produced at 14:24:48 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:47:43 on 23 juin 2000 by MakeDepend :strstubs.c.o Ä ¶ :strstubs.c ¶ diff --git a/otherlibs/systhreads/Makefile.Mac.depend b/otherlibs/systhreads/Makefile.Mac.depend index d58e475f9..4b7366e69 100644 --- a/otherlibs/systhreads/Makefile.Mac.depend +++ b/otherlibs/systhreads/Makefile.Mac.depend @@ -1,5 +1,5 @@ #*** Dependencies: Cut here *** -# These dependencies were produced at 14:24:56 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:47:51 on 23 juin 2000 by MakeDepend :posix.c.x Ä ¶ :posix.c ¶ @@ -52,7 +52,7 @@ "{CIncludes}"DateTimeUtils.h #*** Dependencies: Cut here *** -# These dependencies were produced at 14:25:00 on 24 avr 2000 by MakeDepend +# These dependencies were produced at 15:47:57 on 23 juin 2000 by MakeDepend :posix.c.o Ä ¶ :posix.c ¶ diff --git a/parsing/.cvsignore b/parsing/.cvsignore index ac250e89d..260727a78 100644 --- a/parsing/.cvsignore +++ b/parsing/.cvsignore @@ -1,5 +1,7 @@ parser.ml parser.mli lexer.ml +lexer_tmp.mll +lexer_tmp.ml linenum.ml parser.output