* parse.y [ripper]: on__scan event removed.

* parse.y [ripper]: event name is changed: on__XXX -> on_XXX.
* ext/ripper/eventids2.c: ditto.
* ext/ripper/ripper.rb.in: ditto.
* ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
* ext/ripper/lib/ripper/tokenizer: ditto.
* ext/ripper/lib/ripper/filter: new file.
* sample/ripper/colorize.rb: new file.
* sample/ripper/strip-comment.rb: new file.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 8 deletions

diff --git a/parse.y b/parse.y
index 8c7f5bd92b..bd64f338b1 100644
--- a/parse.y
+++ b/parse.y
@@ -4203,14 +4203,11 @@ ripper_dispatch_scan_event(parser, t)
     int t;
 {
     VALUE str;
-    ID event;
 
     if (lex_p < parser->tokp) rb_raise(rb_eRuntimeError, "lex_p < tokp");
     if (lex_p == parser->tokp) return;
     str = rb_str_new(parser->tokp, lex_p - parser->tokp);
-    event = ripper_token2eventid(t);
-    ripper_dispatch2(parser, ripper_id_scan, ID2SYM(event), rb_str_dup(str));
-    yylval.val = ripper_dispatch1(parser, event, str);
+    yylval.val = ripper_dispatch1(parser, ripper_token2eventid(t), str);
     ripper_flush(parser);
 }
 
@@ -4221,13 +4218,10 @@ ripper_dispatch_delayed_token(parser, t)
 {
     int saved_line = ruby_sourceline;
     char *saved_tokp = parser->tokp;
-    ID event = ripper_token2eventid(t);
-    VALUE str = parser->delayed;
 
     ruby_sourceline = parser->delayed_line;
     parser->tokp = lex_pbeg + parser->delayed_col;
-    ripper_dispatch2(parser, ripper_id_scan, ID2SYM(event), rb_str_dup(str));
-    yylval.val = ripper_dispatch1(parser, event, str);
+    yylval.val = ripper_dispatch1(parser, ripper_token2eventid(t), parser->delayed);
     parser->delayed = Qnil;
     ruby_sourceline = saved_line;
     parser->tokp = saved_tokp;