Re-use Util.index_of

(cherry picked from commit 52947a60467ebb10cec57ffc1725644ad605c671)

diff --git a/ocaml/Makefile b/ocaml/Makefile
index f54b103d0713a21d5745a268d5418bb91b7fbdef..198855fa5805d3833b5ddf88881fd17350c30773 100644 (file)
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,6 +1,6 @@
 OCAMLC = ocamlopt -g -rectypes
 LIB = unix.cmxa str.cmxa
-UTILS = parser.cmx console.cmx listx.cmx util.cmx pure.cmx num.cmx
+UTILS = util.cmx parser.cmx console.cmx listx.cmx pure.cmx num.cmx
 
 all: a.out test4.out
        # test.out

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 90cda05bd2313d661d51c009919eccdf9c1407cd..b496070b690e9077d6b482774f06d0a8ab1c776b 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -14,17 +14,12 @@ let isAlphaNum c = let n = Char.code c in
  (48 <= n && n <= 90) || (95 <= n && n <= 122) ;;\r
 let isSpace c = c = ' ' || c = '\n' || c = '\t' ;;\r
 \r
-let rec index_of x =\r
-  function\r
-  | [] -> raise (Failure "index_of: Not Found")\r
-  | h::t -> if x = h then 0 else 1 + index_of x t\r
-;;\r
 (* FIXME *)\r
 let mk_var' (bound, free) x =\r
   if List.mem x bound\r
-  then free, mk_var (index_of x bound)\r
+  then free, mk_var (Util.index_of x bound)\r
   else if List.mem x free\r
-       then free, mk_var (List.length bound + index_of x free)\r
+       then free, mk_var (List.length bound + Util.index_of x free)\r
        else (free @ [x]), mk_var (List.length bound + List.length free)\r
 ;;\r
 \r