New implementation of cmt2annot, based on an OO iterator for typed tr…

…ees. Mostly work for Partial_implementation (ocaml#5816).

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

tools/.depend

@@ -1,24 +1,28 @@
 depend.cmi : ../parsing/parsetree.cmi
 profiling.cmi :
-typedtreeIter.cmi : ../typing/typedtree.cmi ../parsing/asttypes.cmi
+tast_iter.cmi : ../typing/typedtree.cmi ../parsing/asttypes.cmi
 untypeast.cmi : ../typing/typedtree.cmi ../typing/path.cmi \
     ../parsing/parsetree.cmi ../parsing/longident.cmi
 addlabels.cmo : ../parsing/parsetree.cmi ../parsing/parse.cmi \
     ../parsing/longident.cmi ../parsing/location.cmi ../parsing/asttypes.cmi
 addlabels.cmx : ../parsing/parsetree.cmi ../parsing/parse.cmx \
     ../parsing/longident.cmx ../parsing/location.cmx ../parsing/asttypes.cmi
-cmt2annot.cmo : typedtreeIter.cmi ../typing/typedtree.cmi \
-    ../typing/stypes.cmi ../typing/path.cmi ../typing/oprint.cmi \
-    ../parsing/location.cmi ../typing/ident.cmi ../typing/env.cmi \
+ast_mapper.cmo : ../parsing/parsetree.cmi ../parsing/longident.cmi \
+    ../parsing/location.cmi ../utils/config.cmi ../parsing/asttypes.cmi
+ast_mapper.cmx : ../parsing/parsetree.cmi ../parsing/longident.cmx \
+    ../parsing/location.cmx ../utils/config.cmx ../parsing/asttypes.cmi
+cmt2annot.cmo : untypeast.cmi ../typing/types.cmi \
+    ../typing/typedtreeIter.cmi ../typing/typedtree.cmi tast_iter.cmi \
+    ../typing/stypes.cmi ../parsing/pprintast.cmi ../typing/path.cmi \
+    ../typing/oprint.cmi ../parsing/location.cmi ../typing/ident.cmi \
+    ../typing/envaux.cmi ../typing/env.cmi ../utils/config.cmi \
     ../typing/cmt_format.cmi ../parsing/asttypes.cmi ../typing/annot.cmi
-cmt2annot.cmx : typedtreeIter.cmx ../typing/typedtree.cmx \
-    ../typing/stypes.cmx ../typing/path.cmx ../typing/oprint.cmx \
-    ../parsing/location.cmx ../typing/ident.cmx ../typing/env.cmx \
+cmt2annot.cmx : untypeast.cmx ../typing/types.cmx \
+    ../typing/typedtreeIter.cmx ../typing/typedtree.cmx tast_iter.cmx \
+    ../typing/stypes.cmx ../parsing/pprintast.cmx ../typing/path.cmx \
+    ../typing/oprint.cmx ../parsing/location.cmx ../typing/ident.cmx \
+    ../typing/envaux.cmx ../typing/env.cmx ../utils/config.cmx \
     ../typing/cmt_format.cmx ../parsing/asttypes.cmi ../typing/annot.cmi
-cmt2ml.cmo : untypeast.cmi ../typing/typedtree.cmi pprintast.cmo \
-    ../typing/cmt_format.cmi
-cmt2ml.cmx : untypeast.cmx ../typing/typedtree.cmx pprintast.cmx \
-    ../typing/cmt_format.cmx
 cvt_emit.cmo :
 cvt_emit.cmx :
 depend.cmo : ../parsing/parsetree.cmi ../utils/misc.cmi \
@@ -37,26 +41,32 @@ dumpobj.cmx : ../utils/tbl.cmx opnames.cmx ../bytecomp/opcodes.cmx \
     ../bytecomp/instruct.cmx ../typing/ident.cmx ../bytecomp/emitcode.cmx \
     ../utils/config.cmx ../bytecomp/cmo_format.cmi \
     ../bytecomp/bytesections.cmx ../parsing/asttypes.cmi
+eqparsetree.cmo : ../parsing/parsetree.cmi ../parsing/longident.cmi \
+    ../parsing/location.cmi ../parsing/asttypes.cmi
+eqparsetree.cmx : ../parsing/parsetree.cmi ../parsing/longident.cmx \
+    ../parsing/location.cmx ../parsing/asttypes.cmi
 myocamlbuild_config.cmo :
 myocamlbuild_config.cmx :
 objinfo.cmo : ../utils/misc.cmi ../utils/config.cmi \
     ../asmcomp/cmx_format.cmi ../bytecomp/cmo_format.cmi \
-    ../asmcomp/clambda.cmi ../bytecomp/bytesections.cmi
+    ../typing/cmi_format.cmi ../asmcomp/clambda.cmi \
+    ../bytecomp/bytesections.cmi
 objinfo.cmx : ../utils/misc.cmx ../utils/config.cmx \
     ../asmcomp/cmx_format.cmi ../bytecomp/cmo_format.cmi \
-    ../asmcomp/clambda.cmx ../bytecomp/bytesections.cmx
+    ../typing/cmi_format.cmx ../asmcomp/clambda.cmx \
+    ../bytecomp/bytesections.cmx
 ocaml299to3.cmo :
 ocaml299to3.cmx :
 ocamlcp.cmo : ../driver/main_args.cmi
 ocamlcp.cmx : ../driver/main_args.cmx
-ocamldep.cmo : ../parsing/syntaxerr.cmi ../parsing/parsetree.cmi \
-    ../parsing/parse.cmi ../utils/misc.cmi ../parsing/longident.cmi \
-    ../parsing/location.cmi ../parsing/lexer.cmi depend.cmi \
-    ../utils/config.cmi ../utils/clflags.cmi
-ocamldep.cmx : ../parsing/syntaxerr.cmx ../parsing/parsetree.cmi \
-    ../parsing/parse.cmx ../utils/misc.cmx ../parsing/longident.cmx \
-    ../parsing/location.cmx ../parsing/lexer.cmx depend.cmx \
-    ../utils/config.cmx ../utils/clflags.cmx
+ocamldep.cmo : ../parsing/syntaxerr.cmi ../driver/pparse.cmi \
+    ../parsing/parsetree.cmi ../parsing/parse.cmi ../utils/misc.cmi \
+    ../parsing/longident.cmi ../parsing/location.cmi ../parsing/lexer.cmi \
+    depend.cmi ../utils/config.cmi ../utils/clflags.cmi
+ocamldep.cmx : ../parsing/syntaxerr.cmx ../driver/pparse.cmx \
+    ../parsing/parsetree.cmi ../parsing/parse.cmx ../utils/misc.cmx \
+    ../parsing/longident.cmx ../parsing/location.cmx ../parsing/lexer.cmx \
+    depend.cmx ../utils/config.cmx ../utils/clflags.cmx
 ocamlmklib.cmo : myocamlbuild_config.cmo
 ocamlmklib.cmx : myocamlbuild_config.cmx
 ocamlmktop.cmo : ../utils/ccomp.cmi
@@ -73,10 +83,6 @@ ocamlprof.cmx : ../utils/warnings.cmx ../parsing/syntaxerr.cmx \
     ../utils/clflags.cmx
 opnames.cmo :
 opnames.cmx :
-pprintast.cmo : ../parsing/parsetree.cmi ../parsing/longident.cmi \
-    ../parsing/location.cmi ../parsing/asttypes.cmi
-pprintast.cmx : ../parsing/parsetree.cmi ../parsing/longident.cmx \
-    ../parsing/location.cmx ../parsing/asttypes.cmi
 primreq.cmo : ../utils/config.cmi ../bytecomp/cmo_format.cmi
 primreq.cmx : ../utils/config.cmx ../bytecomp/cmo_format.cmi
 profiling.cmo : profiling.cmi
@@ -85,10 +91,10 @@ read_cmt.cmo : ../typing/cmt_format.cmi cmt2annot.cmo ../utils/clflags.cmi
 read_cmt.cmx : ../typing/cmt_format.cmx cmt2annot.cmx ../utils/clflags.cmx
 scrapelabels.cmo :
 scrapelabels.cmx :
-typedtreeIter.cmo : ../typing/typedtree.cmi ../utils/misc.cmi \
-    ../parsing/asttypes.cmi typedtreeIter.cmi
-typedtreeIter.cmx : ../typing/typedtree.cmx ../utils/misc.cmx \
-    ../parsing/asttypes.cmi typedtreeIter.cmi
+tast_iter.cmo : ../typing/typedtree.cmi ../parsing/asttypes.cmi \
+    tast_iter.cmi
+tast_iter.cmx : ../typing/typedtree.cmx ../parsing/asttypes.cmi \
+    tast_iter.cmi
 untypeast.cmo : ../typing/typedtree.cmi ../typing/path.cmi \
     ../parsing/parsetree.cmi ../utils/misc.cmi ../parsing/longident.cmi \
     ../typing/ident.cmi ../parsing/asttypes.cmi untypeast.cmi

tools/Makefile.shared

@@ -24,7 +24,7 @@ LINKFLAGS=$(INCLUDES)
 all: ocamldep ocamlprof ocamlcp ocamloptp ocamlmktop ocamlmklib dumpobj \
      objinfo read_cmt
 
-all: ast_mapper.cmo
+all: ast_mapper.cmo tast_iter.cmo
 
 # scrapelabels addlabels
 
@@ -233,6 +233,7 @@ READ_CMT= \
           ../typing/stypes.cmo \
           \
           untypeast.cmo \
+          tast_iter.cmo \
           cmt2annot.cmo read_cmt.cmo
 
 read_cmt: $(READ_CMT)