Attribute patched with inverse function.

diff --git a/helm/ocaml/mathql_interpreter/.depend b/helm/ocaml/mathql_interpreter/.depend
index 5629c47dffdb58a3df94aa5a317a71b31c6c2a73..f82699cee6ef5f0e59536dc27227c60c952841df 100644 (file)
--- a/helm/ocaml/mathql_interpreter/.depend
+++ b/helm/ocaml/mathql_interpreter/.depend
@@ -16,7 +16,9 @@ intersect.cmo: intersect.cmi
 intersect.cmx: intersect.cmi 
 func.cmo: dbconn.cmi intersect.cmi utility.cmi func.cmi 
 func.cmx: dbconn.cmx intersect.cmx utility.cmx func.cmi 
-mqint.cmo: context.cmo dbconn.cmi diff.cmi func.cmi intersect.cmi meet.cmi \
-    relation.cmi sub.cmi union.cmi mqint.cmi 
-mqint.cmx: context.cmx dbconn.cmx diff.cmx func.cmx intersect.cmx meet.cmx \
-    relation.cmx sub.cmx union.cmx mqint.cmi 
+attribute.cmo: dbconn.cmi intersect.cmi utility.cmi attribute.cmi 
+attribute.cmx: dbconn.cmx intersect.cmx utility.cmx attribute.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 \
+    intersect.cmx meet.cmx relation.cmx sub.cmx union.cmx mqint.cmi 

diff --git a/helm/ocaml/mathql_interpreter/Makefile b/helm/ocaml/mathql_interpreter/Makefile
index 5328d04d2569ec12e5932a94456ff3b7f90f34e3..8993391ad9296334d54e602d1490efd0f2e723da 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 mqint.mli
+INTERFACE_FILES = dbconn.mli utility.mli union.mli relation.mli diff.mli meet.mli sub.mli intersect.mli func.mli attribute.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 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 mqint.ml
 
 # $(INTERFACE_FILES:%.mli=%.ml)
 

diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml
index 64aea7d3373d682aada9ba33cf6604bcfd31ceb8..518463bc0f494497475ae57619c4c2574340f712 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mqint.ml
+++ b/helm/ocaml/mathql_interpreter/mqint.ml
@@ -42,6 +42,7 @@ open Context;;
 open Diff;;
 open Relation;;
 open Func;;
+open Attribute;;
 
 
 exception BooleExpTrue
@@ -206,7 +207,7 @@ and exec_val_exp c = function
    | MathQL.VVar s -> List.assoc s c.vvars                               
    | MathQL.RefOf sexp -> List.map (fun (s,_) -> s) (exec_set_exp c sexp)
    | MathQL.Fun (s, vexp) -> fun_ex s (exec_val_exp c vexp)
-   | MathQL.Attribute (rop, path, vexp) -> [] 
+   | MathQL.Attribute (rop, path, inv, vexp) -> attribute_ex rop path inv (exec_val_exp c vexp) 
 
 (* valuta una MathQL.set_exp nel contesto vuoto e ritorna un MathQL.resource_set *)
 and execute x =