let in updated with the grammar

diff --git a/helm/ocaml/mathql_interpreter/.depend b/helm/ocaml/mathql_interpreter/.depend
index e93fc1a1487e0c2e77361a4b69f313eeefbbdfca..fd3aadd145d13641b394422acc2e27a36b0ba29f 100644 (file)
--- a/helm/ocaml/mathql_interpreter/.depend
+++ b/helm/ocaml/mathql_interpreter/.depend
@@ -28,11 +28,11 @@ pattern.cmo: dbconn.cmi eval.cmi mathql_semantics.cmo utility.cmi pattern.cmi
 pattern.cmx: dbconn.cmx eval.cmx mathql_semantics.cmx utility.cmx pattern.cmi 
 use.cmo: dbconn.cmi mathql_semantics.cmo utility.cmi use.cmi 
 use.cmx: dbconn.cmx mathql_semantics.cmx utility.cmx use.cmi 
-letin.cmo: func.cmi utility.cmi letin.cmi 
-letin.cmx: func.cmx utility.cmx letin.cmi 
-mqint.cmo: dbconn.cmi diff.cmi eval.cmi intersect.cmi mathql_semantics.cmo \
-    pattern.cmi select.cmi sortedby.cmi union.cmi use.cmi utility.cmi \
-    mqint.cmi 
-mqint.cmx: dbconn.cmx diff.cmx eval.cmx intersect.cmx mathql_semantics.cmx \
-    pattern.cmx select.cmx sortedby.cmx union.cmx use.cmx utility.cmx \
-    mqint.cmi 
+letin.cmo: letin.cmi 
+letin.cmx: letin.cmi 
+mqint.cmo: dbconn.cmi diff.cmi eval.cmi intersect.cmi letin.cmi \
+    mathql_semantics.cmo pattern.cmi select.cmi sortedby.cmi union.cmi \
+    use.cmi utility.cmi mqint.cmi 
+mqint.cmx: dbconn.cmx diff.cmx eval.cmx intersect.cmx letin.cmx \
+    mathql_semantics.cmx pattern.cmx select.cmx sortedby.cmx union.cmx \
+    use.cmx utility.cmx mqint.cmi 

diff --git a/helm/ocaml/mathql_interpreter/dbconn.ml b/helm/ocaml/mathql_interpreter/dbconn.ml
index db4b8fb9cf8542c05183af073b4fdfebbf886e62..dd4ae5f02bc315d3289e83b587dfbd967aee24ff 100644 (file)
--- a/helm/ocaml/mathql_interpreter/dbconn.ml
+++ b/helm/ocaml/mathql_interpreter/dbconn.ml
@@ -39,8 +39,8 @@ open MathQL;;
  * TODO: bisogna scegliere se questi parametri vengono
  * passati come argomento
  *)
-(*let connection_param = "dbname=helm";;*)
-let connection_param = "host=dotto.cs.unibo.it dbname=helm user=helm";;
+let connection_param = "dbname=helm";;
+(*let connection_param = "host=dotto.cs.unibo.it dbname=helm user=helm";;*)
 
 (*
  * connessione al db

diff --git a/helm/ocaml/mathql_interpreter/letin.mli b/helm/ocaml/mathql_interpreter/letin.mli
index 805633583ce851fc828f69fded1b9544e56c2f28..b2b6ffda6c29301dcb89e6e25e04806fe21f9183 100644 (file)
--- a/helm/ocaml/mathql_interpreter/letin.mli
+++ b/helm/ocaml/mathql_interpreter/letin.mli
@@ -23,5 +23,5 @@
  * http://www.cs.unibo.it/helm/.
  *)
 
-val letin_ex : MathQL.mqrvar -> Mathql_semantics.result -> Mathql_semantics.result
-val letref_ex : MathQL.mqrvar -> Mathql_semantics.result
+val letin_ex : MathQL.mqlvar -> Mathql_semantics.result -> Mathql_semantics.result
+val letref_ex : MathQL.mqlvar -> Mathql_semantics.result

diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml
index f0ec5cbfdb2d9ca0e3cb24d1e13b2a42e9a9c310..ad27d1959cc4da46bf634a76c0de5e5cf7d257c2 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mqint.ml
+++ b/helm/ocaml/mathql_interpreter/mqint.ml
@@ -85,8 +85,9 @@ let rec execute_ex env =
  |  MQIntersect (l1, l2) ->
      intersect_ex (execute_ex env l1) (execute_ex env l2)
  |  MQLRVar rvar -> [List.assoc rvar env]
- |  MQLetIn (rvar, alist) ->
-     letin_ex rvar (execute_ex env alist)
+ |  MQLetIn (lvar, l1, l2) ->
+     let _ = letin_ex lvar (execute_ex env l1) in
+      execute_ex env l2
  |  MQLetRef rvar ->
      letref_ex rvar
 ;;