[Unison-hackers] [unison-svn] r330 - trunk/src

[vouillon@seas.upenn.edu]

Author: vouillon
Date: 2009-05-07 06:01:25 -0400 (Thu, 07 May 2009)
New Revision: 330

Modified:
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/pred.ml
Log:
* Fixed predicate matching in Unicode case-insensitive mode


Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2009-05-06 16:52:46 UTC (rev 329)
+++ trunk/src/RECENTNEWS	2009-05-07 10:01:25 UTC (rev 330)
@@ -1,5 +1,10 @@
 CHANGES FROM VERSION 2.33.2
 
+* Fixed predicate matching in Unicode case-insensitive mode
+
+-------------------------------
+CHANGES FROM VERSION 2.33.2
+
 * Improved error messages when rejecting non-unicode encoded file names
 * uigtk2: fixed the code for transcoding from Windows Codepage 1252 to
   UTF-8 (for some reason, I mistakenly took a table corresponding to

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2009-05-06 16:52:46 UTC (rev 329)
+++ trunk/src/mkProjectInfo.ml	2009-05-07 10:01:25 UTC (rev 330)
@@ -146,3 +146,4 @@
 
 
 
+

Modified: trunk/src/pred.ml
===================================================================
--- trunk/src/pred.ml	2009-05-06 16:52:46 UTC (rev 329)
+++ trunk/src/pred.ml	2009-05-07 10:01:25 UTC (rev 330)
@@ -50,7 +50,9 @@
   | (pref, g)::r ->
       if Util.startswith str pref then
         let l = String.length pref in
-        g (Util.trimWhitespace (String.sub str l (String.length str - l)))
+        let s =
+          Util.trimWhitespace (String.sub str l (String.length str - l)) in
+        g ((Case.ops())#normalizePattern s)
       else
         select str r f
 
@@ -61,7 +63,7 @@
   let (p,v) =
     match Util.splitIntoWordsByString clause mapSeparator with
       [p] -> (p,None)
-    | [p;v] -> (p, Some ((Case.ops())#normalizePattern (Util.trimWhitespace v)))
+    | [p;v] -> (p, Some (Util.trimWhitespace v))
     | [] -> raise (Prefs.IllegalValue "Empty pattern")
     | _ -> raise (Prefs.IllegalValue ("Malformed pattern: "
                   ^ "\"" ^ clause ^ "\"\n"