Commit a4fe1ca9 authored by Pietro Abate's avatar Pietro Abate
Browse files

Merge branch 'master' of https://git.cduce.org/cduce

parents 22ec8391 0ac519c8
......@@ -15,3 +15,5 @@ true: -traverse
<schema/**>: package(pcre), package(netstring)
<runtime/**>: package(pcre), package(netstring)
<tests/libtest/*Test.*>: pp(camlp4orf.opt), package(netstring), package(pcre), package(oUnit), package(ulex), package(num), package(camlp4.lib)
<tests/eval/src/main.*>: pp(camlp4orf.opt), package(netstring), package(pcre), package(oUnit), package(ulex), package(num), package(camlp4.lib)
......@@ -3,6 +3,8 @@ ROOTDIR ?= ../..
SRCDIR ?= src
EXTDIR ?= $(SRCDIR)/externals
LIBFLAGS = -libs nums,pcre,netstring -lflags -I,`ocamlfind query pcre`\
-lflags -I,`ocamlfind query netstring`
INEXTFILES = misc/custom.ml misc/encodings.ml types/ident.ml\
compile/lambda.mli compile/lambda.ml misc/ns.ml misc/ns.mli misc/upool.ml\
misc/upool.mli types/sortedList.ml types/sortedList.mli types/compunit.ml\
......@@ -13,7 +15,8 @@ INEXTFILES = misc/custom.ml misc/encodings.ml types/ident.ml\
schema/schema_pcre.ml schema/schema_common.ml schema/schema_common.mli\
schema/schema_types.ml schema/schema_xml.ml schema/schema_xml.mli\
schema/schema_builtin.ml types/builtin_defs.ml runtime/run_dispatch.ml\
runtime/explain.ml
runtime/explain.ml misc/stats.mli misc/stats.ml types/normal.mli\
types/normal.ml misc/pretty.ml misc/pretty.mli
EXTFILES = $(INEXTFILES:%=$(ROOTDIR)/%)
RM ?= rm -f
......@@ -22,7 +25,7 @@ OUT ?= main.native
.PHONY: clean check test _import
all: _import
$(COMPILER) -use-ocamlfind $(OUT)
$(COMPILER) -use-ocamlfind $(LIBFLAGS) $(OUT)
_import:
@echo -n "Copying external files..."
......
<src>: include
<src/lambda*>: pp(camlp4orf.opt), package(camlp4.lib)
<src/main*>: pp(camlp4orf.opt), package(camlp4.lib)
<src/parse*>: pp(camlp4orf.opt), package(camlp4.lib, unix, netsys, str)
<src/main*>: pp(camlp4orf.opt), package(camlp4.lib, unix, netsys, str)
<src/externals>: include
<src/externals/schema_*>: package(pcre, netcgi2)
<src/externals/schema_*>: package(pcre, netcgi2, unix, netsys, str)
open Printf
open Lambda
open Parse
let load_file f =
let ic = open_in f in
......@@ -18,4 +18,4 @@ printf "Original: %s\nExpr: " str;
print_expr expr;
printf "\nResult: %s\n" (expr_to_string expr);
(*Eval.eval [||] [||] expr*)
Eval.expr (Lambda.Var(Lambda.Local (2))) 100
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment