From 5db2b3e3b637d23befa6f97d78d8f411f436f4a5 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Fri, 24 Jan 2014 17:11:45 +0100
Subject: CString: avoid redefining is_sub

---
 lib/cString.ml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/cString.ml b/lib/cString.ml
index b6f53f05d8..9be81bd3d8 100644
--- a/lib/cString.ml
+++ b/lib/cString.ml
@@ -125,17 +125,17 @@ let drop_simple_quotes s =
 
 (* gdzie = where, co = what *)
 (* gdzie=gdzie(string) gl=gdzie(length) gi=gdzie(index) *)
-let rec is_sub gdzie gl gi co cl ci =
+let rec raw_is_sub gdzie gl gi co cl ci =
   (ci>=cl) ||
   ((String.unsafe_get gdzie gi = String.unsafe_get co ci) &&
-   (is_sub gdzie gl (gi+1) co cl (ci+1)))
+   (raw_is_sub gdzie gl (gi+1) co cl (ci+1)))
 
 let rec raw_str_index i gdzie l c co cl =
   (* First adapt to ocaml 3.11 new semantics of index_from *)
   if (i+cl > l) then raise Not_found;
   (* Then proceed as in ocaml < 3.11 *)
   let i' = String.index_from gdzie i c in
-    if (i'+cl <= l) && (is_sub gdzie l i' co cl 0) then i' else
+    if (i'+cl <= l) && (raw_is_sub gdzie l i' co cl 0) then i' else
       raw_str_index (i'+1) gdzie l c co cl
 
 let string_index_from gdzie i co =
-- 
cgit v1.2.3