remove Obj.truncate and Caml_obj_extern.set_length

Author: bobzhang

jscomp/core/lam_dispatch_primitive.ml

@@ -684,7 +684,6 @@ let translate loc (prim_name : string)
     (*   "caml_alloc_dummy"; *)
     (* TODO:   "caml_alloc_dummy_float"; *)
     | "caml_obj_dup" 
-    | "caml_obj_truncate"
       -> 
       call Js_runtime_modules.obj_runtime
 
@@ -774,60 +773,7 @@ let translate loc (prim_name : string)
       E.runtime_ref Js_runtime_modules.io "stdout"
     | "caml_ml_open_descriptor_out" when 
       args_const_unbox_approx_int_two args -> 
-      E.runtime_ref Js_runtime_modules.io "stderr"
-
-    | "caml_ba_create"
-    | "caml_ba_get_generic"
-    | "caml_ba_set_generic"
-    | "caml_ba_num_dims"
-    | "caml_ba_dim"
-    | "caml_ba_kind"
-    | "caml_ba_layout"
-    | "caml_ba_sub"
-    | "caml_ba_slice"
-    | "caml_ba_blit"
-    | "caml_ba_fill"
-    | "caml_ba_reshape"
-    | "caml_ba_map_file_bytecode"
-
-    (* caml_ba_get_1,  (\* %caml_ba_ref_1 *\) *)
-    (* caml_ba_get_2, *)
-    (* caml_ba_get_3, *)
-
-    (* caml_ba_set_1,  // %caml_ba_set_1 *)
-    (* caml_ba_set_2, *)
-    (* caml_ba_set_3, *)
-
-    (* caml_ba_dim_1, // %caml_ba_dim_1 *)
-    (* caml_ba_dim_2,  *)
-    (* caml_ba_dim_3,  *)
-    | "caml_output_value_to_buffer"
-    | "caml_marshal_data_size"
-    | "caml_input_value_from_string"
-    | "caml_output_value"
-    | "caml_input_value"
-    | "caml_output_value_to_string"
-    | "caml_md5_chan"
-    | "caml_hash_univ_param"
-    | "caml_sys_close"
-    | "caml_sys_open"
-    | "caml_ml_input"
-    | "caml_ml_input_scan_line"
-    | "caml_ml_input_int"
-    | "caml_ml_close_channel"
-    | "caml_ml_output_int"
-
-    | "caml_ml_channel_size_64"
-    | "caml_ml_channel_size"
-    | "caml_ml_pos_in_64"
-    | "caml_ml_pos_in"
-    | "caml_ml_seek_in"
-    | "caml_ml_seek_in_64"
-    | "caml_ml_pos_out"
-    | "caml_ml_pos_out_64"
-    | "caml_ml_seek_out"
-    | "caml_ml_seek_out_64"
-    | "caml_ml_set_binary_mode"    
+      E.runtime_ref Js_runtime_modules.io "stderr"       
     | _ -> 
       Bs_warnings.warn_missing_primitive loc prim_name  ;
       E.resolve_and_apply prim_name args

jscomp/runtime/caml_obj.ml

@@ -108,23 +108,6 @@ let caml_obj_dup : Caml_obj_extern.t -> Caml_obj_extern.t = [%raw{|function(x){
 
 
 
-let caml_obj_truncate (x : Caml_obj_extern.t) (new_size : int) =
-  let len = Caml_obj_extern.length x in
-  if new_size <= 0 || new_size > len then
-    raise (Invalid_argument "Obj.truncate")
-  else
-  if len <> new_size  then
-    begin
-      for i = new_size  to len - 1  do
-        Obj.set_field x  i (Obj.magic 0)
-      done;
-      Caml_obj_extern.set_length x new_size
-    end
-
-
-
-
-
 
 (** 
    For the empty dummy object, whether it's 
@@ -151,9 +134,6 @@ let update_dummy : _ -> _ -> unit= [%raw{|function(x,y){
 }
 |}]
 
-(* Caml_obj_extern.set_length x   (Caml_obj_extern.length y) *)
-(* [set_length] seems redundant here given that it is initialized as an array 
-*)
 
 
 

jscomp/runtime/caml_obj.mli

@@ -32,8 +32,6 @@ type t = Caml_obj_extern.t
 val caml_obj_block : int -> int -> Caml_obj_extern.t
 val caml_obj_dup : Caml_obj_extern.t -> Caml_obj_extern.t
 
-val caml_obj_truncate : Caml_obj_extern.t -> int -> unit
-
 
 val update_dummy : Caml_obj_extern.t -> Caml_obj_extern.t -> unit
 

jscomp/runtime/caml_obj_extern.ml

@@ -29,7 +29,7 @@ type t = Bs_stdlib_mini.Obj.t
 
 
 
-external set_length : t -> int -> unit = "length" [@@bs.set]
+
 external length : t -> int = "#obj_length"
 
 

jscomp/stdlib-406/obj.ml

@@ -30,7 +30,7 @@ external field : t -> int -> t = "%obj_field"
 external set_field : t -> int -> t -> unit = "%obj_set_field"
 
 external dup : t -> t = "caml_obj_dup"
-external truncate : t -> int -> unit = "caml_obj_truncate"
+
 
 
 

jscomp/stdlib-406/obj.mli

@@ -55,7 +55,7 @@ external field : t -> int -> t = "%obj_field"
 *)
 external set_field : t -> int -> t -> unit = "%obj_set_field"
 external dup : t -> t = "caml_obj_dup"
-external truncate : t -> int -> unit = "caml_obj_truncate"
+
 
 
 module Ephemeron: sig

jscomp/test/ocaml_parsetree_test.js

@@ -11444,6 +11444,67 @@ function token(lexbuf) {
   };
 }
 
+function string(lexbuf) {
+  lexbuf.lex_mem = Caml_array.caml_make_vect(2, -1);
+  var ___ocaml_lex_state = 164;
+  while(true) {
+    var __ocaml_lex_state = ___ocaml_lex_state;
+    var __ocaml_lex_state$1 = Lexing.new_engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf);
+    switch (__ocaml_lex_state$1) {
+      case 0 :
+          return ;
+      case 1 :
+          var space = Lexing.sub_lexeme(lexbuf, Caml_array.caml_array_get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
+          update_loc(lexbuf, undefined, 1, false, space.length);
+          return string(lexbuf);
+      case 2 :
+          store_string_char(char_for_backslash(Lexing.lexeme_char(lexbuf, 1)));
+          return string(lexbuf);
+      case 3 :
+          store_string_char(char_for_decimal_code(lexbuf, 1));
+          return string(lexbuf);
+      case 4 :
+          store_string_char(char_for_hexadecimal_code(lexbuf, 2));
+          return string(lexbuf);
+      case 5 :
+          if (comment_start_loc.contents !== /* [] */0) {
+            return string(lexbuf);
+          }
+          var loc = curr(lexbuf);
+          prerr_warning(loc, /* Illegal_backslash */7);
+          store_string_char(Lexing.lexeme_char(lexbuf, 0));
+          store_string_char(Lexing.lexeme_char(lexbuf, 1));
+          return string(lexbuf);
+      case 6 :
+          if (comment_start_loc.contents === /* [] */0) {
+            prerr_warning(curr(lexbuf), /* Eol_in_string */14);
+          }
+          update_loc(lexbuf, undefined, 1, false, 0);
+          store_string(Lexing.lexeme(lexbuf));
+          return string(lexbuf);
+      case 7 :
+          is_in_string.contents = false;
+          throw {
+                RE_EXN_ID: $$Error$2,
+                _1: /* Unterminated_string */0,
+                _2: string_start_loc.contents,
+                Error: new Error()
+              };
+      case 8 :
+          store_string_char(Lexing.lexeme_char(lexbuf, 0));
+          return string(lexbuf);
+      default:
+        Curry._1(lexbuf.refill_buff, lexbuf);
+        ___ocaml_lex_state = __ocaml_lex_state$1;
+        continue ;
+    }
+  };
+}
+
+function comment(lexbuf) {
+  return __ocaml_lex_comment_rec(lexbuf, 132);
+}
+
 function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
   while(true) {
     var __ocaml_lex_state = ___ocaml_lex_state;
@@ -11625,67 +11686,6 @@ function __ocaml_lex_comment_rec(lexbuf, ___ocaml_lex_state) {
   };
 }
 
-function comment(lexbuf) {
-  return __ocaml_lex_comment_rec(lexbuf, 132);
-}
-
-function string(lexbuf) {
-  lexbuf.lex_mem = Caml_array.caml_make_vect(2, -1);
-  var ___ocaml_lex_state = 164;
-  while(true) {
-    var __ocaml_lex_state = ___ocaml_lex_state;
-    var __ocaml_lex_state$1 = Lexing.new_engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf);
-    switch (__ocaml_lex_state$1) {
-      case 0 :
-          return ;
-      case 1 :
-          var space = Lexing.sub_lexeme(lexbuf, Caml_array.caml_array_get(lexbuf.lex_mem, 0), lexbuf.lex_curr_pos);
-          update_loc(lexbuf, undefined, 1, false, space.length);
-          return string(lexbuf);
-      case 2 :
-          store_string_char(char_for_backslash(Lexing.lexeme_char(lexbuf, 1)));
-          return string(lexbuf);
-      case 3 :
-          store_string_char(char_for_decimal_code(lexbuf, 1));
-          return string(lexbuf);
-      case 4 :
-          store_string_char(char_for_hexadecimal_code(lexbuf, 2));
-          return string(lexbuf);
-      case 5 :
-          if (comment_start_loc.contents !== /* [] */0) {
-            return string(lexbuf);
-          }
-          var loc = curr(lexbuf);
-          prerr_warning(loc, /* Illegal_backslash */7);
-          store_string_char(Lexing.lexeme_char(lexbuf, 0));
-          store_string_char(Lexing.lexeme_char(lexbuf, 1));
-          return string(lexbuf);
-      case 6 :
-          if (comment_start_loc.contents === /* [] */0) {
-            prerr_warning(curr(lexbuf), /* Eol_in_string */14);
-          }
-          update_loc(lexbuf, undefined, 1, false, 0);
-          store_string(Lexing.lexeme(lexbuf));
-          return string(lexbuf);
-      case 7 :
-          is_in_string.contents = false;
-          throw {
-                RE_EXN_ID: $$Error$2,
-                _1: /* Unterminated_string */0,
-                _2: string_start_loc.contents,
-                Error: new Error()
-              };
-      case 8 :
-          store_string_char(Lexing.lexeme_char(lexbuf, 0));
-          return string(lexbuf);
-      default:
-        Curry._1(lexbuf.refill_buff, lexbuf);
-        ___ocaml_lex_state = __ocaml_lex_state$1;
-        continue ;
-    }
-  };
-}
-
 function __ocaml_lex_quoted_string_rec(delim, lexbuf, ___ocaml_lex_state) {
   while(true) {
     var __ocaml_lex_state = ___ocaml_lex_state;

jscomp/test/ocaml_proto_test.js

@@ -1505,31 +1505,28 @@ function __ocaml_lex_comment_rec(_l, lexbuf, ___ocaml_lex_state) {
   };
 }
 
-function __ocaml_lex_string_rec(_l, lexbuf, ___ocaml_lex_state) {
+function __ocaml_lex_multi_line_comment_rec(_l, lexbuf, ___ocaml_lex_state) {
   while(true) {
     var __ocaml_lex_state = ___ocaml_lex_state;
     var l = _l;
     var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf);
     switch (__ocaml_lex_state$1) {
       case 0 :
-          var c = Lexing.lexeme_char(lexbuf, 1);
-          ___ocaml_lex_state = 55;
-          _l = /* :: */[
-            Char.escaped(c),
-            l
-          ];
+          update_loc(lexbuf);
+          ___ocaml_lex_state = 47;
           continue ;
       case 1 :
-          return /* String_value */[$$String.concat("", List.rev(l))];
+          Lexing.lexeme(lexbuf);
+          return /* Comment_value */[$$String.concat("", List.rev(l))];
       case 2 :
-          ___ocaml_lex_state = 55;
+          ___ocaml_lex_state = 47;
           _l = /* :: */[
             Lexing.lexeme(lexbuf),
             l
           ];
           continue ;
       case 3 :
-          return /* String_eof */0;
+          return /* Comment_eof */0;
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;
@@ -1538,28 +1535,31 @@ function __ocaml_lex_string_rec(_l, lexbuf, ___ocaml_lex_state) {
   };
 }
 
-function __ocaml_lex_multi_line_comment_rec(_l, lexbuf, ___ocaml_lex_state) {
+function __ocaml_lex_string_rec(_l, lexbuf, ___ocaml_lex_state) {
   while(true) {
     var __ocaml_lex_state = ___ocaml_lex_state;
     var l = _l;
     var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf);
     switch (__ocaml_lex_state$1) {
       case 0 :
-          update_loc(lexbuf);
-          ___ocaml_lex_state = 47;
+          var c = Lexing.lexeme_char(lexbuf, 1);
+          ___ocaml_lex_state = 55;
+          _l = /* :: */[
+            Char.escaped(c),
+            l
+          ];
           continue ;
       case 1 :
-          Lexing.lexeme(lexbuf);
-          return /* Comment_value */[$$String.concat("", List.rev(l))];
+          return /* String_value */[$$String.concat("", List.rev(l))];
       case 2 :
-          ___ocaml_lex_state = 47;
+          ___ocaml_lex_state = 55;
           _l = /* :: */[
             Lexing.lexeme(lexbuf),
             l
           ];
           continue ;
       case 3 :
-          return /* Comment_eof */0;
+          return /* String_eof */0;
       default:
         Curry._1(lexbuf.refill_buff, lexbuf);
         ___ocaml_lex_state = __ocaml_lex_state$1;