converting cases f["123"] into f[123]

we use a round trip to avoid number-like literals ("0123")

Author: bobzhang

jscomp/core/js_dump_property.ml

@@ -83,8 +83,18 @@ let property_access f s =
     end
   else
     begin 
-      P.bracket_group f 1 @@ fun _ ->
-      Js_dump_string.pp_string f s
+      P.bracket_group f 1 (fun _ ->
+      (* avoid cases like 
+        "0123", "123_456"
+      *)
+      match string_of_int (int_of_string s ) with 
+      | s0 when s0 = s -> 
+        P.string f s 
+      | _  ->
+        Js_dump_string.pp_string f s
+      | exception _ -> 
+        Js_dump_string.pp_string f s
+    )
     end
 
 let property_key f (s : J.property_name) =     

jscomp/test/build.ninja

@@ -265,7 +265,7 @@ build test/gpr_1817_test.cmi test/gpr_1817_test.cmj : cc test/gpr_1817_test.ml |
 build test/gpr_1822_test.cmi test/gpr_1822_test.cmj : cc test/gpr_1822_test.ml | test/mt.cmj $stdlib
 build test/gpr_1891_test.cmi test/gpr_1891_test.cmj : cc test/gpr_1891_test.ml | $stdlib
 build test/gpr_1943_test.cmi test/gpr_1943_test.cmj : cc test/gpr_1943_test.ml | test/mt.cmj $stdlib
-build test/gpr_1946_test.cmi test/gpr_1946_test.cmj : cc test/gpr_1946_test.ml | $stdlib
+build test/gpr_1946_test.cmi test/gpr_1946_test.cmj : cc test/gpr_1946_test.ml | test/mt.cmj $stdlib
 build test/gpr_2250_test.cmi test/gpr_2250_test.cmj : cc test/gpr_2250_test.ml | test/mt.cmj $stdlib
 build test/gpr_2316_test.cmi test/gpr_2316_test.cmj : cc test/gpr_2316_test.ml | test/mt.cmj $stdlib
 build test/gpr_2352_test.cmi test/gpr_2352_test.cmj : cc test/gpr_2352_test.ml | $stdlib

jscomp/test/gpr_1943_test.js

@@ -31,7 +31,7 @@ function eq(loc, x, y) {
 function f(x) {
   return [
           x["003"],
-          x["50"],
+          x[50],
           x["50x"],
           x.__50,
           x.__50x,

jscomp/test/gpr_1946_test.js

@@ -1,5 +1,18 @@
 '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);
+}
 
 var x = ({
     x: 3,
@@ -13,16 +26,43 @@ var x = ({
 
 var zz = ({
     "5": 3
-  })["5"];
+  })[5];
 
-({
-    "5": 3
-  })["5"];
+var h = {
+  "0123": 2,
+  "123_456": 3
+};
+
+function f(id) {
+  while(false) {
+    
+  };
+  return id;
+}
+
+eq("File \"gpr_1946_test.ml\", line 29, characters 6-13", ({
+        "5": 3
+      })[5], 3);
+
+eq("File \"gpr_1946_test.ml\", line 30, characters 6-13", [
+      2,
+      3
+    ], [
+      f(h)["0123"],
+      f(h)["123_456"]
+    ]);
 
 console.log(({
           "5": 3
         }).TAG | 0);
 
+Mt.from_pair_suites("File \"gpr_1946_test.ml\", line 33, characters 23-30", suites.contents);
+
+exports.suites = suites;
+exports.test_id = test_id;
+exports.eq = eq;
 exports.x = x;
 exports.zz = zz;
+exports.h = h;
+exports.f = f;
 /* x Not a pure module */

jscomp/test/gpr_1946_test.ml

@@ -14,7 +14,20 @@ let zz =  [%obj{_5 = 3 }]##_5
 
 
 
+
+type t = {
+  a : int ;  [@bs.as "0123"]
+  b : int ; [@bs.as "123_456"]
+} 
+
+let h = {a = 2; b = 3 }
+let f id = 
+  while false do () done;  
+  id 
+
+  
 ;; eq __LOC__ [%obj{_5 = 3 }]##_5 3 
+;; eq __LOC__ (2,3) ((f h).a,(f h).b)
 ;; Js.log @@ Obj.tag (Obj.repr [%obj{_5 = 3 }])
 
 ;; Mt.from_pair_suites __LOC__ !suites