Meilleur parsing des directives # line "file".

Ajout de parsing/linenum.{mll,mli}.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1258 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 15 insertions, 4 deletions

diff --git a/Makefile.Mac b/Makefile.Mac
index d24d97ddad..8b49f2971b 100644
--- a/Makefile.Mac
+++ b/Makefile.Mac
@@ -18,8 +18,9 @@ INCLUDES = -I :utils: -I :parsing: -I :typing: -I :bytecomp: ¶
 UTILS = :utils:misc.cmo :utils:tbl.cmo :utils:config.cmo ¶
         :utils:clflags.cmo :utils:terminfo.cmo :utils:ccomp.cmo
 
-PARSING = :parsing:location.cmo :parsing:longident.cmo :parsing:pstream.cmo ¶
-          :parsing:parser.cmo :parsing:lexer.cmo :parsing:parse.cmo
+PARSING = :parsing:linenum.cmo :parsing:location.cmo :parsing:longident.cmo ¶
+          :parsing:pstream.cmo :parsing:parser.cmo :parsing:lexer.cmo ¶
+          :parsing:parse.cmo
 
 TYPING = :typing:ident.cmo :typing:path.cmo ¶
   :typing:primitive.cmo :typing:types.cmo ¶
@@ -231,7 +232,7 @@ clean ÄÄ
 
 beforedepend ÄÄ :utils:config.ml
 
-# The parser generator
+# The parser
 
 :parsing:parser.mli Ä :parsing:parser.ml
     echo -n
@@ -244,7 +245,7 @@ clean ÄÄ
 
 beforedepend ÄÄ :parsing:parser.mli :parsing:parser.ml
 
-# The lexer generator
+# The lexer
 
 :parsing:lexer.ml Ä :parsing:lexer.mll
     {CAMLLEX} :parsing:lexer.mll
@@ -254,6 +255,16 @@ clean ÄÄ
 
 beforedepend ÄÄ :parsing:lexer.ml
 
+# The auxiliary lexer for counting line numbers
+
+:parsing:linenum.ml Ä :parsing:linenum.mll
+    {CAMLLEX} :parsing:linenum.mll
+
+clean ÄÄ
+    delete -i :parsing:linenum.ml
+
+beforedepend ÄÄ :parsing:linenum.ml
+
 # The numeric opcodes
 
 :bytecomp:opcodes.ml Ä :byterun:instruct.h