ruby_parser 2.0.2 → 2.0.3

data.tar.gz.sig

@@ -0,0 +1,2 @@
+�FW�s"a�zM���h���/'��y������"���u��[6֮��
+��oE�y±#Q�+Tm���f��}́�,m��|��l���r�1��Wo�S�R%F�b�yD��x#8xÄC��x��w��ɛ�L�ڀ��9��g��J����q�Dm�������>D��_���

data/.autotest

@@ -1,14 +1,15 @@
 # -*- ruby -*-
 
 require 'autotest/restart'
+require 'autotest/rcov'
 
 Autotest.add_hook :initialize do |at|
   at.extra_files << "../../ParseTree/dev/test/pt_testcase.rb"
   at.libs << ":../../ParseTree/dev/lib:../../ParseTree/dev/test:../../sexp_processor/dev/lib"
   at.add_exception 'unit'
   at.add_exception 'coverage'
-  at.add_exception '.diff'
   at.add_exception 'coverage.info'
+  at.add_exception '.diff'
 
   at.unit_diff = "unit_diff -u -b"
 
@@ -38,7 +39,3 @@ class Autotest
     File.expand_path "~/.multiruby/install/1.9.0-0/bin/ruby"
   end
 end if ENV['ONENINE']
-
-# require 'autotest/rcov'
-# Autotest::RCov.command = 'rcov_info'
-# Autotest::RCov.pattern = 'test/test_ruby_lexer.rb'

data/History.txt

@@ -1,3 +1,19 @@
+=== 2.0.3 / 2009-06-23
+
+* 4 minor enhancements:
+
+  * Removed dead code handling d/regex match node cruft.
+  * Switched to minitest
+  * Updated .autotest and rakefile wrt rcov for new hoe capabilities
+  * Updated hoe for new capabilities
+
+* 4 bug fixes:
+
+  * Environment#all now deals with strange edge cases in RAD.
+  * Fixed packaging/compilation issue.
+  * Minor 1.9 fixes
+  * hoe -> flay -> rubyparser rakefile circularity fixed
+
 === 2.0.2 / 2009-01-20
 
 * 2 minor enhancements:

data/Rakefile

@@ -3,19 +3,19 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.add_include_dirs("../../ParseTree/dev/lib",
-                     "../../ParseTree/dev/test",
+Hoe.plugin :seattlerb
+
+Hoe.add_include_dirs("../../ParseTree/dev/test",
                      "../../RubyInline/dev/lib",
                      "../../sexp_processor/dev/lib")
 
-require './lib/ruby_parser_extras.rb'
+hoe = Hoe.spec 'ruby_parser' do
+  developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-hoe = Hoe.new('ruby_parser', RubyParser::VERSION) do |parser|
-  parser.rubyforge_name = 'parsetree'
-  parser.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+  self.rubyforge_name = 'parsetree'
 
-  parser.extra_dev_deps << 'ParseTree'
-  parser.extra_deps << ['sexp_processor', '>= 3.0.1']
+  extra_dev_deps << 'ParseTree'
+  extra_deps     << ['sexp_processor', '>= 3.0.1']
 end
 
 hoe.spec.files += ['lib/ruby_parser.rb'] # jim.... cmon man
@@ -24,7 +24,7 @@ hoe.spec.files += ['lib/ruby_parser.rb'] # jim.... cmon man
   task t => :parser
 end
 
-path = "pkg/ruby_parser-#{RubyParser::VERSION}"
+path = "pkg/ruby_parser-#{hoe.version}"
 task path => :parser do
   Dir.chdir path do
     sh "rake parser"
@@ -54,20 +54,6 @@ def next_num(glob)
   num = Dir[glob].max[/\d+/].to_i + 1
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    pattern = ENV['PATTERN'] || 'test/test_ruby_*.rb'
-
-    t.test_files = FileList[pattern]
-    t.verbose = true
-    t.rcov_opts << "--threshold 80"
-    t.rcov_opts << "--no-color"
-  end
-rescue LoadError
-  # skip
-end
-
 desc "Compares PT to RP and deletes all files that match"
 task :compare do
   files = Dir["unit/**/*.rb"]
@@ -94,19 +80,6 @@ task :sort do
   sh 'grepsort "^ +def (test|util)" test/test_ruby_lexer.rb'
 end
 
-task :rcov_info => :parser do
-  pattern = ENV['PATTERN'] || "test/test_*.rb"
-  ruby "-Ilib -S rcov --text-report --save coverage.info #{pattern}"
-end
-
-task :rcov_overlay do
-  rcov, eol = Marshal.load(File.read("coverage.info")).last[ENV["FILE"]], 1
-  puts rcov[:lines].zip(rcov[:coverage]).map { |line, coverage|
-    bol, eol = eol, eol + line.length
-    [bol, eol, "#ffcccc"] unless coverage
-  }.compact.inspect
-end
-
 task :loc do
   loc1  = `wc -l ../1.0.0/lib/ruby_lexer.rb`[/\d+/]
   flog1 = `flog -s ../1.0.0/lib/ruby_lexer.rb`[/\d+\.\d+/]

data/lib/ruby_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.7
 # from Racc grammer file "".
 #
 
@@ -772,7 +772,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|
@@ -1616,7 +1616,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|
@@ -1880,7 +1880,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|
@@ -1951,7 +1951,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|

data/lib/ruby_parser_extras.rb

@@ -5,11 +5,13 @@ require 'strscan'
 
 # WHY do I have to do this?!?
 class Regexp
-  ONCE     = 0 # 16 # ?
-  ENC_NONE = /x/n.options
-  ENC_EUC  = /x/e.options
-  ENC_SJIS = /x/s.options
-  ENC_UTF8 = /x/u.options
+  unless defined? ONCE then
+    ONCE     = 0 # 16 # ?
+    ENC_NONE = /x/n.options
+    ENC_EUC  = /x/e.options
+    ENC_SJIS = /x/s.options
+    ENC_UTF8 = /x/u.options
+  end
 end
 
 # I hate ruby 1.9 string changes
@@ -113,7 +115,7 @@ class RPStringScanner < StringScanner
 end
 
 class RubyParser < Racc::Parser
-  VERSION = '2.0.2'
+  VERSION = '2.0.3' unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -244,10 +246,6 @@ class RubyParser < Racc::Parser
     node = value_expr node
 
     case node.first
-    when :dregex then
-      return s(:match2, node, s(:gvar, "$_".to_sym))
-    when :regex then
-      return s(:match, node)
     when :lit then
       if Regexp === node.last then
         return s(:match, node)
@@ -885,7 +883,8 @@ class Keyword
 
   # :startdoc:
 
-  WORDLIST = Hash[*wordlist.map { |o| [o.name, o] }.flatten]
+  WORDLIST = Hash[*wordlist.map { |o| [o.name, o] }.flatten] unless
+    defined? WORDLIST
 
   def self.keyword str
     WORDLIST[str]
@@ -905,7 +904,7 @@ class Environment
   end
 
   def all
-    idx = @dyn.index false
+    idx = @dyn.index(false) || 0
     @env[0..idx].reverse.inject { |env, scope| env.merge scope }
   end
 
@@ -926,7 +925,7 @@ class Environment
     @dyn.unshift dyn
     @env.unshift({})
     @use.unshift({})
-   end
+  end
 
   def initialize dyn = false
     @dyn = []

data/test/test_ruby_lexer.rb

@@ -1,12 +1,10 @@
 #!/usr/local/bin/ruby
 
-require "test/unit"
+require "minitest/autorun"
 require "ruby_lexer"
 
-class TestRubyLexer < Test::Unit::TestCase
-  def deny cond, msg = nil
-    assert ! cond, msg
-  end
+class TestRubyLexer < MiniTest::Unit::TestCase
+  alias :deny :refute
 
   def setup
     p = RubyParser.new

data/test/test_ruby_parser.rb

@@ -1,9 +1,8 @@
 #!/usr/local/bin/ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'ruby_parser'
 
-$: << File.expand_path('~/Work/p4/zss/src/ParseTree/dev/lib')
 $: << File.expand_path('~/Work/p4/zss/src/ParseTree/dev/test')
 
 require 'pt_testcase'
@@ -30,8 +29,6 @@ class RubyParserTestCase < ParseTreeTestCase
 end
 
 class TestRubyParser < RubyParserTestCase
-  alias :refute_nil :assert_not_nil unless defined? Mini
-
   def setup
     super
 

data/test/test_ruby_parser_extras.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'ruby_parser_extras'
 
-class TestStackState < Test::Unit::TestCase
+class TestStackState < MiniTest::Unit::TestCase
   def test_stack_state
     s = StackState.new :test
     s.push true
@@ -49,7 +49,7 @@ class TestStackState < Test::Unit::TestCase
   end
 end
 
-class TestEnvironment < Test::Unit::TestCase
+class TestEnvironment < MiniTest::Unit::TestCase
   def deny t
     assert ! t
   end

metadata

@@ -1,15 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,9 +61,34 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 2.3.0
     version: 
-description: "ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which does by default use a C extension). RP's output is the same as ParseTree's output: s-expressions using ruby's arrays and base types.  As an example:  def conditional1(arg1) if arg1 == 0 then return 1 end return 0 end  becomes:  s(:defn, :conditional1, s(:args, :arg1), s(:scope, s(:block, s(:if, s(:call, s(:lvar, :arg1), :==, s(:arglist, s(:lit, 0))), s(:return, s(:lit, 1)), nil), s(:return, s(:lit, 0)))))"
+description: |-
+  ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
+  racc--which does by default use a C extension). RP's output is
+  the same as ParseTree's output: s-expressions using ruby's arrays and
+  base types.
+  
+  As an example:
+  
+    def conditional1(arg1)
+      if arg1 == 0 then
+        return 1
+      end
+      return 0
+    end
+  
+  becomes:
+  
+    s(:defn, :conditional1,
+     s(:args, :arg1),
+     s(:scope,
+      s(:block,
+       s(:if,
+        s(:call, s(:lvar, :arg1), :==, s(:arglist, s(:lit, 0))),
+        s(:return, s(:lit, 1)),
+        nil),
+       s(:return, s(:lit, 0)))))
 email: 
 - ryand-ruby@zenspider.com
 executables: 
@@ -70,6 +116,8 @@ files:
 - lib/ruby_parser.rb
 has_rdoc: true
 homepage: http://parsetree.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -91,9 +139,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: parsetree
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+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)
 test_files: 
 - test/test_ruby_lexer.rb