Commits

camlspotter committed 055ec34

fixed interface a bit. Orakuda.Std.Infix must be opened explicitly

Comments (0)

Files changed (2)

   (* open Sig *)
   include Syntax
 
-  (* We need Orakuda.Std.Hashtbl to avoid name collisions when Hashtbl module is redefined *)
+  (* We need Orakuda.Std.Internal_hashtbl to avoid name collisions when Hashtbl module is redefined *)
   let bigarray_hashtbl_set _loc var newval =
     match var with
     | <:expr< Bigarray.Array1.get $arr$ $c1$ >> ->
         Some <:expr< Bigarray.Array3.set $arr$ $c1$ $c2$ $c3$ $newval$ >>
     | <:expr< Bigarray.Genarray.get $arr$ [| $coords$ |] >> ->
         Some <:expr< Bigarray.Genarray.set $arr$ [| $coords$ |] $newval$ >>
-    | <:expr< Orakuda.Std.Hashtbl.find $e1$ $e2$ >> ->
-        Some <:expr< Orakuda.Std.Hashtbl.replace $e1$ $e2$ $newval$ >>
-    | <:expr< Orakuda.Std.Hashtbl.find_all $e1$ $e2$ >> ->
-        Some <:expr< Orakuda.Std.Hashtbl.add $e1$ $e2$ $newval$ >>
+    | <:expr< Orakuda.Std.Internal_hashtbl.find $e1$ $e2$ >> ->
+        Some <:expr< Orakuda.Std.Internal_hashtbl.replace $e1$ $e2$ $newval$ >>
+    | <:expr< Orakuda.Std.Internal_hashtbl.find_all $e1$ $e2$ >> ->
+        Some <:expr< Orakuda.Std.Internal_hashtbl.add $e1$ $e2$ $newval$ >>
     | _ -> None
   ;;
 
   expr: LEVEL "simple"
     [ 
       [ e1 = SELF; "$"; "{"; e2 = SELF; "}" 
-	-> <:expr<Orakuda.Std.Hashtbl.find $e1$ $e2$>> 
+	-> <:expr<Orakuda.Std.Internal_hashtbl.find $e1$ $e2$>> 
       | e1 = SELF; "$+"; "{"; e2 = SELF; "}" 
-	-> <:expr<Orakuda.Std.Hashtbl.find_all $e1$ $e2$>> 
+	-> <:expr<Orakuda.Std.Internal_hashtbl.find_all $e1$ $e2$>> 
       | e1 = SELF; "$?"; "{"; e2 = SELF; "}"
-	-> <:expr<Orakuda.Std.Hashtbl.mem $e1$ $e2$>> 
+	-> <:expr<Orakuda.Std.Internal_hashtbl.mem $e1$ $e2$>> 
       ]
     ];
   expr: LEVEL ":="
 module Regexp = Regexp
-include Regexp.Infix
 
 (* for pa_hash *)
-module Hashtbl = Hashtbl
+module Internal_hashtbl = Hashtbl
 
 module Cformat = Cformat
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.