Merge pull request #4196 from BuckleScript/support_indexed_operators

support printing indexed operators  && remove unused String load/set

Author: bobzhang

.vscode/tasks.json

@@ -84,6 +84,23 @@
                 "autoDetect",
                 "owner": "globalUnused"     
         }                
+    },
+    {
+        "label": "check unused refmt",
+        "command" : "node",
+        "options": {
+            "cwd": "${workspaceRoot}/lib"
+        },
+        "args": [
+            "../scripts/checkUnused.js" ,
+            "refmt_main3"
+        ],
+        "problemMatcher" :{
+            "base": "$ocamlc",
+            "fileLocation" :
+                "autoDetect",
+                "owner": "globalUnused"     
+        }                
     }
     ]
 }

jscomp/core/js_long.ml

@@ -167,7 +167,7 @@ let compare (args : J.expression list) =
 
 (* let of_string (args : J.expression list) = 
   int64_call "of_string" args  *)
-let get64 = int64_call "get64"
+(* let get64 = int64_call "get64" *)
 let float_of_bits  =  int64_call "float_of_bits" 
 let bits_of_float = int64_call "bits_of_float"
 let min args = 

jscomp/core/js_long.mli

@@ -63,4 +63,4 @@ val compare : int64_call
 (* val of_string : int64_call *)
 val float_of_bits : int64_call
 val bits_of_float : int64_call  
-val get64 : int64_call
+(* val get64 : int64_call *)

jscomp/core/lam_analysis.ml

@@ -191,12 +191,12 @@ let rec no_side_effects (lam : Lam.t) : bool =
       (* size of the nth dimension of a big array *)
       | Pbigarraydim _
       (* load/set 16,32,64 bits from a string: (unsafe)*)
-      | Pstring_load_16 _
+      (* | Pstring_load_16 _
       | Pstring_load_32 _
-      | Pstring_load_64 _
-      | Pstring_set_16 _
+      | Pstring_load_64 _ *)
+      (* | Pstring_set_16 _
       | Pstring_set_32 _
-      | Pstring_set_64 _
+      | Pstring_set_64 _ *)
       (* load/set 16,32,64 bits from a
          (char, int8_unsigned_elt, c_layout) Bigarray.Array1.t : (unsafe) *)
       | Pbigstring_load_16 _

jscomp/core/lam_compile_primitive.ml

@@ -686,12 +686,12 @@ let translate  loc
     E.runtime_call Js_runtime_modules.int32 "caml_int32_bswap" args
   | Pbbswap Lambda.Pint64
     -> Js_long.swap args 
-  | Pstring_load_16 unsafe
+  (* | Pstring_load_16 unsafe
     -> E.runtime_call Js_runtime_modules.string "caml_string_get16" args
   | Pstring_load_32 unsafe
     -> E.runtime_call Js_runtime_modules.string "caml_string_get32" args
   | Pstring_load_64 unsafe
-    -> Js_long.get64 args
+    -> Js_long.get64 args *)
 
   | Plazyforce  
   (*   let parm = Ident.create "prim" in 
@@ -700,9 +700,9 @@ let translate  loc
    It is inlined, this should not appear here *)    
   | Pbittest 
 
-  | Pstring_set_16 _
+  (* | Pstring_set_16 _
   | Pstring_set_32 _
-  | Pstring_set_64 _
+  | Pstring_set_64 _ *)
   | Pbigstring_load_16 _
   | Pbigstring_load_32 _
   | Pbigstring_load_64 _

jscomp/core/lam_convert.ml

@@ -364,12 +364,13 @@ let lam_prim ~primitive:( p : Lambda.primitive) ~args loc : Lam.t =
   | Plsrbint x -> prim ~primitive:(Plsrbint x) ~args loc
   | Pasrbint x -> prim ~primitive:(Pasrbint x) ~args loc
   | Pbigarraydim x -> prim ~primitive:(Pbigarraydim x) ~args loc
-  | Pstring_load_16 x -> prim ~primitive:(Pstring_load_16 x) ~args loc
-  | Pstring_load_32 x -> prim ~primitive:(Pstring_load_32 x) ~args loc
-  | Pstring_load_64 x -> prim ~primitive:(Pstring_load_64 x) ~args loc
-  | Pstring_set_16 x -> prim ~primitive:(Pstring_set_16 x) ~args loc
-  | Pstring_set_32 x -> prim ~primitive:(Pstring_set_32 x) ~args loc
-  | Pstring_set_64 x -> prim ~primitive:(Pstring_set_64 x) ~args loc
+  | Pstring_load_16 _
+  | Pstring_load_32 _
+  | Pstring_load_64 _
+  | Pstring_set_16 _ 
+  | Pstring_set_32 _ 
+  | Pstring_set_64 _ -> 
+    Location.raise_errorf ~loc "unsupported primitive"
   | Pbigstring_load_16 x -> prim ~primitive:(Pbigstring_load_16 x) ~args loc
   | Pbigstring_load_32 x -> prim ~primitive:(Pbigstring_load_32 x) ~args loc
   | Pbigstring_load_64 x -> prim ~primitive:(Pbigstring_load_64 x) ~args loc

jscomp/core/lam_dispatch_primitive.ml

@@ -552,7 +552,7 @@ let translate loc (prim_name : string)
       call Js_runtime_modules.char
     | "caml_string_get"    
       -> 
-        call Js_runtime_modules.string
+        E.runtime_call Js_runtime_modules.string "get" args
     | "bytes_to_string"
     | "bytes_of_string"
     | "caml_blit_string" 

jscomp/core/lam_primitive.ml

