then is not a keyword in js

Author: bobzhang

jscomp/ext/js_reserved_map.ml

@@ -681,7 +681,6 @@ let sorted_keywords = [|
   "super";
   "switch";
   "synchronized";
-  "then";
   "this";
   "throw";
   "transient";

jscomp/test/406_primitive_test.ml

@@ -7,7 +7,7 @@ let test_id = ref 0
 
 let eq loc x y : unit = Mt.eq_suites ~test_id loc  ~suites x y
 
-#if OCAML_VERSION =~ ">4.03.0" 
+
 
 external int_size : unit -> int = "%int_size"
 
@@ -37,6 +37,6 @@ let  f () =
     done 
   with A _ -> ()
 
-#end
+
 
 ;; Mt.from_pair_suites __MODULE__ !suites

jscomp/test/build.ninja

@@ -688,6 +688,7 @@ o test/test_unsupported_primitive.cmi test/test_unsupported_primitive.cmj : cc t
 o test/test_while_closure.cmi test/test_while_closure.cmj : cc test/test_while_closure.ml | $stdlib
 o test/test_while_side_effect.cmi test/test_while_side_effect.cmj : cc test/test_while_side_effect.ml | $stdlib
 o test/test_zero_nullable.cmi test/test_zero_nullable.cmj : cc test/test_zero_nullable.ml | test/mt.cmj $stdlib
+o test/then_mangle_test.cmi test/then_mangle_test.cmj : cc test/then_mangle_test.res | test/mt.cmj $stdlib
 o test/ticker.cmi test/ticker.cmj : cc test/ticker.ml | $stdlib
 o test/to_string_test.cmi test/to_string_test.cmj : cc test/to_string_test.ml | test/mt.cmj $stdlib
 o test/topsort_test.cmi test/topsort_test.cmj : cc test/topsort_test.ml | $stdlib

jscomp/test/then_mangle_test.js

@@ -0,0 +1,26 @@
+'use strict';
+
+var Mt = require("./mt.js");
+
+var suites = {
+  contents: /* [] */0
+};
+
+var test_id = {
+  contents: 0
+};
+
+function eq(loc, x, y) {
+  return Mt.eq_suites(test_id, suites, loc, x, y);
+}
+
+function then(a, b) {
+  console.log("no inline");
+  return Math.imul(a, a) + Math.imul(b, b) | 0;
+}
+
+eq("File \"then_mangle_test.res\", line 14, characters 3-10", then(1, 2), 5);
+
+Mt.from_pair_suites("then_mangle_test.res", suites.contents);
+
+/*  Not a pure module */

jscomp/test/then_mangle_test.res

@@ -0,0 +1,17 @@
+@@config({no_export})
+
+let suites :  ref<Mt.pair_suites> = ref (list{})
+let test_id = ref(0)
+
+let {eq_suites} = module (Mt)
+let eq = (loc,x,y) => eq_suites(loc,x,y,~test_id,~suites)
+
+let then = (a,b)=>{
+    Js.log("no inline")
+    a*a+b*b
+}
+
+eq(__LOC__,then(1,2),5)
+
+
+Mt.from_pair_suites(__FILE__ ,suites.contents)

scripts/build_sorted.ml

@@ -30,7 +30,7 @@
     "debugger";"default";"delete";"do";
     "else";
     "finally";"for";"function";
-    "if"; "then"; "in";"instanceof";
+    "if"; (* "then";  *) "in";"instanceof";
     "new";
     "return";
     "switch";