Pattern module added.

diff --git a/helm/ocaml/mathql_interpreter/.depend b/helm/ocaml/mathql_interpreter/.depend
index f82699cee6ef5f0e59536dc27227c60c952841df..f240778d94c772f1fb144cbb74dbd10e3058995c 100644 (file)
--- a/helm/ocaml/mathql_interpreter/.depend
+++ b/helm/ocaml/mathql_interpreter/.depend
@@ -18,6 +18,8 @@ func.cmo: dbconn.cmi intersect.cmi utility.cmi func.cmi
 func.cmx: dbconn.cmx intersect.cmx utility.cmx func.cmi 
 attribute.cmo: dbconn.cmi intersect.cmi utility.cmi attribute.cmi 
 attribute.cmx: dbconn.cmx intersect.cmx utility.cmx attribute.cmi 
+pattern.cmo: dbconn.cmi utility.cmi pattern.cmi 
+pattern.cmx: dbconn.cmx utility.cmx pattern.cmi 
 mqint.cmo: attribute.cmi context.cmo dbconn.cmi diff.cmi func.cmi \
     intersect.cmi meet.cmi relation.cmi sub.cmi union.cmi mqint.cmi 
 mqint.cmx: attribute.cmx context.cmx dbconn.cmx diff.cmx func.cmx \

diff --git a/helm/ocaml/mathql_interpreter/Makefile b/helm/ocaml/mathql_interpreter/Makefile
index 8993391ad9296334d54e602d1490efd0f2e723da..5b3d56c37ee273e53f647258efb5bb561b301962 100644 (file)
--- a/helm/ocaml/mathql_interpreter/Makefile
+++ b/helm/ocaml/mathql_interpreter/Makefile
@@ -2,9 +2,9 @@ PACKAGE = mathql_interpreter
 REQUIRES = helm-urimanager postgres unix natile-galax helm-mathql
 PREDICATES =
 
-INTERFACE_FILES = dbconn.mli utility.mli union.mli relation.mli diff.mli meet.mli sub.mli intersect.mli func.mli attribute.mli mqint.mli
+INTERFACE_FILES = dbconn.mli utility.mli union.mli relation.mli diff.mli meet.mli sub.mli intersect.mli func.mli attribute.mli pattern.mli mqint.mli
 
-IMPLEMENTATION_FILES =  dbconn.ml utility.ml union.ml relation.ml diff.ml meet.ml sub.ml intersect.ml context.ml func.ml attribute.ml mqint.ml
+IMPLEMENTATION_FILES =  dbconn.ml utility.ml union.ml relation.ml diff.ml meet.ml sub.ml intersect.ml context.ml func.ml attribute.ml pattern.ml mqint.ml
 
 # $(INTERFACE_FILES:%.mli=%.ml)
 

diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml
index bee3bd765e4ba1efda37623e06cfd5751a023309..00f6b1c271bde58f3add94cf595b41c3e8eb0bd8 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mqint.ml
+++ b/helm/ocaml/mathql_interpreter/mqint.ml
@@ -43,7 +43,7 @@ open Diff;;
 open Relation;;
 open Func;;
 open Attribute;;
-
+open Pattern;;
 
 exception BooleExpTrue
 
@@ -79,6 +79,7 @@ let rec exec_set_exp c = function
      MathQL.SVar svar -> List.assoc svar c.svars
    | MathQL.RVar rvar -> [List.assoc rvar c.rvars]  
    | MathQL.Ref vexp -> List.map (fun s -> (s,[])) (exec_val_exp c vexp)
+   | MathQL.Pattern vexp -> pattern_ex (exec_val_exp c vexp)
    | MathQL.Intersect (sexp1, sexp2) ->    
         let before = Sys.time() in
        let rs1 = exec_set_exp c sexp1 in