[Bug #19788] Use the result of tCOLON2 event

nobu · nobu · commit 382678d4112f · 2023-08-01T19:00:31.000+09:00
diff --git a/parse.y b/parse.y
@@ -2045,7 +2045,7 @@ command_asgn	: lhs '=' lex_ctxt command_rhs
                     /*%%%*/
                         $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$);
                     /*% %*/
-                    /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/
+                    /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
                     }
                 | defn_head f_opt_paren_args '=' endless_command
                     {
@@ -2316,14 +2316,14 @@ command		: fcall command_args       %prec tLOWEST
                     /*%%%*/
                         $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, Qnull, &@3, &@$);
                     /*% %*/
-                    /*% ripper: command_call!($1, ID2VAL(idCOLON2), $3, $4) %*/
+                    /*% ripper: command_call!($1, $2, $3, $4) %*/
                     }
                 | primary_value tCOLON2 operation2 command_args cmd_brace_block
                     {
                     /*%%%*/
                         $$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, $5, &@3, &@$);
                     /*% %*/
-                    /*% ripper: method_add_block!(command_call!($1, ID2VAL(idCOLON2), $3, $4), $5) %*/
+                    /*% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %*/
                    }
                 | keyword_super command_args
                     {
@@ -2599,7 +2599,7 @@ lhs		: user_variable
                     /*%%%*/
                         $$ = attrset(p, $1, idCOLON2, $3, &@$);
                     /*% %*/
-                    /*% ripper: field!($1, ID2VAL(idCOLON2), $3) %*/
+                    /*% ripper: field!($1, $2, $3) %*/
                     }
                 | primary_value call_op tCONSTANT
                     {
@@ -2790,7 +2790,7 @@ arg		: lhs '=' lex_ctxt arg_rhs
                     /*%%%*/
                         $$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$);
                     /*% %*/
-                    /*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %*/
+                    /*% ripper: opassign!(field!($1, $2, $3), $4, $6) %*/
                     }
                 | primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt arg_rhs
                     {
@@ -4351,14 +4351,14 @@ method_call	: fcall paren_args
                         $$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, &@3, &@$);
                         nd_set_line($$, @3.end_pos.lineno);
                     /*% %*/
-                    /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), $3), $4) %*/
+                    /*% ripper: method_add_arg!(call!($1, $2, $3), $4) %*/
                     }
                 | primary_value tCOLON2 operation3
                     {
                     /*%%%*/
                         $$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, Qnull, &@3, &@$);
                     /*% %*/
