Commit 6ff347dc authored by POGODALLA Sylvain's avatar POGODALLA Sylvain

Using zen Aum to control entry

parent 631c4357
......@@ -32,8 +32,8 @@ TITLE="The ACG Development Toolkit Documentation"
OCAMLDOC_FLAGS = -sort -keep-code -html -t $(TITLE)
#CAMLDOC_FLAGS = -html -t $(TITLE)
LIBS = @CAMLP4_LIB@
LIBDIR = -I +camlp4
LIBS = @CAMLP4_LIB@ zen.cma
LIBDIR = -I +camlp4 -I +zen
OCAMLPP = -pp "@OCAMLP4@ pa_extend.cmo pa_macro.cmo $(DEBUGFLAGS) @OCAMLP4_LOC@"
......
......@@ -31,14 +31,14 @@ LIBS += dyp.cma str.cma
# The corresponding directories
# (if not in the main ocaml lib directory,
# ex. -I +campl4
LIBDIR = @DYPGEN_INCLUDE@ -I +camlp4
LIBDIR += @DYPGEN_INCLUDE@
# Directories to which the current source files depend on
PREVIOUS_DIRS = ../utils ../logic ../grammars
# Source files in the right order of dependance
ML = signature.ml lexicon.ml
ML = signature.ml acg_lexicon.ml
EXE_SOURCES = acgc.ml
......
......@@ -19,7 +19,7 @@
module Sg = Signature.Sylvains_signature
(*module Lex = Syntactic_data_structures.Abstract_lex*)
module Lex = Lexicon.Sylvain_lexicon
module Lex = Acg_lexicon.Sylvain_lexicon
module Test = Interactive.Make(Lex)
......
......@@ -42,7 +42,7 @@ signature derived_trees =
N2,S2,VP2:tree -> tree -> tree;
every,dog,chases,a,cat,sleeps,slowly,new,big,black,seems,john,mary,bill,paul,
claims,loves,to_love,who,said,liked,does,think:tree;
n = lambda n . lambda d a.d (a(N1 n)) : tree -> (tree -> tree) -> (tree -> tree) -> tree;
n = lambda . lambda d a.d (a(N1 n)) : tree -> (tree -> tree) -> (tree -> tree) -> tree;
iv = lambda v . lambda s a np0 .s (S2 np0 (a (VP1 v))) : tree -> (tree -> tree) -> (tree -> tree) -> tree -> tree ;
tv = lambda v . lambda s a np0 np1 .s (S2 np0 (a (VP2 v np1))) : tree -> (tree -> tree) -> (tree -> tree) -> tree -> tree -> tree ;
ph_arg_v = lambda v . lambda s_root a np0 s_foot .s_root (S2 np0 (a (VP2 v s_foot))) : tree -> (tree -> tree) -> (tree -> tree) -> tree -> tree -> tree ;
......@@ -138,7 +138,7 @@ lexicon tag_semantics(derivation_trees) : semantics =
C_sleeps := lambda s a S.s(S(a(lambda x.(sleep x))));
C_chases := lambda s a S O.s(S(a(lambda x.O(lambda y.(chase x y)))));
C_loves := lambda s a S O.s(S(a(lambda x.O(lambda y.(love x y)))));
C_to_love := lambda s a O S.s(S(a(lambda x.O(lambda y.(love x y)))));
C_to_love := lambda s a S O.s(S(a(lambda x.O(lambda y.(love x y)))));
C_every := lambda n.lambda P.All x. (n x) > (P x) ;
C_a := lambda n.lambda P.Ex x. (n x) & (P x);
C_slowly := lambda vp r. vp (lambda x. slowly (r x));
......
......@@ -31,7 +31,7 @@ LIBS +=
# The corresponding directories
# (if not in the main ocaml lib directory,
# ex. -I +campl4
LIBDIR = -I +camlp4
LIBDIR +=
# Directories to which the current source files depend on
PREVIOUS_DIRS =
......
......@@ -31,7 +31,7 @@ LIBS += dyp.cma str.cma
# The corresponding directories
# (if not in the main ocaml lib directory,
# ex. -I +campl4
LIBDIR = @DYPGEN_INCLUDE@ -I +camlp4
LIBDIR += @DYPGEN_INCLUDE@
# Directories to which the current source files depend on
PREVIOUS_DIRS = ../utils ../logic ../grammars
......
......@@ -29,7 +29,7 @@ module Actual_env = Environment.Make(Lex)
let env = ref Actual_env.empty
module Actual_parser = Parser.Make(Actual_env)
module Actual_parser = Data_parser.Make(Actual_env)
......
......@@ -31,7 +31,7 @@ LIBS += dyp.cma str.cma
# The corresponding directories
# (if not in the main ocaml lib directory,
# ex. -I +campl4
LIBDIR = @DYPGEN_INCLUDE@ -I +camlp4
LIBDIR += @DYPGEN_INCLUDE@
# Directories to which the current source files depend on
PREVIOUS_DIRS = ../utils ../logic ../grammars ../acg-data
......
......@@ -34,7 +34,7 @@ let options =
let usg_msg = Printf.sprintf "%s [options] file1 file2 ...\n\nThis will parse the files which are supposed to be files acripting commands and then run the ACG command interpreter." Sys.executable_name
module Lex = Lexicon.Sylvain_lexicon
module Lex = Acg_lexicon.Sylvain_lexicon
module E = Environment.Make(Lex)
......
......@@ -100,7 +100,7 @@ struct
type file_type = | Data | Script of (string -> string list -> env -> env)
module Data_parser = Parser.Make(E)
module Data_parser = Data_parser.Make(E)
let load t filename dirs e =
match t with
......
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