From dba1254305072dde7df27390a5f554fb402ceced Mon Sep 17 00:00:00 2001 From: natile Date: Wed, 13 Nov 2002 18:54:59 +0000 Subject: [PATCH] Attribute patched with inverse function. --- helm/ocaml/mathql_interpreter/.depend | 10 ++++++---- helm/ocaml/mathql_interpreter/Makefile | 4 ++-- helm/ocaml/mathql_interpreter/mqint.ml | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/helm/ocaml/mathql_interpreter/.depend b/helm/ocaml/mathql_interpreter/.depend index 5629c47df..f82699cee 100644 --- 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 5328d04d2..8993391ad 100644 --- 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 64aea7d33..518463bc0 100644 --- 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 = -- 2.39.2