-                    /*% ripper: call!($1, ID2VAL(idCOLON2), $3) %*/
+                    /*% ripper: call!($1, $2, $3) %*/
                     }
                 | primary_value call_op paren_args
                     {
@@ -4374,7 +4374,7 @@ method_call	: fcall paren_args
                         $$ = new_qcall(p, ID2VAL(idCOLON2), $1, ID2VAL(idCall), $3, &@2, &@$);
                         nd_set_line($$, @2.end_pos.lineno);
                     /*% %*/
-                    /*% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), ID2VAL(idCall)), $3) %*/
+                    /*% ripper: method_add_arg!(call!($1, $2, ID2VAL(idCall)), $3) %*/
                     }
                 | keyword_super paren_args
                     {
diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb
@@ -499,6 +499,23 @@ def test_call
     assert_equal "[call(ref(self),&.,foo,[])]", tree
   end
 
+  def test_call_colon2
+    hook = Module.new do
+      def on_op(op)
+        super("(op: #{op.inspect})")
+      end
+      def on_call(recv, name, *args)
+        super(recv, "(method: #{name})", *args)
+      end
+      def on_ident(name)
+        super("(ident: #{name.inspect})")
+      end
+    end
+
+    parser = DummyParser.new("a::b").extend(hook)
+    assert_equal '[call(vcall((ident: "a")),(method: (op: "::")),(ident: "b"))]', parser.parse.to_s
+  end
+
   def test_excessed_comma
     thru_excessed_comma = false
     parse("proc{|x,|}", :on_excessed_comma) {thru_excessed_comma = true}
diff --git a/test/ripper/test_scanner_events.rb b/test/ripper/test_scanner_events.rb
@@ -179,6 +179,11 @@ def test_backtick
                  scan('backtick', %q[p `make all`])
   end
 
+  def test_colon2_call
+    assert_equal ["::"],
+                 scan('op', %q[ a::b ])
+  end
+
   def test_comma
     assert_equal [','] * 6,
                  scan('comma', %q[ m(0,1,2,3,4,5,6) ])

Original file line number	Diff line number	Diff line change
`@@ -2045,7 +2045,7 @@ command_asgn : lhs '=' lex_ctxt command_rhs`
`2045`	`2045`	`/%%%/`
`2046`	`2046`	`$$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$);`
`2047`	`2047`	`/% %/`
`2048`		`- /% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %/`
	`2048`	`+ /% ripper: opassign!(field!($1, $2, $3), $4, $6) %/`
`2049`	`2049`	`}`
`2050`	`2050`	`\| defn_head f_opt_paren_args '=' endless_command`
`2051`	`2051`	`{`
`@@ -2316,14 +2316,14 @@ command : fcall command_args %prec tLOWEST`
`2316`	`2316`	`/%%%/`
`2317`	`2317`	`$$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, Qnull, &@3, &@$);`
`2318`	`2318`	`/% %/`
`2319`		`- /% ripper: command_call!($1, ID2VAL(idCOLON2), $3, $4) %/`
	`2319`	`+ /% ripper: command_call!($1, $2, $3, $4) %/`
`2320`	`2320`	`}`
`2321`	`2321`	`\| primary_value tCOLON2 operation2 command_args cmd_brace_block`
`2322`	`2322`	`{`
`2323`	`2323`	`/%%%/`
`2324`	`2324`	`$$ = new_command_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, $5, &@3, &@$);`
`2325`	`2325`	`/% %/`
`2326`		`- /% ripper: method_add_block!(command_call!($1, ID2VAL(idCOLON2), $3, $4), $5) %/`
	`2326`	`+ /% ripper: method_add_block!(command_call!($1, $2, $3, $4), $5) %/`
`2327`	`2327`	`}`
`2328`	`2328`	`\| keyword_super command_args`
`2329`	`2329`	`{`
`@@ -2599,7 +2599,7 @@ lhs : user_variable`
`2599`	`2599`	`/%%%/`
`2600`	`2600`	`$$ = attrset(p, $1, idCOLON2, $3, &@$);`
`2601`	`2601`	`/% %/`
`2602`		`- /% ripper: field!($1, ID2VAL(idCOLON2), $3) %/`
	`2602`	`+ /% ripper: field!($1, $2, $3) %/`
`2603`	`2603`	`}`
`2604`	`2604`	`\| primary_value call_op tCONSTANT`
`2605`	`2605`	`{`
`@@ -2790,7 +2790,7 @@ arg : lhs '=' lex_ctxt arg_rhs`
`2790`	`2790`	`/%%%/`
`2791`	`2791`	`$$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $6, &@$);`
`2792`	`2792`	`/% %/`
`2793`		`- /% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $6) %/`
	`2793`	`+ /% ripper: opassign!(field!($1, $2, $3), $4, $6) %/`
`2794`	`2794`	`}`
`2795`	`2795`	`\| primary_value tCOLON2 tCONSTANT tOP_ASGN lex_ctxt arg_rhs`
`2796`	`2796`	`{`
`@@ -4351,14 +4351,14 @@ method_call : fcall paren_args`
`4351`	`4351`	`$$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, $4, &@3, &@$);`
`4352`	`4352`	`nd_set_line($$, @3.end_pos.lineno);`
`4353`	`4353`	`/% %/`
`4354`		`- /% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), $3), $4) %/`
	`4354`	`+ /% ripper: method_add_arg!(call!($1, $2, $3), $4) %/`
`4355`	`4355`	`}`
`4356`	`4356`	`\| primary_value tCOLON2 operation3`
`4357`	`4357`	`{`
`4358`	`4358`	`/%%%/`
`4359`	`4359`	`$$ = new_qcall(p, ID2VAL(idCOLON2), $1, $3, Qnull, &@3, &@$);`
`4360`	`4360`	`/% %/`
`4361`		`- /% ripper: call!($1, ID2VAL(idCOLON2), $3) %/`
	`4361`	`+ /% ripper: call!($1, $2, $3) %/`
`4362`	`4362`	`}`
`4363`	`4363`	`\| primary_value call_op paren_args`
`4364`	`4364`	`{`
`@@ -4374,7 +4374,7 @@ method_call : fcall paren_args`
`4374`	`4374`	`$$ = new_qcall(p, ID2VAL(idCOLON2), $1, ID2VAL(idCall), $3, &@2, &@$);`
`4375`	`4375`	`nd_set_line($$, @2.end_pos.lineno);`
`4376`	`4376`	`/% %/`
`4377`		`- /% ripper: method_add_arg!(call!($1, ID2VAL(idCOLON2), ID2VAL(idCall)), $3) %/`
	`4377`	`+ /% ripper: method_add_arg!(call!($1, $2, ID2VAL(idCall)), $3) %/`
`4378`	`4378`	`}`
`4379`	`4379`	`\| keyword_super paren_args`
`4380`	`4380`	`{`