ruby_parser 2.0.5 → 2.0.6

data.tar.gz.sig

@@ -1,2 +1,2 @@
-�e�z+��Ln@^�e����A��%5A�sUm0�w��aT��me��.?������u��[y��^��p�R���3%Ux�����C�*�gEj�fzM�U�gy�5��Vt1�T��T�	m�����
-<�ɘJ��*� �7���]S�r�p�wl����1�,r�<�Ia
+Rn�0z@iD1KG�$A�X6��PL��sX\�}}�|e��le�Q{\F[��n�΅Q�t|��Zݿ7X��Ӕ\U�EV[�dtg�������>�<DG�
+�c-���_h:xä�(������c!ɪ���c�o�G��q0�Τ�nx�����N7�Fإ���5�M�1�ȯl���T�s�J�����WCHR
��y_����h��9T&

data/History.txt

@@ -1,3 +1,13 @@
+=== 2.0.6 / 2011-02-18
+
+* 1 minor enhancement:
+
+  * Switched to hoe's racc plugin to clean up rakefile and builds
+
+* 1 bug fix:
+
+  * Fixed empty =begin/end.
+
 === 2.0.5 / 2010-09-01
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -7,6 +7,7 @@ bin/ruby_parse
 lib/gauntlet_rubyparser.rb
 lib/ruby_lexer.rb
 lib/ruby_parser.y
+lib/ruby_parser.rb
 lib/ruby_parser_extras.rb
 test/test_ruby_lexer.rb
 test/test_ruby_parser.rb

data/Rakefile

@@ -4,41 +4,21 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.plugin :seattlerb
+Hoe.plugin :racc
 
 Hoe.add_include_dirs("../../ParseTree/dev/test",
                      "../../RubyInline/dev/lib",
                      "../../sexp_processor/dev/lib")
 
-hoe = Hoe.spec 'ruby_parser' do
+Hoe.spec 'ruby_parser' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
   self.rubyforge_name = 'parsetree'
 
   extra_dev_deps << ['ParseTree',      '~> 3.0']
   extra_deps     << ['sexp_processor', '~> 3.0']
-end
-
-hoe.spec.files += ['lib/ruby_parser.rb'] # jim.... cmon man
-
-[:default, :multi, :test].each do |t|
-  task t => :parser
-end
-
-path = "pkg/ruby_parser-#{hoe.version}"
-task path => :parser do
-  Dir.chdir path do
-    sh "rake parser"
-  end
-end
-
-desc "build the parser"
-task :parser => ["lib/ruby_parser.rb"]
 
-rule '.rb' => '.y' do |t|
-  # -v = verbose
-  # -t = debugging parser ~4% reduction in speed -- keep for now
-  # -l = no-line-convert
-  sh "racc -v -t -l -o #{t.name} #{t.source}"
+  self.perforce_ignore << "lib/ruby_parser.rb" if plugin? :perforce
 end
 
 task :clean do
@@ -46,7 +26,6 @@ task :clean do
         Dir["**/*.diff"] +
         Dir["coverage.info"] +
         Dir["coverage"] +
-        Dir["lib/ruby_parser.rb"] +
         Dir["lib/*.output"])
 end
 

data/lib/ruby_lexer.rb

@@ -231,7 +231,7 @@ class RubyLexer
   end
 
   def lex_state= o
-    raise "wtf?" unless Symbol === o
+    raise "wtf\?" unless Symbol === o
     @lex_state = o
   end
 
@@ -655,7 +655,7 @@ class RubyLexer
           self.lineno = nil
           c = src.matched
           if c == '#' then
-            src.unread c # ok
+            src.pos -= 1
 
             while src.scan(/\s*#.*(\n+|\z)/) do
               @comments << src.matched.gsub(/^ +#/, '#').gsub(/^ +$/, '')
@@ -723,7 +723,7 @@ class RubyLexer
             self.fix_arg_lex_state
             tok = self.yacc_value = src.matched
             return TOKENS[tok]
-          elsif src.was_begin_of_line and src.scan(/\=begin(?=\s)/) then
+          elsif src.scan(/\=begin(?=\s)/) then
             # @comments << '=' << src.matched
             @comments << src.matched
 

data/lib/ruby_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.7
+# This file is automatically generated by Racc 1.4.6
 # from Racc grammer file "".
 #
 
@@ -773,7 +773,7 @@ clist = [
 '299,300,276,279,282,285,288,290,292,294,296,,301,278,,281,284,287,,',
 ',,,,,,,,,,,295,,298,,277,280,283,286,289,291,293,,297,,,,,,,,,,,,,,',
 ',281' ]
-        racc_action_table = arr = ::Array.new(23872, nil)
+        racc_action_table = arr = Array.new(23872, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -1617,7 +1617,7 @@ clist = [
 '747,747,747,747,747,747,747,,747,640,640,640,640,640,640,640,640,640',
 '640,640,,640,640,,747,640,640,,,,,,,,,,,,,,640,,640,,640,640,640,640',
 '640,640,640,,640,,,,,,,,,,,,,,,,640' ]
-        racc_action_check = arr = ::Array.new(23872, nil)
+        racc_action_check = arr = Array.new(23872, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -1881,7 +1881,7 @@ clist = [
 ',,,,,,,,,,,,,,,,,,820,,,,823,,,,,,,,,,,38,,849,,832,,,835,,,,,38,,,',
 ',38,,,,,,,,,,,38,,,38,,,,,,,,,,,,38,661,38,,,,,,,584,,,589,,,,,,,,,',
 ',,,,,,,,,,,,,,880,,,,,882,,,885,,,,,,,,,,,,,,,,,,589,,,,,,,,,,,,,,900' ]
-        racc_goto_table = arr = ::Array.new(2455, nil)
+        racc_goto_table = arr = Array.new(2455, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -1952,7 +1952,7 @@ clist = [
 '45,,,,,45,,,,,,,,,,,,,,,,,,,24,,,,24,,,,,,,,,,,45,,45,,24,,,24,,,,,45',
 ',,,,45,,,,,,,,,,,45,,,45,,,,,,,,,,,,45,24,45,,,,,,,24,,,24,,,,,,,,,',
 ',,,,,,,,,,,,,,24,,,,,24,,,24,,,,,,,,,,,,,,,,,,24,,,,,,,,,,,,,,24' ]
-        racc_goto_check = arr = ::Array.new(2455, nil)
+        racc_goto_check = arr = Array.new(2455, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -2941,7 +2941,7 @@ Racc_token_to_s_table = [
   "@39",
   "assoc" ]
 
-Racc_debug_parser = true
+Racc_debug_parser = false
 
 ##### State transition tables end #####
 

data/lib/ruby_parser_extras.rb

@@ -115,7 +115,7 @@ class RPStringScanner < StringScanner
 end
 
 class RubyParser < Racc::Parser
-  VERSION = '2.0.5' unless constants.include? "VERSION" # SIGH
+  VERSION = '2.0.6' unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments

data/test/test_ruby_parser.rb

@@ -175,6 +175,15 @@ class TestRubyParser < RubyParserTestCase
     assert_equal pt, @processor.parse(rb)
   end
 
+  def test_bug_comment_eq_begin
+    rb = "\n\n#\n=begin\nblah\n=end\n\n"
+    pt = nil
+    exp = rb[2..-1]
+
+    assert_equal pt, @processor.parse(rb)
+    assert_equal exp, @processor.lexer.comments
+  end
+
   def test_dstr_evstr
     rb = "\"#\{'a'}#\{b}\""
     pt = s(:dstr, "a", s(:evstr, s(:call, nil, :b, s(:arglist))))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2011-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,19 +55,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: racc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 9
         segments: 
-        - 2
-        - 0
+        - 1
         - 4
-        version: 2.0.4
+        - 7
+        version: 1.4.7
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -78,12 +78,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 11
         segments: 
-        - 1
-        - 7
-        - 1
-        version: 1.7.1
+        - 2
+        - 0
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -109,12 +109,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 41
         segments: 
         - 2
-        - 6
-        - 2
-        version: 2.6.2
+        - 9
+        - 1
+        version: 2.9.1
   type: :development
   version_requirements: *id005
 description: |-
@@ -163,11 +163,12 @@ files:
 - lib/gauntlet_rubyparser.rb
 - lib/ruby_lexer.rb
 - lib/ruby_parser.y
+- lib/ruby_parser.rb
 - lib/ruby_parser_extras.rb
 - test/test_ruby_lexer.rb
 - test/test_ruby_parser.rb
 - test/test_ruby_parser_extras.rb
-- lib/ruby_parser.rb
+- .gemtest
 has_rdoc: true
 homepage: http://parsetree.rubyforge.org/
 licenses: []
@@ -199,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: parsetree
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which does by default use a C extension)