* 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

3 files changed, 4 insertions, 4 deletions

diff --git a/ext/ripper/tools/generate-eventids1.rb b/ext/ripper/tools/generate-eventids1.rb
index 3d9a57e034..ec7ec4949a 100755
--- a/ext/ripper/tools/generate-eventids1.rb
+++ b/ext/ripper/tools/generate-eventids1.rb
@@ -11,6 +11,6 @@ puts 'static void'
 puts 'ripper_init_eventids1()'
 puts '{'
 ids.each do |id|
-  puts %Q[    ripper_id_#{id} = rb_intern("on__#{id}");]
+  puts %Q[    ripper_id_#{id} = rb_intern("on_#{id}");]
 end
 puts '}'
diff --git a/ext/ripper/tools/generate-ripper_rb.rb b/ext/ripper/tools/generate-ripper_rb.rb
index b6fb166568..8a96e4cb1e 100755
--- a/ext/ripper/tools/generate-ripper_rb.rb
+++ b/ext/ripper/tools/generate-ripper_rb.rb
@@ -19,7 +19,7 @@ header
         id, arity = line.split
         arity = arity.to_i
         puts
-        puts "  def on__#{id}#{paramdecl(arity)}"
+        puts "  def on_#{id}#{paramdecl(arity)}"
         puts "    #{arity == 0 ? 'nil' : 'a'}"
         puts "  end"
       end
@@ -28,7 +28,7 @@ header
         id, arity = line.split
         arity = arity.to_i
         puts
-        puts "  def on__#{id}(token)"
+        puts "  def on_#{id}(token)"
         puts "    token"
         puts "  end"
       end
diff --git a/ext/ripper/tools/list-scan-event-ids.rb b/ext/ripper/tools/list-scan-event-ids.rb
index 28cd8bbe8a..670ae9ed09 100755
--- a/ext/ripper/tools/list-scan-event-ids.rb
+++ b/ext/ripper/tools/list-scan-event-ids.rb
@@ -17,7 +17,7 @@ def main
 end
 
 def extract_ids(f)
-  (f.read.scan(/ripper_id_(\w+)/).flatten - ['scan']).uniq
+  f.read.scan(/ripper_id_(\w+)/).flatten.uniq
 end
 
 main