Implement DOT3 NODE locations

3 files changed, 28 insertions, 9 deletions

diff --git a/ast.c b/ast.c
index 22246cb058..f24447e8cf 100644
--- a/ast.c
+++ b/ast.c
@@ -811,6 +811,10 @@ node_locations(VALUE ast_value, const NODE *node)
         return rb_ary_new_from_args(2,
                                     location_new(nd_code_loc(node)),
                                     location_new(&RNODE_DOT2(node)->operator_loc));
+      case NODE_DOT3:
+        return rb_ary_new_from_args(2,
+                                    location_new(nd_code_loc(node)),
+                                    location_new(&RNODE_DOT3(node)->operator_loc));
       case NODE_EVSTR:
         return rb_ary_new_from_args(3,
                                     location_new(nd_code_loc(node)),
diff --git a/parse.y b/parse.y
index bd8aad4237..9a16b7231a 100644
--- a/parse.y
+++ b/parse.y
@@ -1151,7 +1151,7 @@ static rb_node_sclass_t *rb_node_sclass_new(struct parser_params *p, NODE *nd_re
 static rb_node_colon2_t *rb_node_colon2_new(struct parser_params *p, NODE *nd_head, ID nd_mid, const YYLTYPE *loc);
 static rb_node_colon3_t *rb_node_colon3_new(struct parser_params *p, ID nd_mid, const YYLTYPE *loc);
 static rb_node_dot2_t *rb_node_dot2_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc);
-static rb_node_dot3_t *rb_node_dot3_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc);
+static rb_node_dot3_t *rb_node_dot3_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc);
 static rb_node_self_t *rb_node_self_new(struct parser_params *p, const YYLTYPE *loc);
 static rb_node_nil_t *rb_node_nil_new(struct parser_params *p, const YYLTYPE *loc);
 static rb_node_true_t *rb_node_true_new(struct parser_params *p, const YYLTYPE *loc);
@@ -1259,7 +1259,7 @@ static rb_node_error_t *rb_node_error_new(struct parser_params *p, const YYLTYPE
 #define NEW_COLON2(c,i,loc) (NODE *)rb_node_colon2_new(p,c,i,loc)
 #define NEW_COLON3(i,loc) (NODE *)rb_node_colon3_new(p,i,loc)
 #define NEW_DOT2(b,e,loc,op_loc) (NODE *)rb_node_dot2_new(p,b,e,loc,op_loc)
-#define NEW_DOT3(b,e,loc) (NODE *)rb_node_dot3_new(p,b,e,loc)
+#define NEW_DOT3(b,e,loc,op_loc) (NODE *)rb_node_dot3_new(p,b,e,loc,op_loc)
 #define NEW_SELF(loc) (NODE *)rb_node_self_new(p,loc)
 #define NEW_NIL(loc) (NODE *)rb_node_nil_new(p,loc)
 #define NEW_TRUE(loc) (NODE *)rb_node_true_new(p,loc)
@@ -3874,7 +3874,7 @@ arg		: asgn(lhs, arg_rhs)
                     {
                         value_expr($1);
                         value_expr($3);
-                        $$ = NEW_DOT3($1, $3, &@$);
+                        $$ = NEW_DOT3($1, $3, &@$, &@2);
                     /*% ripper: dot3!($:1, $:3) %*/
                     }
                 | arg tDOT2
@@ -3886,7 +3886,7 @@ arg		: asgn(lhs, arg_rhs)
                 | arg tDOT3
                     {
                         value_expr($1);
-                        $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$);
+                        $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$, &@2);
                     /*% ripper: dot3!($:1, Qnil) %*/
                     }
                 | tBDOT2 arg
@@ -3898,7 +3898,7 @@ arg		: asgn(lhs, arg_rhs)
                 | tBDOT3 arg
                     {
                         value_expr($2);
-                        $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$);
+                        $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$, &@1);
                     /*% ripper: dot3!(Qnil, $:2) %*/
                     }
                 | arg '+' arg
@@ -5791,7 +5791,7 @@ p_value 	: p_primitive
                     }
                 | p_primitive_value tDOT3 p_primitive_value
                     {
-                        $$ = NEW_DOT3($1, $3, &@$);
+                        $$ = NEW_DOT3($1, $3, &@$, &@2);
                     /*% ripper: dot3!($:1, $:3) %*/
                     }
                 | p_primitive_value tDOT2
@@ -5801,7 +5801,7 @@ p_value 	: p_primitive
                     }
                 | p_primitive_value tDOT3
                     {
-                        $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$);
+                        $$ = NEW_DOT3($1, new_nil_at(p, &@2.end_pos), &@$, &@2);
                     /*% ripper: dot3!($:1, Qnil) %*/
                     }
                 | p_var_ref
@@ -5814,7 +5814,7 @@ p_value 	: p_primitive
                     }
                 | tBDOT3 p_primitive_value
                     {
-                        $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$);
+                        $$ = NEW_DOT3(new_nil_at(p, &@1.beg_pos), $2, &@$, &@1);
                     /*% ripper: dot3!(Qnil, $:2) %*/
                     }
                 ;
@@ -11650,11 +11650,12 @@ rb_node_dot2_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLT
 }
 
 static rb_node_dot3_t *
-rb_node_dot3_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc)
+rb_node_dot3_new(struct parser_params *p, NODE *nd_beg, NODE *nd_end, const YYLTYPE *loc, const YYLTYPE *operator_loc)
 {
     rb_node_dot3_t *n = NODE_NEWNODE(NODE_DOT3, rb_node_dot3_t, loc);
     n->nd_beg = nd_beg;
     n->nd_end = nd_end;
+    n->operator_loc = *operator_loc;
 
     return n;
 }
diff --git a/test/ruby/test_ast.rb b/test/ruby/test_ast.rb
index 0e8f422193..b7bad396b0 100644
--- a/test/ruby/test_ast.rb
+++ b/test/ruby/test_ast.rb
@@ -1390,6 +1390,20 @@ dummy
       assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 7], [1, 4, 1, 6]])
     end
 
+    def test_dot3_locations
+      node = ast_parse("1...2")
+      assert_locations(node.children[-1].locations, [[1, 0, 1, 5], [1, 1, 1, 4]])
+
+      node = ast_parse("foo(1...2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 9], [1, 5, 1, 8]])
+
+      node = ast_parse("foo(1...2, 3)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 9], [1, 5, 1, 8]])
+
+      node = ast_parse("foo(...2)")
+      assert_locations(node.children[-1].children[-1].children[0].locations, [[1, 4, 1, 8], [1, 4, 1, 7]])
+    end
+
     def test_evstr_locations
       node = ast_parse('"#{foo}"')
       assert_locations(node.children[-1].children[1].locations, [[1, 0, 1, 8], [1, 1, 1, 3], [1, 6, 1, 7]])