@@ -116,12 +116,12 @@ type t =
   (* size of the nth dimension of a big array *)
   | Pbigarraydim of int
   (* load/set 16,32,64 bits from a string: (unsafe)*)
-  | Pstring_load_16 of bool
+  (* | Pstring_load_16 of bool
   | Pstring_load_32 of bool
-  | Pstring_load_64 of bool
-  | Pstring_set_16 of bool
+  | Pstring_load_64 of bool *)
+  (* | Pstring_set_16 of bool
   | Pstring_set_32 of bool
-  | Pstring_set_64 of bool
+  | Pstring_set_64 of bool *)
   (* load/set 16,32,64 bits from a
      (char, int8_unsigned_elt, c_layout) Bigarray.Array1.t : (unsafe) *)
   | Pbigstring_load_16 of bool
@@ -315,12 +315,12 @@ let eq_primitive_approx ( lhs : t) (rhs : t) =
   | Pcvtbint  (boxed_integer, boxed_integer1) -> (match rhs with Pcvtbint (boxed_integer10, boxed_integer11) -> Lam_compat.eq_boxed_integer boxed_integer boxed_integer10 && Lam_compat.eq_boxed_integer boxed_integer1 boxed_integer11 | _ -> false )
   | Pbintcomp  (boxed_integer , comparison) -> (match rhs with Pbintcomp(boxed_integer1, comparison1) -> Lam_compat.eq_boxed_integer boxed_integer boxed_integer1 && Lam_compat.eq_comparison comparison comparison1 | _ -> false)  
   | Pbigarraydim dim -> (match rhs with Pbigarraydim dim1 -> dim = dim1 | _ -> false )
-  | Pstring_load_16 str ->  (match  rhs with Pstring_load_16 str1 -> str = str1  | _ -> false )
+  (* | Pstring_load_16 str ->  (match  rhs with Pstring_load_16 str1 -> str = str1  | _ -> false )
   | Pstring_load_32 b -> (match rhs with Pstring_load_32 b1 -> b = b1 | _ -> false )    
-  | Pstring_load_64 b -> (match rhs with Pstring_load_64 b1 -> b = b1 | _ -> false )    
-  | Pstring_set_16 b -> (match rhs with Pstring_set_16 b1 -> b = b1 | _ -> false )    
+  | Pstring_load_64 b -> (match rhs with Pstring_load_64 b1 -> b = b1 | _ -> false )     *)
+  (* | Pstring_set_16 b -> (match rhs with Pstring_set_16 b1 -> b = b1 | _ -> false )    
   | Pstring_set_32 b -> (match rhs with Pstring_set_32 b1 -> b = b1 | _ -> false )    
-  | Pstring_set_64 b -> (match rhs with Pstring_set_64 b1 -> b = b1 | _ -> false )      
+  | Pstring_set_64 b -> (match rhs with Pstring_set_64 b1 -> b = b1 | _ -> false )       *)
   | Pbigstring_load_16 b -> (match rhs with Pbigstring_load_16 b1 -> b = b1 | _ -> false )      
   | Pbigstring_load_32 b -> (match rhs with Pbigstring_load_32 b1 -> b = b1 | _ -> false )      
   | Pbigstring_load_64 b -> (match rhs with Pbigstring_load_64 b1 -> b = b1 | _ -> false )      

jscomp/core/lam_primitive.mli

@@ -111,12 +111,12 @@ type t =
   (* size of the nth dimension of a big array *)
   | Pbigarraydim of int
   (* load/set 16,32,64 bits from a string: (unsafe)*)
-  | Pstring_load_16 of bool
+  (* | Pstring_load_16 of bool
   | Pstring_load_32 of bool
-  | Pstring_load_64 of bool
-  | Pstring_set_16 of bool
+  | Pstring_load_64 of bool *)
+  (* | Pstring_set_16 of bool
   | Pstring_set_32 of bool
-  | Pstring_set_64 of bool
+  | Pstring_set_64 of bool *)
   (* load/set 16,32,64 bits from a
      (char, int8_unsigned_elt, c_layout) Bigarray.Array1.t : (unsafe) *)
   | Pbigstring_load_16 of bool

jscomp/core/lam_print.ml

@@ -268,7 +268,7 @@ let primitive ppf (prim : Lam_primitive.t) = match prim with
   | Pbigarrayset(unsafe, n, kind, layout) ->
     print_bigarray "set" unsafe kind ppf layout
   | Pbigarraydim(n) -> fprintf ppf "Bigarray.dim_%i" n
-  | Pstring_load_16(unsafe) ->
+  (* | Pstring_load_16(unsafe) ->
     if unsafe then fprintf ppf "string.unsafe_get16"
     else fprintf ppf "string.get16"
   | Pstring_load_32(unsafe) ->
@@ -277,15 +277,15 @@ let primitive ppf (prim : Lam_primitive.t) = match prim with
   | Pstring_load_64(unsafe) ->
     if unsafe then fprintf ppf "string.unsafe_get64"
     else fprintf ppf "string.get64"
-  | Pstring_set_16(unsafe) ->
+  (* | Pstring_set_16(unsafe) -> *)
     if unsafe then fprintf ppf "string.unsafe_set16"
     else fprintf ppf "string.set16"
   | Pstring_set_32(unsafe) ->
     if unsafe then fprintf ppf "string.unsafe_set32"
     else fprintf ppf "string.set32"
   | Pstring_set_64(unsafe) ->
     if unsafe then fprintf ppf "string.unsafe_set64"
-    else fprintf ppf "string.set64"
+    else fprintf ppf "string.set64" *)
   | Pbigstring_load_16(unsafe) ->
     if unsafe then fprintf ppf "bigarray.array1.unsafe_get16"
     else fprintf ppf "bigarray.array1.get16"