ruby_parser 2.0.0 → 2.0.1

data/History.txt

@@ -1,4 +1,11 @@
-== 2.0.0 / 2008-10-22
+=== 2.0.1 / 2008-11-04
+
+* 2 minor enhancements:
+
+  * Updated for changes to splat node in many contexts.
+  * Made PT a developer dep
+
+=== 2.0.0 / 2008-10-22
 
 * 1 major enhancement
 
@@ -106,7 +113,7 @@
   * Fixed: omg this is stupid. '()' was returning bare nil
   * Fixed: remove_begin now goes to the end, not sure why it didn't before.
 
-== 1.0.0 / 2007-12-20
+=== 1.0.0 / 2007-12-20
 
 * 1 major enhancement
   * Birthday!

data/Rakefile

@@ -13,8 +13,8 @@ require './lib/ruby_parser_extras.rb'
 hoe = Hoe.new('ruby_parser', RubyParser::VERSION) do |parser|
   parser.rubyforge_name = 'parsetree'
   parser.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
-  parser.extra_deps << 'ParseTree'
 
+  parser.extra_dev_deps << 'ParseTree'
   parser.extra_deps << ['sexp_processor', '>= 3.0.0']
 end
 

data/bin/ruby_parse

@@ -85,5 +85,4 @@ puts format % [total_time,
                total_kbytes / total_time,
                total_kbytes,
                total_loc,
-               "TOTAL"]
-
+               "TOTAL"] unless total_time == 0

data/lib/ruby_parser.rb

@@ -4007,8 +4007,7 @@ def _reduce_222(val, _values, result)
 end
 
 def _reduce_223(val, _values, result)
-                      result = s(:splat, val[1])
-                      result.paren = true
+                      result = s(:array, s(:splat, val[1]))
                     
     result
 end

data/lib/ruby_parser.y

@@ -716,8 +716,7 @@ rule
                     }
                 | tSTAR arg opt_nl
                     {
-                      result = s(:splat, val[1])
-                      result.paren = true
+                      result = s(:array, s(:splat, val[1]))
                     }
 
       paren_args: tLPAREN2 none tRPAREN

data/lib/ruby_parser_extras.rb

@@ -113,7 +113,7 @@ class RPStringScanner < StringScanner
 end
 
 class RubyParser < Racc::Parser
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -696,11 +696,15 @@ class RubyParser < Racc::Parser
   end
 
   def new_yield args = nil
+    # TODO: raise args.inspect unless [:arglist].include? args.first # HACK
     raise SyntaxError, "Block argument should not be given." if
       args && args.node_type == :block_pass
 
     args ||= s(:arglist)
-    args = s(:arglist, args) unless [:arglist, :array].include? args.first
+
+    # TODO: I can prolly clean this up
+    args[0] = :arglist       if args.first == :array
+    args = s(:arglist, args) unless args.first == :arglist
 
     return s(:yield, *args[1..-1])
   end
@@ -773,6 +777,7 @@ class RubyParser < Racc::Parser
       # HACK matz wraps ONE of the FOUR splats in a newline to
       # distinguish. I use paren for now. ugh
       node = s(:svalue, node) if node[0] == :splat and not node.paren
+      node[0] = :svalue if node[0] == :arglist && node[1][0] == :splat
     end
 
     node

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -9,28 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-22 00:00:00 -05:00
+date: 2008-11-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ParseTree
+  name: sexp_processor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 3.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: sexp_processor
-  type: :runtime
+  name: ParseTree
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: parsetree
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which does by default use a C extension)