Merge pull request #2798 from BuckleScript/no_paren_first

fix #2582

Author: bobzhang

jscomp/bin/all_ounit_tests.ml

@@ -14977,9 +14977,11 @@ module Ast_utf8_string_interp : sig
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type kind =
+
+ type kind =
   | String
-  | Var
+  | Var of int * int (* int records its border length *)
+
 type error = private
   | Invalid_code_point
   | Unterminated_backslash
@@ -15054,10 +15056,14 @@ type error =
   | Unterminated_variable
   | Unmatched_paren
   | Invalid_syntax_of_var of string 
+
 type kind =
   | String
-  | Var
-
+  | Var of int * int 
+(* [Var (loffset, roffset)] 
+  For parens it used to be (2,-1)
+  for non-parens it used to be (1,0)
+*)
 
 (** Note the position is about code point *)
 type pos = { 
@@ -15176,7 +15182,7 @@ let pos_error cxt ~loc error =
            (cxt.segment_start,
             { lnum = cxt.pos_lnum ; offset = loc - cxt.pos_bol ; byte_bol = cxt.byte_bol}, error))
 
-let add_var_segment cxt loc  = 
+let add_var_segment cxt loc loffset roffset = 
   let content =  Buffer.contents cxt.buf in
   Buffer.clear cxt.buf ;
   let next_loc = {
@@ -15187,7 +15193,7 @@ let add_var_segment cxt loc  =
       cxt.segments <- 
         { start = cxt.segment_start; 
           finish =  next_loc ;
-          kind = Var; 
+          kind = Var (loffset, roffset); 
           content} :: cxt.segments ;
       cxt.segment_start <- next_loc
     end
@@ -15280,7 +15286,7 @@ and expect_simple_var  loc  s offset ({buf; s_len} as cxt) =
       done;
       let added_length = !v - offset in
       let loc = added_length + loc in 
-      add_var_segment cxt loc  ; 
+      add_var_segment cxt loc 1 0 ; 
       check_and_transform loc  s (added_length + offset) cxt
     end
 and expect_var_paren  loc  s offset ({buf; s_len} as cxt) =
@@ -15295,7 +15301,7 @@ and expect_var_paren  loc  s offset ({buf; s_len} as cxt) =
   let loc = added_length +  1 + loc  in
   if !v < s_len && s.[!v] = ')' then
     begin 
-      add_var_segment cxt loc ; 
+      add_var_segment cxt loc 2 (-1) ; 
       check_and_transform loc  s (added_length + 1 + offset) cxt 
     end
   else
@@ -15394,7 +15400,7 @@ open Ast_helper
 
 (** Longident.parse "Pervasives.^" *)
 let concat_ident  : Longident.t = 
-  Ldot (Lident "Pervasives", "^")
+  Ldot (Lident "Pervasives", "^") (* FIXME: remove deps on `Pervasives` *)
    (* JS string concatMany *)
     (* Ldot (Ldot (Lident "Js", "String"), "concat") *)
 
@@ -15420,14 +15426,19 @@ let border = String.length "{j|"
 let aux loc (segment : segment) =  
   match segment with 
   | {start ; finish; kind ; content} 
-    -> 
-    let loc = update border start finish  loc in 
+    ->     
     begin match kind with 
-      | String -> 
+      | String ->         
+        let loc = update border start finish  loc  in 
         Exp.constant 
           ~loc
           (Const_string (content, escaped)) 
-      | Var -> 
+      | Var (soffset, foffset) ->
+        let loc = {
+          loc with 
+          loc_start = update_position  (soffset + border) start loc.loc_start ;
+          loc_end = update_position (foffset + border) finish loc.loc_start
+        } in 
         Exp.apply ~loc 
           (Exp.ident ~loc {loc ; txt = to_string_ident })
           [
@@ -15505,6 +15516,9 @@ let (==*) a b =
       )
    in 
    OUnit.assert_equal segments b 
+
+let varParen : Ast_utf8_string_interp.kind = Var (2,-1)   
+let var : Ast_utf8_string_interp.kind = Var (1,0)
 let suites = 
     __FILE__
     >:::
@@ -15551,7 +15565,7 @@ let suites =
           "hie $x hi 你好" ==~
             [
               0,4, String, "hie ";
-              4,6, Var, "x";
+              4,6, var, "x";
               6,12,String, " hi 你好"
             ]
         end;
@@ -15571,7 +15585,7 @@ let suites =
         __LOC__ >:: begin fun _ ->
           "你好$x" ==~
           [0,2,String, "你好";
-           2,4,Var, "x";
+           2,4,var, "x";
 
           ]
         end
@@ -15580,47 +15594,47 @@ let suites =
           "你好$this" ==~
           [
             0,2,String, "你好";
-            2,7,Var, "this";
+            2,7,var, "this";
           ]
         end
         ;
         __LOC__ >:: begin fun _ ->
           "你好$(this)" ==~
           [
             0,2,String, "你好";
-            2,9,Var, "this"
+            2,9,varParen, "this"
           ];
 
           "你好$this)" ==~
           [
              0,2,String, "你好";
-             2,7,Var, "this";
+             2,7,var, "this";
              7,8,String,")"
           ];
           {|\xff\xff你好 $x |} ==~
           [
             0,11,String, {|\xff\xff你好 |};
-            11,13, Var, "x";
+            11,13, var, "x";
             13,14, String, " "
           ];
           {|\xff\xff你好 $x 不吃亏了buckle $y $z = $sum|}
           ==~
           [(0, 11, String,{|\xff\xff你好 |} );
-           (11, 13, Var, "x");
+           (11, 13, var, "x");
            (13, 25, String,{| 不吃亏了buckle |} );
-           (25, 27, Var, "y");
+           (25, 27, var, "y");
            (27, 28, String, " ");
-           (28, 30, Var, "z");
+           (28, 30, var, "z");
            (30, 33, String, " = ");
-           (33, 37, Var, "sum");
+           (33, 37, var, "sum");
            ]
         end
         ;
         __LOC__ >:: begin fun _ ->
           "你好 $(this_is_a_var)  x" ==~
           [
             0,3,String, "你好 ";
-            3,19,Var, "this_is_a_var";
+            3,19,varParen, "this_is_a_var";
             19,22, String, "  x"
           ]
         end
@@ -15630,17 +15644,17 @@ let suites =
         "hi\n$x\n" ==*
         [
           0,0,1,0,String, "hi\\n";
-          1,0,1,2,Var, "x" ;
+          1,0,1,2,var, "x" ;
           1,2,2,0,String,"\\n"
         ];
         "$x" ==*
-        [0,0,0,2,Var,"x"];
+        [0,0,0,2,var,"x"];
 
 
         "\n$x\n" ==*
         [
           0,0,1,0,String,"\\n";
-          1,0,1,2,Var,"x";
+          1,0,1,2,var,"x";
           1,2,2,0,String,"\\n"
         ]
         end;
@@ -15649,27 +15663,27 @@ let suites =
         "\n$(x_this_is_cool) " ==*
         [
           0,0,1,0,String, "\\n";
-          1,0,1,17,Var, "x_this_is_cool";
+          1,0,1,17,varParen, "x_this_is_cool";
           1,17,1,18,String, " "
         ]
         end;
         __LOC__ >:: begin fun _ -> 
         " $x + $y = $sum " ==*
         [
           0,0,0,1,String , " ";
-          0,1,0,3,Var, "x";
+          0,1,0,3,var, "x";
           0,3,0,6,String, " + ";
-          0,6,0,8,Var, "y";
+          0,6,0,8,var, "y";
           0,8,0,11,String, " = ";
-          0,11,0,15,Var, "sum";
+          0,11,0,15,var, "sum";
           0,15,0,16,String, " "
         ]
         end;
         __LOC__ >:: begin fun _ -> 
         "中文 | $a " ==*
         [
           0,0,0,5,String, "中文 | ";
-          0,5,0,7,Var, "a";
+          0,5,0,7,var, "a";
           0,7,0,8,String, " "
         ]
         end
@@ -15678,14 +15692,14 @@ let suites =
           {|Hello \\$world|} ==*
           [
             0,0,0,8,String,"Hello \\\\";
-            0,8,0,14,Var, "world"
+            0,8,0,14,var, "world"
           ]
         end
         ;
         __LOC__ >:: begin fun _ -> 
           {|$x)|} ==*
           [
-            0,0,0,2,Var,"x";
+            0,0,0,2,var,"x";
             0,2,0,3,String,")"
           ]
         end;