(*
* implementazione del'interprete MathQL
*)
-open Mathql;;
+open MathQL;;
open Eval;;
open Utility;;
open Dbconn;;
| MQUse (alist, asvar) ->
use_ex (execute_ex env alist) asvar "B" (*"backPointer"*)
| MQPattern (apreamble, apattern, afragid) ->
- pattern_ex 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]
* la uri puo' far parte del risultato.
*)
let xres_to_res l =
+ 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
)
+*)
;;