diff options
| -rw-r--r-- | ocamldoc/.depend | 86 | ||||
| -rw-r--r-- | ocamldoc/Makefile | 40 | ||||
| -rw-r--r-- | ocamldoc/odoc_types.ml | 104 |
3 files changed, 109 insertions, 121 deletions
diff --git a/ocamldoc/.depend b/ocamldoc/.depend index 13148c355..ffdbb50b0 100644 --- a/ocamldoc/.depend +++ b/ocamldoc/.depend @@ -1,15 +1,15 @@ odoc.cmo: ../stdlib/array.cmi ../utils/clflags.cmo ../utils/config.cmi \ ../otherlibs/dynlink/dynlink.cmi ../stdlib/filename.cmi \ ../stdlib/format.cmi ../stdlib/list.cmi ../utils/misc.cmi \ - odoc_analyse.cmi odoc_args.cmi odoc_crc.cmo odoc_dot.cmo odoc_global.cmi \ - odoc_html.cmo odoc_info.cmi odoc_latex.cmo odoc_man.cmo odoc_messages.cmo \ - odoc_texi.cmo ../stdlib/sys.cmi ../typing/typedtree.cmi + odoc_analyse.cmi odoc_args.cmi odoc_dot.cmo odoc_global.cmi odoc_html.cmo \ + odoc_info.cmi odoc_latex.cmo odoc_man.cmo odoc_messages.cmo odoc_texi.cmo \ + ../stdlib/sys.cmi ../typing/typedtree.cmi odoc.cmx: ../stdlib/array.cmx ../utils/clflags.cmx ../utils/config.cmx \ ../otherlibs/dynlink/dynlink.cmx ../stdlib/filename.cmx \ ../stdlib/format.cmx ../stdlib/list.cmx ../utils/misc.cmx \ - odoc_analyse.cmx odoc_args.cmx odoc_crc.cmx odoc_dot.cmx odoc_global.cmx \ - odoc_html.cmx odoc_info.cmx odoc_latex.cmx odoc_man.cmx odoc_messages.cmx \ - odoc_texi.cmx ../stdlib/sys.cmx ../typing/typedtree.cmx + odoc_analyse.cmx odoc_args.cmx odoc_dot.cmx odoc_global.cmx odoc_html.cmx \ + odoc_info.cmx odoc_latex.cmx odoc_man.cmx odoc_messages.cmx odoc_texi.cmx \ + ../stdlib/sys.cmx ../typing/typedtree.cmx odoc_analyse.cmo: ../utils/ccomp.cmi ../utils/clflags.cmo ../utils/config.cmi \ ../typing/ctype.cmi ../typing/env.cmi ../stdlib/filename.cmi \ ../stdlib/format.cmi ../typing/includemod.cmi ../parsing/lexer.cmi \ @@ -17,7 +17,7 @@ odoc_analyse.cmo: ../utils/ccomp.cmi ../utils/clflags.cmo ../utils/config.cmi \ ../utils/misc.cmi odoc_args.cmi odoc_ast.cmi odoc_class.cmo \ odoc_comments.cmi odoc_cross.cmi odoc_dep.cmo odoc_global.cmi \ odoc_merge.cmi odoc_messages.cmo odoc_misc.cmi odoc_module.cmo \ - odoc_sig.cmi odoc_types.cmo ../parsing/parse.cmi ../stdlib/printf.cmi \ + odoc_sig.cmi odoc_types.cmi ../parsing/parse.cmi ../stdlib/printf.cmi \ ../stdlib/sort.cmi ../stdlib/string.cmi ../parsing/syntaxerr.cmi \ ../stdlib/sys.cmi ../bytecomp/translclass.cmi ../bytecomp/translcore.cmi \ ../typing/typeclass.cmi ../typing/typecore.cmi ../typing/typedecl.cmi \ @@ -38,7 +38,7 @@ odoc_analyse.cmx: ../utils/ccomp.cmx ../utils/clflags.cmx ../utils/config.cmx \ ../utils/warnings.cmx odoc_analyse.cmi odoc_args.cmo: ../stdlib/arg.cmi ../utils/clflags.cmo ../utils/config.cmi \ ../stdlib/filename.cmi ../stdlib/list.cmi ../utils/misc.cmi \ - odoc_global.cmi odoc_messages.cmo odoc_module.cmo odoc_types.cmo \ + odoc_global.cmi odoc_messages.cmo odoc_module.cmo odoc_types.cmi \ ../otherlibs/str/str.cmi ../stdlib/string.cmi odoc_args.cmi odoc_args.cmx: ../stdlib/arg.cmx ../utils/clflags.cmx ../utils/config.cmx \ ../stdlib/filename.cmx ../stdlib/list.cmx ../utils/misc.cmx \ @@ -48,7 +48,7 @@ odoc_ast.cmo: ../parsing/asttypes.cmi ../stdlib/filename.cmi \ ../stdlib/hashtbl.cmi ../stdlib/list.cmi ../parsing/location.cmi \ ../utils/misc.cmi odoc_class.cmo odoc_env.cmi odoc_exception.cmo \ odoc_global.cmi odoc_messages.cmo odoc_module.cmo odoc_name.cmi \ - odoc_parameter.cmo odoc_sig.cmi odoc_type.cmo odoc_types.cmo \ + odoc_parameter.cmo odoc_sig.cmi odoc_type.cmo odoc_types.cmi \ odoc_value.cmo ../parsing/parsetree.cmi ../typing/path.cmi \ ../typing/predef.cmi ../otherlibs/str/str.cmi ../stdlib/string.cmi \ ../stdlib/sys.cmi ../typing/typedtree.cmi ../typing/types.cmi \ @@ -63,12 +63,12 @@ odoc_ast.cmx: ../parsing/asttypes.cmi ../stdlib/filename.cmx \ ../stdlib/sys.cmx ../typing/typedtree.cmx ../typing/types.cmx \ odoc_ast.cmi odoc_class.cmo: ../stdlib/list.cmi odoc_name.cmi odoc_parameter.cmo \ - odoc_types.cmo odoc_value.cmo ../typing/types.cmi + odoc_types.cmi odoc_value.cmo ../typing/types.cmi odoc_class.cmx: ../stdlib/list.cmx odoc_name.cmx odoc_parameter.cmx \ odoc_types.cmx odoc_value.cmx ../typing/types.cmx odoc_comments.cmo: ../stdlib/lexing.cmi ../stdlib/list.cmi \ odoc_comments_global.cmi odoc_global.cmi odoc_lexer.cmo odoc_messages.cmo \ - odoc_parser.cmi odoc_see_lexer.cmo odoc_text.cmi odoc_types.cmo \ + odoc_parser.cmi odoc_see_lexer.cmo odoc_text.cmi odoc_types.cmi \ ../otherlibs/str/str.cmi ../stdlib/string.cmi odoc_comments.cmi odoc_comments.cmx: ../stdlib/lexing.cmx ../stdlib/list.cmx \ odoc_comments_global.cmx odoc_global.cmx odoc_lexer.cmx odoc_messages.cmx \ @@ -78,7 +78,7 @@ odoc_comments_global.cmo: odoc_comments_global.cmi odoc_comments_global.cmx: odoc_comments_global.cmi odoc_cross.cmo: ../stdlib/list.cmi odoc_class.cmo odoc_exception.cmo \ odoc_messages.cmo odoc_misc.cmi odoc_module.cmo odoc_name.cmi \ - odoc_parameter.cmo odoc_search.cmi odoc_type.cmo odoc_types.cmo \ + odoc_parameter.cmo odoc_search.cmi odoc_type.cmo odoc_types.cmi \ odoc_value.cmo ../otherlibs/str/str.cmi odoc_cross.cmi odoc_cross.cmx: ../stdlib/list.cmx odoc_class.cmx odoc_exception.cmx \ odoc_messages.cmx odoc_misc.cmx odoc_module.cmx odoc_name.cmx \ @@ -106,24 +106,22 @@ odoc_env.cmo: ../typing/btype.cmi ../stdlib/list.cmi odoc_name.cmi \ odoc_env.cmx: ../typing/btype.cmx ../stdlib/list.cmx odoc_name.cmx \ ../typing/path.cmx ../typing/predef.cmx ../typing/printtyp.cmx \ ../typing/types.cmx odoc_env.cmi -odoc_exception.cmo: odoc_name.cmi odoc_types.cmo ../typing/types.cmi +odoc_exception.cmo: odoc_name.cmi odoc_types.cmi ../typing/types.cmi odoc_exception.cmx: odoc_name.cmx odoc_types.cmx ../typing/types.cmx odoc_global.cmo: odoc_global.cmi odoc_global.cmx: odoc_global.cmi odoc_html.cmo: ../stdlib/array.cmi ../stdlib/buffer.cmi ../stdlib/char.cmi \ - ../stdlib/filename.cmi ../stdlib/format.cmi ../stdlib/list.cmi \ - odoc_args.cmi odoc_dag2html.cmi odoc_info.cmi odoc_messages.cmo \ - odoc_ocamlhtml.cmo odoc_text.cmi ../otherlibs/str/str.cmi \ - ../stdlib/string.cmi + ../stdlib/filename.cmi ../stdlib/list.cmi odoc_args.cmi odoc_dag2html.cmi \ + odoc_info.cmi odoc_messages.cmo odoc_ocamlhtml.cmo odoc_text.cmi \ + ../stdlib/printf.cmi ../otherlibs/str/str.cmi ../stdlib/string.cmi odoc_html.cmx: ../stdlib/array.cmx ../stdlib/buffer.cmx ../stdlib/char.cmx \ - ../stdlib/filename.cmx ../stdlib/format.cmx ../stdlib/list.cmx \ - odoc_args.cmx odoc_dag2html.cmx odoc_info.cmx odoc_messages.cmx \ - odoc_ocamlhtml.cmx odoc_text.cmx ../otherlibs/str/str.cmx \ - ../stdlib/string.cmx + ../stdlib/filename.cmx ../stdlib/list.cmx odoc_args.cmx odoc_dag2html.cmx \ + odoc_info.cmx odoc_messages.cmx odoc_ocamlhtml.cmx odoc_text.cmx \ + ../stdlib/printf.cmx ../otherlibs/str/str.cmx ../stdlib/string.cmx odoc_info.cmo: odoc_analyse.cmi odoc_args.cmi odoc_class.cmo odoc_dep.cmo \ odoc_exception.cmo odoc_global.cmi odoc_messages.cmo odoc_misc.cmi \ odoc_module.cmo odoc_name.cmi odoc_parameter.cmo odoc_scan.cmo \ - odoc_search.cmi odoc_str.cmi odoc_type.cmo odoc_types.cmo odoc_value.cmo \ + odoc_search.cmi odoc_str.cmi odoc_type.cmo odoc_types.cmi odoc_value.cmo \ ../typing/printtyp.cmi odoc_info.cmi odoc_info.cmx: odoc_analyse.cmx odoc_args.cmx odoc_class.cmx odoc_dep.cmx \ odoc_exception.cmx odoc_global.cmx odoc_messages.cmx odoc_misc.cmx \ @@ -154,7 +152,7 @@ odoc_man.cmx: ../stdlib/buffer.cmx ../stdlib/filename.cmx ../stdlib/list.cmx \ ../stdlib/string.cmx ../otherlibs/unix/unix.cmx odoc_merge.cmo: ../stdlib/list.cmi odoc_args.cmi odoc_class.cmo \ odoc_exception.cmo odoc_messages.cmo odoc_module.cmo odoc_name.cmi \ - odoc_parameter.cmo odoc_type.cmo odoc_types.cmo odoc_value.cmo \ + odoc_parameter.cmo odoc_type.cmo odoc_types.cmi odoc_value.cmo \ odoc_merge.cmi odoc_merge.cmx: ../stdlib/list.cmx odoc_args.cmx odoc_class.cmx \ odoc_exception.cmx odoc_messages.cmx odoc_module.cmx odoc_name.cmx \ @@ -169,7 +167,7 @@ odoc_messages.cmx: ../stdlib/array.cmx ../utils/config.cmx ../stdlib/list.cmx \ odoc_misc.cmo: ../typing/btype.cmi ../stdlib/buffer.cmi ../stdlib/char.cmi \ ../typing/ctype.cmi ../stdlib/format.cmi ../typing/ident.cmi \ ../stdlib/list.cmi ../parsing/longident.cmi odoc_messages.cmo \ - odoc_types.cmo ../typing/path.cmi ../typing/printtyp.cmi \ + odoc_types.cmi ../typing/path.cmi ../typing/printtyp.cmi \ ../stdlib/string.cmi ../typing/types.cmi ../otherlibs/unix/unix.cmi \ odoc_misc.cmi odoc_misc.cmx: ../typing/btype.cmx ../stdlib/buffer.cmx ../stdlib/char.cmx \ @@ -179,7 +177,7 @@ odoc_misc.cmx: ../typing/btype.cmx ../stdlib/buffer.cmx ../stdlib/char.cmx \ ../stdlib/string.cmx ../typing/types.cmx ../otherlibs/unix/unix.cmx \ odoc_misc.cmi odoc_module.cmo: ../stdlib/list.cmi odoc_class.cmo odoc_exception.cmo \ - odoc_name.cmi odoc_parameter.cmo odoc_type.cmo odoc_types.cmo \ + odoc_name.cmi odoc_parameter.cmo odoc_type.cmo odoc_types.cmi \ odoc_value.cmo ../typing/types.cmi odoc_module.cmx: ../stdlib/list.cmx odoc_class.cmx odoc_exception.cmx \ odoc_name.cmx odoc_parameter.cmx odoc_type.cmx odoc_types.cmx \ @@ -206,23 +204,23 @@ odoc_opt.cmx: ../utils/clflags.cmx ../utils/config.cmx ../stdlib/format.cmx \ ../stdlib/list.cmx ../utils/misc.cmx odoc_analyse.cmx odoc_args.cmx \ odoc_dot.cmx odoc_global.cmx odoc_html.cmx odoc_info.cmx odoc_latex.cmx \ odoc_man.cmx odoc_messages.cmx odoc_texi.cmx ../typing/typedtree.cmx -odoc_parameter.cmo: ../stdlib/list.cmi odoc_types.cmo ../stdlib/string.cmi \ +odoc_parameter.cmo: ../stdlib/list.cmi odoc_types.cmi ../stdlib/string.cmi \ ../typing/types.cmi odoc_parameter.cmx: ../stdlib/list.cmx odoc_types.cmx ../stdlib/string.cmx \ ../typing/types.cmx odoc_parser.cmo: ../stdlib/lexing.cmi ../stdlib/obj.cmi \ - odoc_comments_global.cmi odoc_types.cmo ../stdlib/parsing.cmi \ + odoc_comments_global.cmi odoc_types.cmi ../stdlib/parsing.cmi \ ../otherlibs/str/str.cmi ../stdlib/string.cmi odoc_parser.cmi odoc_parser.cmx: ../stdlib/lexing.cmx ../stdlib/obj.cmx \ odoc_comments_global.cmx odoc_types.cmx ../stdlib/parsing.cmx \ ../otherlibs/str/str.cmx ../stdlib/string.cmx odoc_parser.cmi odoc_scan.cmo: ../stdlib/list.cmi odoc_class.cmo odoc_exception.cmo \ - odoc_module.cmo odoc_type.cmo odoc_types.cmo odoc_value.cmo + odoc_module.cmo odoc_type.cmo odoc_types.cmi odoc_value.cmo odoc_scan.cmx: ../stdlib/list.cmx odoc_class.cmx odoc_exception.cmx \ odoc_module.cmx odoc_type.cmx odoc_types.cmx odoc_value.cmx odoc_search.cmo: ../stdlib/list.cmi odoc_class.cmo odoc_exception.cmo \ odoc_module.cmo odoc_name.cmi odoc_parameter.cmo odoc_type.cmo \ - odoc_types.cmo odoc_value.cmo ../otherlibs/str/str.cmi odoc_search.cmi + odoc_types.cmi odoc_value.cmo ../otherlibs/str/str.cmi odoc_search.cmi odoc_search.cmx: ../stdlib/list.cmx odoc_class.cmx odoc_exception.cmx \ odoc_module.cmx odoc_name.cmx odoc_parameter.cmx odoc_type.cmx \ odoc_types.cmx odoc_value.cmx ../otherlibs/str/str.cmx odoc_search.cmi @@ -235,7 +233,7 @@ odoc_sig.cmo: ../parsing/asttypes.cmi ../typing/btype.cmi \ ../parsing/location.cmi ../utils/misc.cmi odoc_class.cmo odoc_env.cmi \ odoc_exception.cmo odoc_global.cmi odoc_merge.cmi odoc_messages.cmo \ odoc_misc.cmi odoc_module.cmo odoc_name.cmi odoc_parameter.cmo \ - odoc_type.cmo odoc_types.cmo odoc_value.cmo ../parsing/parsetree.cmi \ + odoc_type.cmo odoc_types.cmi odoc_value.cmo ../parsing/parsetree.cmi \ ../typing/path.cmi ../otherlibs/str/str.cmi ../stdlib/string.cmi \ ../stdlib/sys.cmi ../typing/typedtree.cmi ../typing/types.cmi \ odoc_sig.cmi @@ -270,7 +268,7 @@ odoc_text_lexer.cmo: ../stdlib/buffer.cmi ../stdlib/lexing.cmi \ odoc_text_lexer.cmx: ../stdlib/buffer.cmx ../stdlib/lexing.cmx \ ../stdlib/list.cmx odoc_text_parser.cmx ../otherlibs/str/str.cmx \ ../stdlib/string.cmx -odoc_text_parser.cmo: ../stdlib/lexing.cmi ../stdlib/obj.cmi odoc_types.cmo \ +odoc_text_parser.cmo: ../stdlib/lexing.cmi ../stdlib/obj.cmi odoc_types.cmi \ ../stdlib/parsing.cmi ../otherlibs/str/str.cmi odoc_text_parser.cmi odoc_text_parser.cmx: ../stdlib/lexing.cmx ../stdlib/obj.cmx odoc_types.cmx \ ../stdlib/parsing.cmx ../otherlibs/str/str.cmx odoc_text_parser.cmi @@ -278,12 +276,12 @@ odoc_to_text.cmo: ../stdlib/format.cmi ../stdlib/list.cmi odoc_info.cmi \ odoc_messages.cmo ../otherlibs/str/str.cmi ../stdlib/string.cmi odoc_to_text.cmx: ../stdlib/format.cmx ../stdlib/list.cmx odoc_info.cmx \ odoc_messages.cmx ../otherlibs/str/str.cmx ../stdlib/string.cmx -odoc_type.cmo: odoc_name.cmi odoc_types.cmo ../typing/types.cmi +odoc_type.cmo: odoc_name.cmi odoc_types.cmi ../typing/types.cmi odoc_type.cmx: odoc_name.cmx odoc_types.cmx ../typing/types.cmx -odoc_types.cmo: odoc_messages.cmo -odoc_types.cmx: odoc_messages.cmx +odoc_types.cmo: odoc_messages.cmo odoc_types.cmi +odoc_types.cmx: odoc_messages.cmx odoc_types.cmi odoc_value.cmo: ../stdlib/list.cmi odoc_name.cmi odoc_parameter.cmo \ - odoc_types.cmo ../typing/printtyp.cmi ../stdlib/string.cmi \ + odoc_types.cmi ../typing/printtyp.cmi ../stdlib/string.cmi \ ../typing/types.cmi odoc_value.cmx: ../stdlib/list.cmx odoc_name.cmx odoc_parameter.cmx \ odoc_types.cmx ../typing/printtyp.cmx ../stdlib/string.cmx \ @@ -291,27 +289,27 @@ odoc_value.cmx: ../stdlib/list.cmx odoc_name.cmx odoc_parameter.cmx \ t.cmo: ../stdlib/format.cmi ../stdlib/string.cmi t.cmx: ../stdlib/format.cmx ../stdlib/string.cmx odoc_analyse.cmi: odoc_module.cmo -odoc_args.cmi: ../stdlib/arg.cmi odoc_module.cmo odoc_types.cmo +odoc_args.cmi: ../stdlib/arg.cmi odoc_module.cmo odoc_types.cmi odoc_ast.cmi: ../stdlib/hashtbl.cmi odoc_module.cmo odoc_name.cmi \ odoc_sig.cmi ../parsing/parsetree.cmi ../typing/path.cmi \ ../typing/typedtree.cmi ../typing/types.cmi -odoc_comments.cmi: odoc_types.cmo +odoc_comments.cmi: odoc_types.cmi odoc_cross.cmi: odoc_module.cmo odoc_dag2html.cmi: odoc_info.cmi odoc_env.cmi: odoc_name.cmi ../typing/types.cmi odoc_info.cmi: odoc_class.cmo odoc_exception.cmo odoc_module.cmo \ - odoc_parameter.cmo odoc_search.cmi odoc_type.cmo odoc_types.cmo \ + odoc_parameter.cmo odoc_search.cmi odoc_type.cmo odoc_types.cmi \ odoc_value.cmo ../otherlibs/str/str.cmi ../typing/types.cmi -odoc_merge.cmi: odoc_module.cmo odoc_types.cmo -odoc_misc.cmi: ../parsing/longident.cmi odoc_types.cmo ../typing/types.cmi +odoc_merge.cmi: odoc_module.cmo odoc_types.cmi +odoc_misc.cmi: ../parsing/longident.cmi odoc_types.cmi ../typing/types.cmi odoc_name.cmi: ../typing/ident.cmi ../parsing/longident.cmi \ ../typing/path.cmi -odoc_parser.cmi: ../stdlib/lexing.cmi odoc_types.cmo +odoc_parser.cmi: ../stdlib/lexing.cmi odoc_types.cmi odoc_search.cmi: odoc_class.cmo odoc_exception.cmo odoc_module.cmo \ odoc_type.cmo odoc_value.cmo ../otherlibs/str/str.cmi odoc_sig.cmi: ../stdlib/hashtbl.cmi odoc_class.cmo odoc_env.cmi \ - odoc_module.cmo odoc_name.cmi odoc_types.cmo ../parsing/parsetree.cmi \ + odoc_module.cmo odoc_name.cmi odoc_types.cmi ../parsing/parsetree.cmi \ ../typing/types.cmi odoc_str.cmi: odoc_exception.cmo odoc_type.cmo odoc_value.cmo -odoc_text.cmi: odoc_types.cmo -odoc_text_parser.cmi: ../stdlib/lexing.cmi odoc_types.cmo +odoc_text.cmi: odoc_types.cmi +odoc_text_parser.cmi: ../stdlib/lexing.cmi odoc_types.cmi diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile index df4d48425..6a1e4b845 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile @@ -180,14 +180,14 @@ libopt: $(OCAMLDOC_LIBCMXA) $(OCAMLDOC_LIBCMI) debug: make OCAMLPP="" -$(OCAMLDOC): $(EXECMIFILES) $(EXECMOFILES) odoc_crc.cmo odoc.cmo +$(OCAMLDOC): $(EXECMOFILES) odoc_crc.cmo odoc.cmo $(OCAMLC) -o $@ unix.cma str.cma dynlink.cma $(LINKFLAGS) $(OCAMLCMOFILES) $(EXECMOFILES) odoc_crc.cmo odoc.cmo -$(OCAMLDOC_OPT): $(EXECMIFILES) $(EXECMXFILES) odoc_opt.cmx +$(OCAMLDOC_OPT): $(EXECMXFILES) odoc_opt.cmx $(OCAMLOPT) -o $@ unix.cmxa str.cmxa $(LINKFLAGS) $(OCAMLCMXFILES) $(EXECMXFILES) odoc_opt.cmx -$(OCAMLDOC_LIBCMA): $(LIBCMIFILES) $(LIBCMOFILES) +$(OCAMLDOC_LIBCMA): $(LIBCMOFILES) $(OCAMLC) -a -o $@ $(LINKFLAGS) $(OCAMLCMOFILES) $(LIBCMOFILES) -$(OCAMLDOC_LIBCMXA): $(LIBCMIFILES) $(LIBCMXFILES) +$(OCAMLDOC_LIBCMXA): $(LIBCMXFILES) $(OCAMLOPT) -a -o $@ $(LINKFLAGS) $(OCAMLCMXFILES) $(LIBCMXFILES) manpages: stdlib_man @@ -267,27 +267,41 @@ odoc_crc.ml: $(CMIFILES) Odoc_dag2html Odoc_ocamlhtml Odoc_html\ Odoc_latex Odoc_man Odoc_texi Odoc_scan > $@ +# Parsers and lexers dependencies : +################################### +odoc_text_parser.ml: odoc_text_parser.mly +odoc_text_parser.mli: odoc_text_parser.mly + +odoc_parser.ml: odoc_parser.mly +odoc_parser.mli:odoc_parser.mly + +odoc_text_lexer.ml: odoc_text_lexer.mll + +odoc_lexer.ml:odoc_lexer.mll + +odoc_ocamlhtml.ml: odoc_ocamlhtml.mll + +odoc_see_lexer.ml: odoc_see_lexer.mll + + # generic rules : ################# -.SUFFIXES: .mli .ml .cmi .cmo .cmx .mll .mly - -%.cmi:%.mli - $(OCAMLC) $(OCAMLPP) $(COMPFLAGS) -c $< +.SUFFIXES: .mll .mly .ml .mli .cmo .cmi .cmx -%.cmo:%.ml +.ml.cmo: $(OCAMLC) $(OCAMLPP) $(COMPFLAGS) -c $< -%.cmi %.cmo:%.ml +.mli.cmi: $(OCAMLC) $(OCAMLPP) $(COMPFLAGS) -c $< -%.cmx %.o:%.ml +.ml.cmx: $(OCAMLOPT) $(OCAMLPP) $(COMPFLAGS) -c $< -%.ml:%.mll +.mll.ml: $(OCAMLLEX) $< -%.mli %.ml:%.mly +.mly.ml: $(OCAMLYACC) -v $< # Installation targets diff --git a/ocamldoc/odoc_types.ml b/ocamldoc/odoc_types.ml index d4f9931d5..a8a24e444 100644 --- a/ocamldoc/odoc_types.ml +++ b/ocamldoc/odoc_types.ml @@ -10,9 +10,6 @@ (***********************************************************************) -(** Types for the information collected in comments. *) - -(** The differents kinds of element references. *) type ref_kind = RK_module | RK_module_type @@ -26,62 +23,53 @@ type ref_kind = | RK_section type text_element = - | Raw of string (** Raw text. *) - | Code of string (** The string is source code. *) - | CodePre of string (** The string is pre-formatted source code. *) - | Verbatim of string (** String 'as is'. *) - | Bold of text (** Text in bold style. *) - | Italic of text (** Text in italic. *) - | Emphasize of text (** Emphasized text. *) - | Center of text (** Centered text. *) - | Left of text (** Left alignment. *) - | Right of text (** Right alignment. *) - | List of text list (** A list. *) - | Enum of text list (** An enumerated list. *) - | Newline (** To force a line break. *) - | Block of text (** Like html's block quote. *) + | Raw of string + | Code of string + | CodePre of string + | Verbatim of string + | Bold of text + | Italic of text + | Emphasize of text + | Center of text + | Left of text + | Right of text + | List of text list + | Enum of text list + | Newline + | Block of text | Title of int * string option * text - (** Style number, optional label, and text. *) - | Latex of string (** A string for latex. *) - | Link of string * text (** A reference string and the link text. *) + | Latex of string + | Link of string * text | Ref of string * ref_kind option - (** A reference to an element. Complete name and kind. *) - | Superscript of text (** Superscripts. *) - | Subscript of text (** Subscripts. *) + | Superscript of text + | Subscript of text -(** [text] is a list of text_elements. The order matters. *) and text = text_element list -(** The different forms of references in \@see tags. *) type see_ref = See_url of string | See_file of string | See_doc of string -(** The information in a \@see tag. *) type see = see_ref * text -(** Parameter name and description. *) type param = (string * text) -(** Raised exception name and description. *) type raised_exception = (string * text) -(** Information in a special comment. *) type info = { - i_desc : text option; (** The description text. *) - i_authors : string list; (** The list of authors in \@author tags. *) - i_version : string option; (** The string in the \@version tag. *) - i_sees : see list; (** The list of \@see tags. *) - i_since : string option; (** The string in the \@since tag. *) - i_deprecated : text option; (** The of the \@deprecated tag. *) - i_params : param list; (** The list of parameter descriptions. *) - i_raised_exceptions : raised_exception list; (** The list of raised exceptions. *) - i_return_value : text option ; (** The description text of the return value. *) - i_custom : (string * text) list ; (** A text associated to a custom @-tag. *) + i_desc : text option; + i_authors : string list; + i_version : string option; + i_sees : see list; + i_since : string option; + i_deprecated : text option; + i_params : param list; + i_raised_exceptions : raised_exception list; + i_return_value : text option ; + i_custom : (string * text) list ; } -(** An empty info structure. *) let dummy_info = { i_desc = None ; i_authors = [] ; @@ -95,31 +83,25 @@ let dummy_info = { i_custom = [] ; } -(** Location of elements in implementation and interface files. *) type location = { - loc_impl : (string * int) option ; (** implementation file name and position *) - loc_inter : (string * int) option ; (** interface file name and position *) + loc_impl : (string * int) option ; + loc_inter : (string * int) option ; } -(** A dummy location. *) let dummy_loc = { loc_impl = None ; loc_inter = None } -(** The information to merge from two elements when they both have some information. *) type merge_option = - | Merge_description (** Descriptions are concatenated. *) - | Merge_author (** Lists of authors are concatenated. *) - | Merge_version (** Versions are concatenated. *) - | Merge_see (** See references are concatenated. *) - | Merge_since (** Since information are concatenated. *) - | Merge_deprecated (** Deprecated information are concatenated. *) - | Merge_param (** Information on each parameter is concatenated, - and all parameters are kept. *) - | Merge_raised_exception (** Information on each raised_exception is concatenated, - and all raised exceptions are kept. *) - | Merge_return_value (** Information on return value are concatenated. *) - | Merge_custom (** Merge custom tags (all pairs (tag, text) are kept). *) + | Merge_description + | Merge_author + | Merge_version + | Merge_see + | Merge_since + | Merge_deprecated + | Merge_param + | Merge_raised_exception + | Merge_return_value + | Merge_custom -(** The list with all merge options. *) let all_merge_options = [ Merge_description ; Merge_author ; @@ -133,20 +115,14 @@ let all_merge_options = [ Merge_custom ; ] -(** Type of magic numbers. *) type magic = string -(** The magic number for the dumps of this version of ocamldoc. *) let magic = Odoc_messages.magic -(** A dump of a structure. *) type 'a dump = Dump of magic * 'a -(** Create a dump structure. *) let make_dump a = Dump (magic, a) -(** Verify that a dump has the correct magic number - and return its content. *) let open_dump = function Dump (m, a) -> if m = magic then a |