experimental support for code points

- use the new native backend with relaxed chars
- TODO: check the pattern ranges

Author: bobzhang

jscomp/core/js_exp_make.ml

@@ -1250,14 +1250,14 @@ let int32_lsl ?comment (e1 : J.expression) (e2 : J.expression) : J.expression =
     }
 
 let  is_pos_pow n = 
-  let module M = struct exception E end in 
+  let  exception E  in 
   let rec aux c (n : Int32.t) = 
     if n <= 0l then -2 
     else if n = 1l then c 
     else if Int32.logand n 1l =  0l then   
       aux (c + 1) (Int32.shift_right n 1 )
-    else raise_notrace M.E in 
-  try aux 0 n  with M.E -> -1
+    else raise_notrace E in 
+  try aux 0 n  with E -> -1
 
 let int32_mul ?comment 
     (e1 : J.expression) 

jscomp/main/builtin_cmi_datasets.ml

@@ -567,7 +567,7 @@ o test/string_runtime_test.cmi test/string_runtime_test.cmj : cc test/string_run
 o test/string_set.cmi test/string_set.cmj : cc test/string_set.ml | test/set_gen.cmj $stdlib
 o test/string_set_test.cmi test/string_set_test.cmj : cc test/string_set_test.ml | test/mt.cmj test/string_set.cmj $stdlib
 o test/string_test.cmi test/string_test.cmj : cc test/string_test.ml | test/ext_string_test.cmj test/mt.cmj $stdlib
-o test/string_unicode_test.cmi test/string_unicode_test.cmj : cc test/string_unicode_test.ml | $stdlib
+o test/string_unicode_test.cmi test/string_unicode_test.cmj : cc test/string_unicode_test.ml | test/mt.cmj $stdlib
 o test/stringmatch_test.cmi test/stringmatch_test.cmj : cc test/stringmatch_test.ml | $stdlib
 o test/submodule.cmi test/submodule.cmj : cc test/submodule.ml | $stdlib
 o test/submodule_call.cmi test/submodule_call.cmj : cc test/submodule_call.ml | test/submodule.cmj $stdlib

jscomp/test/build.ninja

@@ -435,19 +435,25 @@ function $plus$plus(x, y) {
 
 function from_char(param) {
   if (param >= 170) {
-    if (param >= 187) {
-      if (param > 246 || param < 192) {
-        if (param >= 248) {
-          return 2;
-        } else {
+    if (param >= 192) {
+      if (param > 255 || param < 216) {
+        if (param >= 215) {
           return 4;
+        } else {
+          return 2;
         }
-      } else if (param !== 215) {
+      } else if (param !== 247) {
         return 2;
       } else {
         return 4;
       }
-    } else if (!(param > 185 || param < 171) && param !== 181) {
+    } else if (param > 185 || param < 171) {
+      if (param >= 187) {
+        return 4;
+      } else {
+        return 2;
+      }
+    } else if (param !== 181) {
       return 4;
     } else {
       return 2;

jscomp/test/ocaml_re_test.js

@@ -1,10 +1,61 @@
 'use strict';
 
+var Mt = require("./mt.js");
+
+var suites = {
+  contents: /* [] */0
+};
+
+var test_id = {
+  contents: 0
+};
+
+function eq(loc, x, y) {
+  test_id.contents = test_id.contents + 1 | 0;
+  suites.contents = {
+    hd: [
+      loc + (" id " + String(test_id.contents)),
+      (function (param) {
+          return {
+                  TAG: /* Eq */0,
+                  _0: x,
+                  _1: y
+                };
+        })
+    ],
+    tl: suites.contents
+  };
+  
+}
 
 console.log("\xe4\xbd\xa0\xe5\xa5\xbd");
 
 console.log("你好");
 
 console.log("你好");
 
+function f(x) {
+  if (x !== 333) {
+    if (x >= 256) {
+      return 3;
+    } else {
+      return 0;
+    }
+  } else {
+    return 2;
+  }
+}
+
+eq("File \"string_unicode_test.ml\", line 27, characters 7-14", f(/* '{' */123), 0);
+
+eq("File \"string_unicode_test.ml\", line 28, characters 7-14", f(/* '\333' */333), 2);
+
+eq("File \"string_unicode_test.ml\", line 29, characters 7-14", f(/* '\444' */444), 3);
+
+Mt.from_pair_suites("string_unicode_test.ml", suites.contents);
+
+exports.suites = suites;
+exports.test_id = test_id;
+exports.eq = eq;
+exports.f = f;
 /*  Not a pure module */

jscomp/test/string_unicode_test.js

@@ -1,3 +1,10 @@
+let suites :  Mt.pair_suites ref  = ref []
+let test_id = ref 0
+let eq loc x y = 
+  incr test_id ; 
+  suites := 
+    (loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
+
 
 
 
@@ -8,8 +15,16 @@ let () = Js.log {js|你好|js}
 let () = 
     Js.log [%raw {|"你好"|}]
 
-#if 0 then     
-let f = function 
-  | {j| hello |j} -> 0 
-  | _ -> 1
-#end
+
+
+let f x = 
+  match x with 
+  | '\000' .. '\255' -> 0 
+  | '\333' -> 2 
+  | _ -> 3
+  
+let () = 
+    eq __LOC__ (f '\123') 0 ;
+    eq __LOC__ (f '\333') 2 ;
+    eq __LOC__ (f '\444') 3
+;; Mt.from_pair_suites __FILE__ !suites