X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2Focaml%2Fmathql_interpreter%2Fmqint.ml;h=ee56718c5888e3b4eee1182c6e6a80b8d8f7072c;hb=c929e791b0eca1e75694a663a2f6ada9f0ff9534;hp=56fa38ad928d0b9017ac58f0ebaad8b26d57f9f4;hpb=8abd42ec1af0d5daef1d026ec550b49b07de8340;p=helm.git

diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml
index 56fa38ad9..ee56718c5 100644
--- a/helm/ocaml/mathql_interpreter/mqint.ml
+++ b/helm/ocaml/mathql_interpreter/mqint.ml
@@ -26,7 +26,7 @@
 (*
  * implementazione del'interprete MathQL
  *)
-open Mathql;;
+open MathQL;;
 open Eval;;
 open Utility;;
 open Dbconn;;
@@ -60,35 +60,35 @@ let fi_to_string fi =
  *)
 let init () = Dbconn.init ();;
 
-(*
- * esecuzione di una query
- *
- * parametri:
- * q
- *
- * output: string list list; risultato internto formato da uri + contesto.
- *)
-let rec execute_ex q =
-   match q with
-      MQSelect (apvar, alist, abool) ->
-       select_ex apvar (execute_ex alist) abool
-   |  MQUsedBy (alist, asvar) ->
-       use_ex (execute_ex alist) asvar "refObj"
-   |  MQUse (alist, asvar) ->
-       use_ex (execute_ex alist) asvar "backPointer"
-   |  MQPattern (apreamble, apattern, afragid) ->
-       let _ = print_endline ("*********" ^ (fi_to_string afragid)); flush stdout in
-       pattern_ex apreamble apattern afragid
-   |  MQUnion (l1, l2) ->
-       union_ex (execute_ex l1) (execute_ex l2)
-   |  MQDiff (l1, l2) ->
-       diff_ex (execute_ex l1) (execute_ex l2)
-   |  MQSortedBy (l, o, f) ->
-       sortedby_ex (execute_ex l) o f
-   |  MQIntersect (l1, l2) ->
-       intersect_ex (execute_ex l1) (execute_ex l2)
+(* execute_ex env q                                                   *)
+(*  [env] is the attributed uri environment in which the query [q]    *)
+(*        must be evaluated                                           *)
+(*  [q]   is the query to evaluate                                    *)
+(*  It returns a [Mathql_semantics.result]                            *)
+let rec execute_ex env =
+ function
+    MQSelect (apvar, alist, abool) ->
+     select_ex env apvar (execute_ex env alist) abool
+ |  MQUsedBy (alist, asvar) ->
+     use_ex (execute_ex env alist) asvar "F" (*"refObj"*)
+ |  MQUse (alist, asvar) ->
+     use_ex (execute_ex env alist) asvar "B" (*"backPointer"*)
+ |  MQPattern (apreamble, apattern, afragid) ->
+     pattern_ex (apreamble, apattern, afragid)
+ |  MQUnion (l1, l2) ->
+     union_ex (execute_ex env l1) (execute_ex env l2)
+ |  MQDiff (l1, l2) ->
+     diff_ex (execute_ex env l1) (execute_ex env l2)
+ |  MQSortedBy (l, o, f) ->
+     sortedby_ex (execute_ex env l) o f
+ |  MQIntersect (l1, l2) ->
+     intersect_ex (execute_ex env l1) (execute_ex env l2)
+ |  MQRVarOccur rvar -> [List.assoc rvar env]
 ;;
 
+(* Let's initialize the execute in Select, creating a cyclical recursion *)
+Select.execute := execute_ex;;
+
 (*
  * converte il risultato interno di una query (uri + contesto)
  * in un risultato di sole uri
@@ -120,57 +120,61 @@ let rec execute_ex q =
  * la uri puo' far parte del risultato.
  *)
 let xres_to_res l =
- let tmp = List.map List.hd (List.tl l) in
+ MQRefs (List.map (function {Mathql_semantics.uri = uri} -> uri) l)
+(*
+ let tmp = List.map (function {Mathql_semantics.uri = uri} -> uri) l in
   MQRefs
    (List.map
     (function l ->
-      match Str.split (Str.regexp ":\|#\|/") l with
-         hd::tl -> (
+      (*let _ = print_endline ("DEBUG: (mqint.ml: xres_to_res)" ^ l) in*)
+      match Str.split (Str.regexp ":\|#\|/\|(\|)") l with
+         hd::""::tl -> (
           match List.rev tl with
-             ")"::n::"xpointer(1"::tail    ->
+             n::"1"::"xpointer"::tail    ->
               (
-               hd,
+               Some hd,
                List.fold_left
                 (fun par t ->
                  match par with
-                    [] -> [MQString t] 
-                 |  _  -> (MQString t) :: MQSlash :: par
+                    [] -> [MQBC t] 
+                 |  _  -> (MQBC t) :: MQBD :: par
                 )
                 []
                 tail, 
-               (Some (int_of_string n), None)
+               [MQFC (int_of_string n)]
               )
-          |  ")"::n::m::"xpointer(1"::tail ->
+          |  n::m::"1"::"xpointer"::tail ->
               (
-               hd,
+               Some hd,
                List.fold_left
                 (fun par t ->
                  match par with
-                    [] -> [MQString t] 
-                 |  _  -> (MQString t) :: MQSlash :: par
+                    [] -> [MQBC t] 
+                 |  _  -> (MQBC t) :: MQBD :: par
                 )
                 []
                 tail,
-               (Some (int_of_string m), Some (int_of_string n))
+               [MQFC (int_of_string m); MQFC (int_of_string n)]
               )
           |  tail                          ->
               (
-               hd,
+               Some hd,
                List.fold_left
                 (fun par t ->
                  match par with
-                    [] -> [MQString t] 
-                 |  _  -> (MQString t) :: MQSlash :: par
+                    [] -> [MQBC t] 
+                 |  _  -> (MQBC t) :: MQBD :: par
                 )
                 []
                 tail, 
-               (None, None)
+               []
               )
       )  
-      |  [] -> assert false
+       | _ -> assert false
     )
     tmp
    )
+*)
 ;;
 
 
@@ -179,7 +183,7 @@ let xres_to_res l =
  *)
 let execute q =
  match q with
-    MQList qq -> xres_to_res (execute_ex qq)
+    MQList qq -> xres_to_res (execute_ex [] qq)
 ;;
 
 (*