snapshot

Author: bobzhang

jscomp/all.depend

@@ -511,9 +511,10 @@ core/lam_check.cmx : core/lam.cmx ext/ident_hash_set.cmx ext/ext_option.cmx \
     ext/ext_list.cmx core/lam_check.cmi
 core/lam_convert.cmx : core/primitive_compat.cmx core/lam_tag_info.cmx \
     core/lam_scc.cmx core/lam_primitive.cmx core/lam_module_ident.cmx \
-    core/lam_constant.cmx core/lam.cmx ext/int_hashtbl.cmx ext/ident_set.cmx \
-    ext/ident_hashtbl.cmx syntax/external_ffi_types.cmx ext/ext_string.cmx \
-    ext/ext_list.cmx syntax/ast_exp_extension.cmx core/lam_convert.cmi
+    core/lam_hit.cmx core/lam_constant.cmx core/lam.cmx ext/int_hashtbl.cmx \
+    ext/ident_set.cmx ext/ident_hashtbl.cmx syntax/external_ffi_types.cmx \
+    ext/ext_string.cmx ext/ext_list.cmx syntax/ast_exp_extension.cmx \
+    core/lam_convert.cmi
 core/lam_print.cmx : core/lam_primitive.cmx core/lam_constant.cmx \
     core/lam_compat.cmx core/lam.cmx ext/ext_list.cmx core/lam_print.cmi
 core/lam_beta_reduce_util.cmx : core/lam.cmx ext/ident_hashtbl.cmx \

jscomp/test/.depend

@@ -369,6 +369,8 @@ int_hashtbl_test.cmj : mt.cmj ../stdlib/list.cmj ../stdlib/hashtbl.cmj \
 int_map.cmj : ../stdlib/map.cmj
 int_overflow_test.cmj : ../stdlib/string.cmj mt.cmj ../runtime/js.cmj \
     ../stdlib/int32.cmj ../stdlib/char.cmj
+int_switch_test.cmj : mt.cmj
+int_swtich_test.cmj :
 io_test.cmj : ../runtime/js.cmj
 js_array_test.cmj : mt.cmj ../runtime/js.cmj ../stdlib/array.cmj
 js_bool_test.cmj : mt.cmj

jscomp/test/Makefile

@@ -260,6 +260,7 @@ OTHERS := test_literals a test_ari test_export2 test_internalOO test_obj_simple_
 	gpr_2863_test\
 	optional_regression_test\
 	if_used_test\
+	int_switch_test\
 # bs_uncurry_test
 # needs Lam to get rid of Uncurry arity first
 # simple_derive_test

jscomp/test/arith_lexer.js

@@ -24,35 +24,32 @@ function __ocaml_lex_lexeme_rec(lexbuf, ___ocaml_lex_state) {
   while(true) {
     var __ocaml_lex_state = ___ocaml_lex_state;
     var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf);
-    if (__ocaml_lex_state$1 > 9 || __ocaml_lex_state$1 < 0) {
-      Curry._1(lexbuf[/* refill_buff */0], lexbuf);
-      ___ocaml_lex_state = __ocaml_lex_state$1;
-      continue ;
-    } else {
-      switch (__ocaml_lex_state$1) {
-        case 0 : 
-            ___ocaml_lex_state = 0;
-            continue ;
-        case 1 : 
-            return /* NUMERAL */Block.__(0, [Caml_format.caml_int_of_string(Lexing.lexeme(lexbuf))]);
-        case 2 : 
-            return /* IDENT */Block.__(1, [Lexing.lexeme(lexbuf)]);
-        case 3 : 
-            return /* PLUS */0;
-        case 4 : 
-            return /* MINUS */1;
-        case 5 : 
-            return /* TIMES */2;
-        case 6 : 
-            return /* DIVIDE */3;
-        case 7 : 
-            return /* LPAREN */5;
-        case 8 : 
-            return /* RPAREN */6;
-        case 9 : 
-            return /* EOF */7;
-        
-      }
+    switch (__ocaml_lex_state$1) {
+      case 0 : 
+          ___ocaml_lex_state = 0;
+          continue ;
+      case 1 : 
+          return /* NUMERAL */Block.__(0, [Caml_format.caml_int_of_string(Lexing.lexeme(lexbuf))]);
+      case 2 : 
+          return /* IDENT */Block.__(1, [Lexing.lexeme(lexbuf)]);
+      case 3 : 
+          return /* PLUS */0;
+      case 4 : 
+          return /* MINUS */1;
+      case 5 : 
+          return /* TIMES */2;
+      case 6 : 
+          return /* DIVIDE */3;
+      case 7 : 
+          return /* LPAREN */5;
+      case 8 : 
+          return /* RPAREN */6;
+      case 9 : 
+          return /* EOF */7;
+      default:
+        Curry._1(lexbuf[/* refill_buff */0], lexbuf);
+        ___ocaml_lex_state = __ocaml_lex_state$1;
+        continue ;
     }
   };
 }

jscomp/test/arity_infer.js

@@ -22,32 +22,29 @@ function f1(x) {
 
 function f3(x) {
   var tmp;
-  if (x > 3 || x < 0) {
-    throw Caml_builtin_exceptions.not_found;
-  } else {
-    switch (x) {
-      case 0 : 
-          tmp = (function (x) {
-              return x + 1 | 0;
-            });
-          break;
-      case 1 : 
-          tmp = (function (x) {
-              return x + 2 | 0;
-            });
-          break;
-      case 2 : 
-          tmp = (function (x) {
-              return x + 3 | 0;
-            });
-          break;
-      case 3 : 
-          tmp = (function (x) {
-              return x + 4 | 0;
-            });
-          break;
-      
-    }
+  switch (x) {
+    case 0 : 
+        tmp = (function (x) {
+            return x + 1 | 0;
+          });
+        break;
+    case 1 : 
+        tmp = (function (x) {
+            return x + 2 | 0;
+          });
+        break;
+    case 2 : 
+        tmp = (function (x) {
+            return x + 3 | 0;
+          });
+        break;
+    case 3 : 
+        tmp = (function (x) {
+            return x + 4 | 0;
+          });
+        break;
+    default:
+      throw Caml_builtin_exceptions.not_found;
   }
   return tmp(3);
 }