Commit 5dd9400e authored by Pietro Abate's avatar Pietro Abate
Browse files

[r2007-06-12 12:58:41 by afrisch] starting to upgrade to OCaml 3.10

Original author: afrisch
Date: 2007-06-12 12:59:44+00:00
parent 36908774
......@@ -66,14 +66,14 @@ ifeq ($(NATIVE), true)
EXTENSION_LIB = cmxa
CAML=ocamlopt
COMPILE = $(CAMLOPT)
LINK = $(CAMLOPT) -linkpkg gramlib.cmxa camlp4.cmxa pr_o.cmx
LINK = $(CAMLOPT) -linkpkg camlp4lib.cmxa
SYNTAX += -symbol ocaml_compiler=\"native\"
else
EXTENSION = cmo
EXTENSION_LIB = cma
COMPILE = $(CAMLC)
CAML=ocamlc
LINK = $(CAMLC) -custom -linkpkg gramlib.cma camlp4.cma pr_o.cmo
LINK = $(CAMLC) -custom -linkpkg camlp4lib.cma
SYNTAX += -symbol ocaml_compiler=\"bytecode\"
endif
......@@ -131,7 +131,7 @@ CLEAN_DIRS = $(DIRS) tools tests
# Objects to build
OBJECTS = \
driver/config.cmo misc/stats.cmo misc/custom.cmo misc/encodings.cmo \
driver/cduce_config.cmo misc/stats.cmo misc/custom.cmo misc/encodings.cmo \
misc/upool.cmo misc/pretty.cmo misc/ns.cmo misc/imap.cmo misc/html.cmo \
\
types/compunit.cmo types/sortedList.cmo misc/bool.cmo types/ident.cmo \
......@@ -151,7 +151,7 @@ OBJECTS = \
compile/lambda.cmo \
runtime/run_dispatch.cmo runtime/explain.cmo runtime/eval.cmo \
\
parser/location.cmo parser/url.cmo \
parser/cduce_loc.cmo parser/url.cmo \
parser/ulexer.cmo parser/ast.cmo parser/parser.cmo \
\
typing/typed.cmo typing/typepat.cmo types/externals.cmo typing/typer.cmo \
......@@ -281,7 +281,7 @@ $(ALL_INTERFACES): misc/q_symbol.cmo
misc/q_symbol.cmo: misc/q_symbol.ml
@echo "Build $@"
$(HIDE)$(CAMLC) -c -pp 'camlp4o pa_extend.cmo q_MLast.cmo' $<
$(HIDE)$(CAMLC) -c -pp camlp4orf $<
.ml.cmo:
@echo "Build $@"
......
......@@ -174,7 +174,7 @@ let compile_rec_funs env funs =
(****************************************)
open Location
open Cduce_loc
let eval ~run ~show (tenv,cenv,codes) e =
let (e,t) = Typer.type_expr tenv e in
......
open Location
open Cduce_loc
type type_fun = Types.t -> bool -> Types.t
let register op arity typ eval =
......
open Location
open Cduce_loc
type type_fun = Types.t -> bool -> Types.t
val register:
......
driver/config.cmo: driver/config.cmi
driver/config.cmx: driver/config.cmi
driver/cduce_config.cmo: driver/cduce_config.cmi
driver/cduce_config.cmx: driver/cduce_config.cmi
misc/stats.cmo: misc/stats.cmi
misc/stats.cmx: misc/stats.cmi
misc/encodings.cmo: misc/custom.cmo misc/encodings.cmi
......@@ -44,10 +44,10 @@ compile/auto_pat.cmo: types/types.cmi types/ident.cmo types/chars.cmi \
types/atoms.cmi compile/auto_pat.cmi
compile/auto_pat.cmx: types/types.cmx types/ident.cmx types/chars.cmx \
types/atoms.cmx compile/auto_pat.cmi
types/sequence.cmo: types/types.cmi types/chars.cmi types/atoms.cmi \
types/sequence.cmi
types/sequence.cmx: types/types.cmx types/chars.cmx types/atoms.cmx \
types/sequence.cmi
types/sequence.cmo: types/types.cmi misc/custom.cmo types/chars.cmi \
types/atoms.cmi types/sequence.cmi
types/sequence.cmx: types/types.cmx misc/custom.cmx types/chars.cmx \
types/atoms.cmx types/sequence.cmi
types/builtin_defs.cmo: types/types.cmi types/sequence.cmi \
types/intervals.cmi types/ident.cmo misc/encodings.cmi types/chars.cmi \
types/atoms.cmi types/builtin_defs.cmi
......@@ -100,6 +100,10 @@ types/patterns.cmo: types/types.cmi types/sortedList.cmi types/sequence.cmi \
types/patterns.cmx: types/types.cmx types/sortedList.cmx types/sequence.cmx \
types/ident.cmx misc/custom.cmx types/chars.cmx compile/auto_pat.cmx \
types/atoms.cmx types/patterns.cmi
compile/print_auto.cmo: types/types.cmi types/ident.cmo compile/auto_pat.cmi \
compile/print_auto.cmi
compile/print_auto.cmx: types/types.cmx types/ident.cmx compile/auto_pat.cmx \
compile/print_auto.cmi
compile/lambda.cmo: runtime/value.cmi types/types.cmi \
schema/schema_validator.cmi misc/ns.cmi misc/imap.cmi types/ident.cmo \
types/compunit.cmi compile/auto_pat.cmi compile/lambda.cmi
......@@ -126,57 +130,57 @@ runtime/eval.cmx: runtime/value.cmx misc/upool.cmx types/types.cmx \
schema/schema_validator.cmx schema/schema_common.cmx \
runtime/run_dispatch.cmx misc/ns.cmx compile/lambda.cmx misc/imap.cmx \
types/ident.cmx runtime/explain.cmx compile/auto_pat.cmx runtime/eval.cmi
parser/location.cmo: misc/html.cmi parser/location.cmi
parser/location.cmx: misc/html.cmx parser/location.cmi
parser/url.cmo: runtime/value.cmi parser/location.cmi parser/url.cmi
parser/url.cmx: runtime/value.cmx parser/location.cmx parser/url.cmi
parser/cduce_loc.cmo: misc/html.cmi parser/cduce_loc.cmi
parser/cduce_loc.cmx: misc/html.cmx parser/cduce_loc.cmi
parser/url.cmo: runtime/value.cmi parser/cduce_loc.cmi parser/url.cmi
parser/url.cmx: runtime/value.cmx parser/cduce_loc.cmx parser/url.cmi
parser/ulexer.cmo: parser/ulexer.cmi
parser/ulexer.cmx: parser/ulexer.cmi
parser/ast.cmo: types/types.cmi types/sequence.cmi misc/ns.cmi \
parser/location.cmi types/intervals.cmi types/ident.cmo types/chars.cmi \
types/intervals.cmi types/ident.cmo types/chars.cmi parser/cduce_loc.cmi \
types/builtin_defs.cmi
parser/ast.cmx: types/types.cmx types/sequence.cmx misc/ns.cmx \
parser/location.cmx types/intervals.cmx types/ident.cmx types/chars.cmx \
types/intervals.cmx types/ident.cmx types/chars.cmx parser/cduce_loc.cmx \
types/builtin_defs.cmx
parser/parser.cmo: parser/ulexer.cmi types/types.cmi types/sequence.cmi \
misc/ns.cmi parser/location.cmi types/intervals.cmi types/ident.cmo \
misc/encodings.cmi types/chars.cmi types/atoms.cmi parser/ast.cmo \
misc/ns.cmi types/intervals.cmi types/ident.cmo misc/encodings.cmi \
types/chars.cmi parser/cduce_loc.cmi types/atoms.cmi parser/ast.cmo \
parser/parser.cmi
parser/parser.cmx: parser/ulexer.cmx types/types.cmx types/sequence.cmx \
misc/ns.cmx parser/location.cmx types/intervals.cmx types/ident.cmx \
misc/encodings.cmx types/chars.cmx types/atoms.cmx parser/ast.cmx \
misc/ns.cmx types/intervals.cmx types/ident.cmx misc/encodings.cmx \
types/chars.cmx parser/cduce_loc.cmx types/atoms.cmx parser/ast.cmx \
parser/parser.cmi
typing/typed.cmo: types/types.cmi schema/schema_validator.cmi \
types/patterns.cmi misc/ns.cmi parser/location.cmi types/ident.cmo \
types/compunit.cmi
types/patterns.cmi misc/ns.cmi types/ident.cmo types/compunit.cmi \
parser/cduce_loc.cmi
typing/typed.cmx: types/types.cmx schema/schema_validator.cmx \
types/patterns.cmx misc/ns.cmx parser/location.cmx types/ident.cmx \
types/compunit.cmx
types/patterns.cmx misc/ns.cmx types/ident.cmx types/compunit.cmx \
parser/cduce_loc.cmx
typing/typepat.cmo: types/types.cmi types/sequence.cmi types/patterns.cmi \
types/ident.cmo types/chars.cmi typing/typepat.cmi
types/ident.cmo misc/encodings.cmi types/chars.cmi typing/typepat.cmi
typing/typepat.cmx: types/types.cmx types/sequence.cmx types/patterns.cmx \
types/ident.cmx types/chars.cmx typing/typepat.cmi
types/externals.cmo: parser/location.cmi types/externals.cmi
types/externals.cmx: parser/location.cmx types/externals.cmi
types/ident.cmx misc/encodings.cmx types/chars.cmx typing/typepat.cmi
types/externals.cmo: parser/cduce_loc.cmi types/externals.cmi
types/externals.cmx: parser/cduce_loc.cmx types/externals.cmi
typing/typer.cmo: types/types.cmi typing/typepat.cmi typing/typed.cmo \
types/sequence.cmi types/patterns.cmi misc/ns.cmi parser/location.cmi \
types/ident.cmo misc/html.cmi types/externals.cmi types/compunit.cmi \
types/chars.cmi types/builtin_defs.cmi types/atoms.cmi parser/ast.cmo \
typing/typer.cmi
types/sequence.cmi schema/schema_validator.cmi types/patterns.cmi \
misc/ns.cmi types/ident.cmo misc/html.cmi types/externals.cmi \
types/compunit.cmi types/chars.cmi parser/cduce_loc.cmi \
types/builtin_defs.cmi types/atoms.cmi parser/ast.cmo typing/typer.cmi
typing/typer.cmx: types/types.cmx typing/typepat.cmx typing/typed.cmx \
types/sequence.cmx types/patterns.cmx misc/ns.cmx parser/location.cmx \
types/ident.cmx misc/html.cmx types/externals.cmx types/compunit.cmx \
types/chars.cmx types/builtin_defs.cmx types/atoms.cmx parser/ast.cmx \
typing/typer.cmi
types/sequence.cmx schema/schema_validator.cmx types/patterns.cmx \
misc/ns.cmx types/ident.cmx misc/html.cmx types/externals.cmx \
types/compunit.cmx types/chars.cmx parser/cduce_loc.cmx \
types/builtin_defs.cmx types/atoms.cmx parser/ast.cmx typing/typer.cmi
compile/compile.cmo: runtime/value.cmi misc/upool.cmi types/types.cmi \
typing/typer.cmi typing/typed.cmo types/patterns.cmi parser/location.cmi \
compile/lambda.cmi misc/imap.cmi types/ident.cmo runtime/eval.cmi \
types/compunit.cmi compile/auto_pat.cmi parser/ast.cmo \
typing/typer.cmi typing/typed.cmo types/patterns.cmi compile/lambda.cmi \
misc/imap.cmi types/ident.cmo runtime/eval.cmi types/compunit.cmi \
parser/cduce_loc.cmi compile/auto_pat.cmi parser/ast.cmo \
compile/compile.cmi
compile/compile.cmx: runtime/value.cmx misc/upool.cmx types/types.cmx \
typing/typer.cmx typing/typed.cmx types/patterns.cmx parser/location.cmx \
compile/lambda.cmx misc/imap.cmx types/ident.cmx runtime/eval.cmx \
types/compunit.cmx compile/auto_pat.cmx parser/ast.cmx \
typing/typer.cmx typing/typed.cmx types/patterns.cmx compile/lambda.cmx \
misc/imap.cmx types/ident.cmx runtime/eval.cmx types/compunit.cmx \
parser/cduce_loc.cmx compile/auto_pat.cmx parser/ast.cmx \
compile/compile.cmi
schema/schema_parser.cmo: parser/url.cmi schema/schema_xml.cmi \
schema/schema_validator.cmi schema/schema_types.cmi \
......@@ -199,11 +203,11 @@ schema/schema_converter.cmx: runtime/value.cmx types/types.cmx \
schema/schema_builtin.cmx misc/ns.cmx types/ident.cmx misc/encodings.cmx \
types/builtin_defs.cmx types/atoms.cmx
runtime/load_xml.cmo: runtime/value.cmi parser/url.cmi misc/upool.cmi \
misc/ns.cmi parser/location.cmi misc/imap.cmi types/ident.cmo \
misc/encodings.cmi types/atoms.cmi runtime/load_xml.cmi
misc/ns.cmi misc/imap.cmi types/ident.cmo misc/encodings.cmi \
parser/cduce_loc.cmi types/atoms.cmi runtime/load_xml.cmi
runtime/load_xml.cmx: runtime/value.cmx parser/url.cmx misc/upool.cmx \
misc/ns.cmx parser/location.cmx misc/imap.cmx types/ident.cmx \
misc/encodings.cmx types/atoms.cmx runtime/load_xml.cmi
misc/ns.cmx misc/imap.cmx types/ident.cmx misc/encodings.cmx \
parser/cduce_loc.cmx types/atoms.cmx runtime/load_xml.cmi
runtime/print_xml.cmo: runtime/value.cmi types/sequence.cmi \
schema/schema_builtin.cmi misc/ns.cmi types/intervals.cmi misc/imap.cmi \
types/ident.cmo misc/encodings.cmi types/atoms.cmi runtime/print_xml.cmi
......@@ -211,137 +215,117 @@ runtime/print_xml.cmx: runtime/value.cmx types/sequence.cmx \
schema/schema_builtin.cmx misc/ns.cmx types/intervals.cmx misc/imap.cmx \
types/ident.cmx misc/encodings.cmx types/atoms.cmx runtime/print_xml.cmi
compile/operators.cmo: runtime/value.cmi types/types.cmi typing/typer.cmi \
parser/location.cmi runtime/eval.cmi compile/operators.cmi
runtime/eval.cmi parser/cduce_loc.cmi compile/operators.cmi
compile/operators.cmx: runtime/value.cmx types/types.cmx typing/typer.cmx \
parser/location.cmx runtime/eval.cmx compile/operators.cmi
runtime/eval.cmx parser/cduce_loc.cmx compile/operators.cmi
types/builtin.cmo: runtime/value.cmi parser/url.cmi types/types.cmi \
typing/typer.cmi types/sequence.cmi runtime/print_xml.cmi \
compile/operators.cmi misc/ns.cmi parser/location.cmi \
runtime/load_xml.cmi types/intervals.cmi types/ident.cmo runtime/eval.cmi \
types/chars.cmi types/builtin_defs.cmi types/atoms.cmi types/builtin.cmi
compile/operators.cmi misc/ns.cmi runtime/load_xml.cmi \
types/intervals.cmi types/ident.cmo runtime/eval.cmi types/chars.cmi \
parser/cduce_loc.cmi types/builtin_defs.cmi types/atoms.cmi \
types/builtin.cmi
types/builtin.cmx: runtime/value.cmx parser/url.cmx types/types.cmx \
typing/typer.cmx types/sequence.cmx runtime/print_xml.cmx \
compile/operators.cmx misc/ns.cmx parser/location.cmx \
runtime/load_xml.cmx types/intervals.cmx types/ident.cmx runtime/eval.cmx \
types/chars.cmx types/builtin_defs.cmx types/atoms.cmx types/builtin.cmi
driver/librarian.cmo: runtime/value.cmi types/types.cmi typing/typer.cmi \
parser/parser.cmi misc/ns.cmi parser/location.cmi compile/lambda.cmi \
types/ident.cmo types/externals.cmi runtime/eval.cmi types/compunit.cmi \
compile/compile.cmi types/builtin.cmi driver/librarian.cmi
driver/librarian.cmx: runtime/value.cmx types/types.cmx typing/typer.cmx \
parser/parser.cmx misc/ns.cmx parser/location.cmx compile/lambda.cmx \
types/ident.cmx types/externals.cmx runtime/eval.cmx types/compunit.cmx \
compile/compile.cmx types/builtin.cmx driver/librarian.cmi
compile/operators.cmx misc/ns.cmx runtime/load_xml.cmx \
types/intervals.cmx types/ident.cmx runtime/eval.cmx types/chars.cmx \
parser/cduce_loc.cmx types/builtin_defs.cmx types/atoms.cmx \
types/builtin.cmi
driver/librarian.cmo: runtime/value.cmi parser/ulexer.cmi types/types.cmi \
typing/typer.cmi parser/parser.cmi compile/lambda.cmi types/ident.cmo \
types/externals.cmi runtime/eval.cmi types/compunit.cmi \
compile/compile.cmi parser/cduce_loc.cmi types/builtin.cmi \
driver/librarian.cmi
driver/librarian.cmx: runtime/value.cmx parser/ulexer.cmx types/types.cmx \
typing/typer.cmx parser/parser.cmx compile/lambda.cmx types/ident.cmx \
types/externals.cmx runtime/eval.cmx types/compunit.cmx \
compile/compile.cmx parser/cduce_loc.cmx types/builtin.cmx \
driver/librarian.cmi
types/sample.cmo: types/types.cmi types/intervals.cmi types/ident.cmo \
types/chars.cmi types/atoms.cmi types/sample.cmi
types/sample.cmx: types/types.cmx types/intervals.cmx types/ident.cmx \
types/chars.cmx types/atoms.cmx types/sample.cmi
compile/print_auto.cmo: types/types.cmi types/ident.cmo compile/auto_pat.cmi \
compile/print_auto.cmi
compile/print_auto.cmx: types/types.cmx types/ident.cmx compile/auto_pat.cmx \
compile/print_auto.cmi
driver/cduce.cmo: runtime/value.cmi parser/ulexer.cmi types/types.cmi \
typing/typer.cmi misc/stats.cmi types/sample.cmi compile/print_auto.cmi \
types/patterns.cmi parser/parser.cmi compile/operators.cmi misc/ns.cmi \
parser/location.cmi driver/librarian.cmi types/ident.cmo runtime/eval.cmi \
compile/compile.cmi types/builtin_defs.cmi types/builtin.cmi \
compile/auto_pat.cmi types/atoms.cmi parser/ast.cmo driver/cduce.cmi
typing/typer.cmi misc/stats.cmi types/sequence.cmi types/sample.cmi \
compile/print_auto.cmi types/patterns.cmi parser/parser.cmi \
compile/operators.cmi misc/ns.cmi driver/librarian.cmi types/ident.cmo \
runtime/eval.cmi compile/compile.cmi parser/cduce_loc.cmi \
types/builtin_defs.cmi types/builtin.cmi compile/auto_pat.cmi \
types/atoms.cmi parser/ast.cmo driver/cduce.cmi
driver/cduce.cmx: runtime/value.cmx parser/ulexer.cmx types/types.cmx \
typing/typer.cmx misc/stats.cmx types/sample.cmx compile/print_auto.cmx \
types/patterns.cmx parser/parser.cmx compile/operators.cmx misc/ns.cmx \
parser/location.cmx driver/librarian.cmx types/ident.cmx runtime/eval.cmx \
compile/compile.cmx types/builtin_defs.cmx types/builtin.cmx \
compile/auto_pat.cmx types/atoms.cmx parser/ast.cmx driver/cduce.cmi
typing/typer.cmx misc/stats.cmx types/sequence.cmx types/sample.cmx \
compile/print_auto.cmx types/patterns.cmx parser/parser.cmx \
compile/operators.cmx misc/ns.cmx driver/librarian.cmx types/ident.cmx \
runtime/eval.cmx compile/compile.cmx parser/cduce_loc.cmx \
types/builtin_defs.cmx types/builtin.cmx compile/auto_pat.cmx \
types/atoms.cmx parser/ast.cmx driver/cduce.cmi
runtime/system.cmo: runtime/value.cmi types/types.cmi types/sequence.cmi \
compile/operators.cmi parser/location.cmi types/ident.cmo \
compile/operators.cmi types/ident.cmo parser/cduce_loc.cmi \
types/builtin_defs.cmi types/builtin.cmi types/atoms.cmi
runtime/system.cmx: runtime/value.cmx types/types.cmx types/sequence.cmx \
compile/operators.cmx parser/location.cmx types/ident.cmx \
compile/operators.cmx types/ident.cmx parser/cduce_loc.cmx \
types/builtin_defs.cmx types/builtin.cmx types/atoms.cmx
query/query_aggregates.cmo: runtime/value.cmi types/sequence.cmi \
compile/operators.cmi types/intervals.cmi types/builtin_defs.cmi
query/query_aggregates.cmx: runtime/value.cmx types/sequence.cmx \
compile/operators.cmx types/intervals.cmx types/builtin_defs.cmx
ocamliface/mltypes.cmo: types/types.cmi parser/location.cmi \
driver/librarian.cmi types/ident.cmo driver/config.cmi \
ocamliface/mltypes.cmi
ocamliface/mltypes.cmx: types/types.cmx parser/location.cmx \
driver/librarian.cmx types/ident.cmx driver/config.cmx \
ocamliface/mltypes.cmi
ocamliface/mlstub.cmo: types/types.cmi typing/typer.cmi types/sequence.cmi \
misc/ns.cmi ocamliface/mltypes.cmi parser/location.cmi \
driver/librarian.cmi types/ident.cmo types/externals.cmi \
driver/config.cmi compile/compile.cmi types/builtin_defs.cmi \
types/atoms.cmi ocamliface/mlstub.cmi
ocamliface/mlstub.cmx: types/types.cmx typing/typer.cmx types/sequence.cmx \
misc/ns.cmx ocamliface/mltypes.cmx parser/location.cmx \
driver/librarian.cmx types/ident.cmx types/externals.cmx \
driver/config.cmx compile/compile.cmx types/builtin_defs.cmx \
types/atoms.cmx ocamliface/mlstub.cmi
parser/cduce_curl.cmo: runtime/value.cmi parser/url.cmi driver/config.cmi
parser/cduce_curl.cmx: runtime/value.cmx parser/url.cmx driver/config.cmx
parser/cduce_netclient.cmo: runtime/value.cmi parser/url.cmi \
ocamliface/config.cmo
parser/cduce_netclient.cmx: runtime/value.cmx parser/url.cmx \
ocamliface/config.cmx
runtime/cduce_pxp.cmo: runtime/value.cmi parser/url.cmi schema/schema_xml.cmi \
runtime/load_xml.cmi driver/config.cmi runtime/cduce_pxp.cmi
runtime/load_xml.cmi ocamliface/config.cmo runtime/cduce_pxp.cmi
runtime/cduce_pxp.cmx: runtime/value.cmx parser/url.cmx schema/schema_xml.cmx \
runtime/load_xml.cmx driver/config.cmx runtime/cduce_pxp.cmi
runtime/cduce_expat.cmo: runtime/value.cmi parser/url.cmi \
schema/schema_xml.cmi parser/location.cmi runtime/load_xml.cmi \
driver/config.cmi runtime/cduce_expat.cmi
runtime/cduce_expat.cmx: runtime/value.cmx parser/url.cmx \
schema/schema_xml.cmx parser/location.cmx runtime/load_xml.cmx \
driver/config.cmx runtime/cduce_expat.cmi
runtime/load_xml.cmx ocamliface/config.cmx runtime/cduce_pxp.cmi
driver/run.cmo: runtime/value.cmi parser/ulexer.cmi misc/stats.cmi \
parser/location.cmi driver/librarian.cmi types/ident.cmo misc/html.cmi \
driver/config.cmi driver/cduce.cmi types/builtin.cmi
driver/librarian.cmi types/ident.cmo misc/html.cmi parser/cduce_loc.cmi \
driver/cduce_config.cmi driver/cduce.cmi types/builtin.cmi
driver/run.cmx: runtime/value.cmx parser/ulexer.cmx misc/stats.cmx \
parser/location.cmx driver/librarian.cmx types/ident.cmx misc/html.cmx \
driver/config.cmx driver/cduce.cmx types/builtin.cmx
driver/librarian.cmx types/ident.cmx misc/html.cmx parser/cduce_loc.cmx \
driver/cduce_config.cmx driver/cduce.cmx types/builtin.cmx
driver/start.cmo: driver/run.cmo
driver/start.cmx: driver/run.cmx
driver/webiface.cmo: parser/location.cmi misc/html.cmi driver/examples.cmo \
driver/webiface.cmo: misc/html.cmi driver/examples.cmo parser/cduce_loc.cmi \
driver/cduce.cmi
driver/webiface.cmx: parser/location.cmx misc/html.cmx driver/examples.cmx \
driver/cduce.cmx
driver/evaluator.cmo: parser/location.cmi misc/html.cmi driver/config.cmi \
driver/cduce.cmi
driver/evaluator.cmx: parser/location.cmx misc/html.cmx driver/config.cmx \
driver/webiface.cmx: misc/html.cmx driver/examples.cmx parser/cduce_loc.cmx \
driver/cduce.cmx
driver/evaluator.cmo: misc/html.cmi parser/cduce_loc.cmi \
driver/cduce_config.cmi driver/cduce.cmi
driver/evaluator.cmx: misc/html.cmx parser/cduce_loc.cmx \
driver/cduce_config.cmx driver/cduce.cmx
tools/validate.cmo: schema/schema_types.cmi schema/schema_parser.cmi \
schema/schema_common.cmi
tools/validate.cmx: schema/schema_types.cmx schema/schema_parser.cmx \
schema/schema_common.cmx
ocamliface/mltypes.cmo: types/types.cmi parser/location.cmi \
driver/librarian.cmi types/ident.cmo driver/config.cmi \
ocamliface/mltypes.cmi
ocamliface/mltypes.cmx: types/types.cmx parser/location.cmx \
driver/librarian.cmx types/ident.cmx driver/config.cmx \
ocamliface/mltypes.cmi
ocamliface/mltypes.cmo: ocamliface/location.cmo types/ident.cmo \
ocamliface/config.cmo ocamliface/mltypes.cmi
ocamliface/mltypes.cmx: ocamliface/location.cmx types/ident.cmx \
ocamliface/config.cmx ocamliface/mltypes.cmi
ocamliface/mlstub.cmo: types/types.cmi typing/typer.cmi types/sequence.cmi \
misc/ns.cmi ocamliface/mltypes.cmi parser/location.cmi \
misc/ns.cmi ocamliface/mltypes.cmi ocamliface/location.cmo \
driver/librarian.cmi types/ident.cmo types/externals.cmi \
driver/config.cmi compile/compile.cmi types/builtin_defs.cmi \
types/atoms.cmi ocamliface/mlstub.cmi
ocamliface/config.cmo compile/compile.cmi types/builtin_defs.cmi \
types/atoms.cmi parser/ast.cmo ocamliface/mlstub.cmi
ocamliface/mlstub.cmx: types/types.cmx typing/typer.cmx types/sequence.cmx \
misc/ns.cmx ocamliface/mltypes.cmx parser/location.cmx \
misc/ns.cmx ocamliface/mltypes.cmx ocamliface/location.cmx \
driver/librarian.cmx types/ident.cmx types/externals.cmx \
driver/config.cmx compile/compile.cmx types/builtin_defs.cmx \
types/atoms.cmx ocamliface/mlstub.cmi
parser/cduce_curl.cmo: runtime/value.cmi parser/url.cmi driver/config.cmi
parser/cduce_curl.cmx: runtime/value.cmx parser/url.cmx driver/config.cmx
ocamliface/config.cmx compile/compile.cmx types/builtin_defs.cmx \
types/atoms.cmx parser/ast.cmx ocamliface/mlstub.cmi
parser/cduce_curl.cmo: runtime/value.cmi parser/url.cmi ocamliface/config.cmo
parser/cduce_curl.cmx: runtime/value.cmx parser/url.cmx ocamliface/config.cmx
parser/cduce_netclient.cmo: runtime/value.cmi parser/url.cmi \
driver/config.cmi
ocamliface/config.cmo
parser/cduce_netclient.cmx: runtime/value.cmx parser/url.cmx \
driver/config.cmx
ocamliface/config.cmx
runtime/cduce_expat.cmo: runtime/value.cmi parser/url.cmi \
schema/schema_xml.cmi parser/location.cmi runtime/load_xml.cmi \
driver/config.cmi runtime/cduce_expat.cmi
schema/schema_xml.cmi runtime/load_xml.cmi ocamliface/config.cmo \
runtime/cduce_expat.cmi
runtime/cduce_expat.cmx: runtime/value.cmx parser/url.cmx \
schema/schema_xml.cmx parser/location.cmx runtime/load_xml.cmx \
driver/config.cmx runtime/cduce_expat.cmi
schema/schema_xml.cmx runtime/load_xml.cmx ocamliface/config.cmx \
runtime/cduce_expat.cmi
runtime/cduce_pxp.cmo: runtime/value.cmi parser/url.cmi schema/schema_xml.cmi \
runtime/load_xml.cmi driver/config.cmi runtime/cduce_pxp.cmi
runtime/load_xml.cmi ocamliface/config.cmo runtime/cduce_pxp.cmi
runtime/cduce_pxp.cmx: runtime/value.cmx parser/url.cmx schema/schema_xml.cmx \
runtime/load_xml.cmx driver/config.cmx runtime/cduce_pxp.cmi
runtime/load_xml.cmx ocamliface/config.cmx runtime/cduce_pxp.cmi
misc/encodings.cmi: misc/custom.cmo
misc/upool.cmi: misc/custom.cmo
misc/ns.cmi: misc/upool.cmi misc/encodings.cmi misc/custom.cmo
......@@ -372,35 +356,35 @@ schema/schema_validator.cmi: runtime/value.cmi schema/schema_types.cmi \
misc/encodings.cmi
types/patterns.cmi: types/types.cmi types/ident.cmo misc/custom.cmo \
compile/auto_pat.cmi
compile/print_auto.cmi: compile/auto_pat.cmi
compile/lambda.cmi: runtime/value.cmi types/types.cmi \
schema/schema_validator.cmi misc/ns.cmi misc/imap.cmi types/ident.cmo \
types/compunit.cmi compile/auto_pat.cmi
runtime/run_dispatch.cmi: runtime/value.cmi compile/auto_pat.cmi
runtime/explain.cmi: runtime/value.cmi types/types.cmi compile/auto_pat.cmi
runtime/explain.cmi: runtime/value.cmi compile/auto_pat.cmi
runtime/eval.cmi: runtime/value.cmi misc/ns.cmi compile/lambda.cmi \
types/ident.cmo types/compunit.cmi
parser/location.cmi: misc/html.cmi
parser/cduce_loc.cmi: misc/html.cmi
parser/parser.cmi: parser/ast.cmo
typing/typepat.cmi: types/types.cmi types/patterns.cmi types/ident.cmo
typing/typepat.cmi: types/types.cmi types/patterns.cmi types/ident.cmo \
misc/encodings.cmi
types/externals.cmi: types/types.cmi
typing/typer.cmi: types/types.cmi typing/typed.cmo \
schema/schema_validator.cmi types/patterns.cmi misc/ns.cmi \
parser/location.cmi types/ident.cmo types/compunit.cmi parser/ast.cmo
types/ident.cmo types/compunit.cmi parser/cduce_loc.cmi parser/ast.cmo
compile/compile.cmi: runtime/value.cmi types/types.cmi typing/typer.cmi \
typing/typed.cmo compile/lambda.cmi types/ident.cmo types/compunit.cmi \
parser/ast.cmo
schema/schema_parser.cmi: schema/schema_types.cmi
runtime/load_xml.cmi: runtime/value.cmi
runtime/print_xml.cmi: runtime/value.cmi misc/ns.cmi
compile/operators.cmi: runtime/value.cmi types/types.cmi parser/location.cmi
compile/operators.cmi: runtime/value.cmi types/types.cmi parser/cduce_loc.cmi
types/builtin.cmi: runtime/value.cmi typing/typer.cmi
driver/librarian.cmi: runtime/value.cmi types/types.cmi typing/typer.cmi \
types/ident.cmo types/externals.cmi types/compunit.cmi \
compile/compile.cmi
types/sample.cmi: types/types.cmi
compile/print_auto.cmi: compile/auto_pat.cmi
driver/cduce.cmi: runtime/value.cmi types/atoms.cmi
ocamliface/mltypes.cmi: types/types.cmi
ocamliface/mltypes.cmi: types/types.cmi
schema/schema_types.cmi: runtime/value.cmi misc/ns.cmi misc/encodings.cmi \
types/atoms.cmi
open Location
open Cduce_loc
open Ident
let () = Stats.gettimeofday := Unix.gettimeofday
......@@ -79,8 +79,8 @@ let directive_help ppf =
let rec print_exn ppf = function
| Location (loc, w, exn) ->
Location.print_loc ppf (loc,w);
Location.html_hilight (loc,w);
Cduce_loc.print_loc ppf (loc,w);
Cduce_loc.html_hilight (loc,w);
print_exn ppf exn
| Value.CDuceExn v ->
Format.fprintf ppf "Uncaught CDuce exception: @[%a@]@."
......@@ -121,9 +121,9 @@ let rec print_exn ppf = function
U.print (Librarian.name cu)
Ident.print x
| Ulexer.Error (i,j,s) ->
let loc = Location.loc_of_pos (i,j), `Full in
Location.print_loc ppf loc;
Location.html_hilight loc;
let loc = Cduce_loc.loc_of_pos (i,j), `Full in
Cduce_loc.print_loc ppf loc;
Cduce_loc.html_hilight loc;
Format.fprintf ppf "%s" s
| Parser.Error s | Stream.Error s ->
Format.fprintf ppf "Parsing error: %a@." print_protect s
......@@ -145,7 +145,7 @@ let rec print_exn ppf = function
Format.fprintf ppf "Invalid object file %s@." f
| Librarian.CannotOpen f ->
Format.fprintf ppf "Cannot open file %s@." f
| Location.Generic s ->
| Cduce_loc.Generic s ->
Format.fprintf ppf "%a@." print_protect s
| Ns.Label.Not_unique ((ns1,s1),(ns2,s2)) ->
Format.fprintf ppf "Collision on label hash: {%a}:%a, {%a}:%a"
......
......@@ -35,19 +35,19 @@ let () =
ignore (Unix.alarm 10);
Sys.set_signal Sys.sigalrm
(Sys.Signal_handle (fun _ -> raise (Cduce.Escape Timeout)));
let v = Location.get_viewport () in
let v = Cduce_loc.get_viewport () in
let ppf = Html.ppf v
and input = Stream.of_string src in
Format.pp_set_margin ppf 60;
Location.push_source (`String src);
Location.set_protected true;
Config.init_all ();
Cduce_loc.push_source (`String src);
Cduce_loc.set_protected true;
Cduce_config.init_all ();
let ok = Cduce.script ppf ppf input in
if ok then Format.fprintf ppf "@\nOk.@\n";
Html.get v
in
Location.set_viewport (Html.create true);
Cduce_loc.set_viewport (Html.create true);
let prog = Buffer.create 1024 in
(try while true do Buffer.add_string prog (read_line ()); Buffer.add_string prog "\n" done;
with End_of_file -> ());
......
open Location
open Cduce_loc
open Ident
......@@ -77,17 +77,17 @@ let show ppf id t v =
let compile verbose name src =
protect_op "Compile external file";
let ic =
if src = "" then (Location.push_source `Stream; stdin)
if src = "" then (Cduce_loc.push_source `Stream; stdin)
else
try Location.push_source (`File src); open_in src
try Cduce_loc.push_source (`File src); open_in src
with Sys_error _ -> raise (CannotOpen src) in
let input = Stream.of_channel ic in
let p =
try Parser.prog input
with
| Stdpp.Exc_located (_, (Location _ | Ulexer.Error _ as e)) -> raise e
| Stdpp.Exc_located ((i,j), e) ->
raise_loc i.Lexing.pos_cnum j.Lexing.pos_cnum e
| Ulexer.Loc.Exc_located (_, (Location _ | Ulexer.Error _ as e)) -> raise e
| Ulexer.Loc.Exc_located ((i,j), e) ->
raise_loc i j e
in
if src <> "" then close_in ic;
......
......@@ -15,7 +15,7 @@ let version () =
Printf.eprintf "built on %s\n" <:symbol<build_date>>;
Printf.eprintf "using OCaml %s compiler\n" <:symbol<ocaml_compiler>>;
Printf.eprintf "Supported features: \n";
List.iter (fun (n,d) -> Printf.eprintf "- %s: %s\n" n d) (Config.descrs ());
List.iter (fun (n,d) -> Printf.eprintf "- %s: %s\n" n d) (Cduce_config.descrs ());
exit 0
let specs =
......@@ -29,7 +29,7 @@ let specs =
"(for --compile) show types of exported values";
"--obj-dir", Arg.String (fun s -> out_dir := s :: !out_dir),
"(for --compile) directory for the compiled .cdo file";
"-I", Arg.String (fun s -> Location.obj_path := s::!Location.obj_path),
"-I", Arg.String (fun s -> Cduce_loc.obj_path := s::!Cduce_loc.obj_path),
" add one directory to the lookup path for .cdo/.cmi and include files";
"--stdin", Arg.Unit (fun () -> src := "" :: !src),
" read CDuce script on standard input";
......@@ -40,7 +40,7 @@ let specs =
src := s :: !src)
else args := s :: !args),
" the first argument after is the source, then the arguments";
"--no", Arg.String Config.inhibit,
"--no", Arg.String Cduce_config.inhibit,
" disable a feature (cduce -v to get a list of features)";
"--debug", Arg.Unit (fun () -> Stats.set_verbosity Stats.Summary),
" print profiling/debugging information";
......@@ -124,7 +124,7 @@ let toploop () =
Cduce.toplevel := true;
Librarian.run_loaded := true;
let buf_in = Buffer.create 1024 in
Location.push_source (`Buffer buf_in);
Cduce_loc.push_source (`Buffer buf_in);
let read _i =
if !bol then
if !Ulexer.in_comment then outflush "* " else outflush "> ";
......@@ -151,26 +151,26 @@ let argv args =
let main () =
at_exit (fun () -> Stats.dump Format.std_formatter);
Location.set_viewport (Html.create false);
Cduce_loc.set_viewport (Html.create false);
match mode () with
| `Toplevel args ->
Config.init_all ();
Cduce_config.init_all ();
Builtin.argv := argv args;
toploop ()
| `Script (f,args) ->
Config.init_all ();
Cduce_config.init_all ();
Builtin.argv := argv args;
Cduce.compile_run f
| `Compile (f,o) ->
Config.init_all ();
Cduce_config.init_all ();
Cduce.compile f o
| `Run (f,args) ->
Config.init_all ();
Cduce_config.init_all ();
Builtin.argv := argv args;
Cduce.run f
| `Mlstub f ->
Config.init_all ();
Cduce_config.init_all ();
Librarian.prepare_stub f
| `Topstub f ->
Config.init_all ();
Cduce_config.init_all ();
!Librarian.make_wrapper f
......@@ -129,11 +129,11 @@ let main (cgi : Netcgi.std_activation) =
let dialog content = html_form p content in
let exec src =