ruby_parser 2.3.0 → 2.3.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.3.1 / 2011-09-21
+
+* 2 bug fixes:
+
+  * Fixed line numbers at end of special var+whitespace (larsch)
+  * Holy crap I was smokin' something good... Fixed 1.9.3 warning
+
 === 2.3.0 / 2011-09-06
 
 * 2 minor enhancements:

data/README.txt

@@ -1,7 +1,7 @@
 = ruby_parser
 
 home :: https://github.com/seattlerb/ruby_parser
-rdoc :: http://parsetree.rubyforge.org/ruby_parser
+rdoc :: http://docs.seattlerb.org/ruby_parser
 
 == DESCRIPTION:
 

data/lib/ruby_lexer.rb

@@ -727,7 +727,7 @@ class RubyLexer
             # @comments << '=' << src.matched
             @comments << src.matched
 
-            unless src.scan(/.*?\n=end( |\t|\f)*[^(\n|\z)]*(\n|\z)/m) then
+            unless src.scan(/.*?\n=end( |\t|\f)*[^\n]*(\n|\z)/m) then
               @comments.clear
               rb_compile_error("embedded document meets end of file")
             end

data/lib/ruby_parser.rb

@@ -5169,37 +5169,38 @@ end
 # reduce 429 omitted
 
 def _reduce_430(val, _values, result)
- result = :nil      
+ result = s(:nil)   
     result
 end
 
 def _reduce_431(val, _values, result)
- result = :self     
+ result = s(:self)  
     result
 end
 
 def _reduce_432(val, _values, result)
- result = :true     
+ result = s(:true)  
     result
 end
 
 def _reduce_433(val, _values, result)
- result = :false    
+ result = s(:false) 
     result
 end
 
 def _reduce_434(val, _values, result)
- result = :__FILE__ 
+ result = s(:str, self.file) 
     result
 end
 
 def _reduce_435(val, _values, result)
- result = :__LINE__ 
+ result = s(:lit, lexer.src.current_line) 
     result
 end
 
 def _reduce_436(val, _values, result)
-                      result = self.gettable val[0]
+                      var = val[0]
+                      result = Sexp === var ? var : self.gettable(var)
                     
     result
 end

data/lib/ruby_parser.y

@@ -1560,16 +1560,17 @@ xstring_contents: none
                 | tGVAR
                 | tCONSTANT
                 | tCVAR
-                | kNIL      { result = :nil      }
-                | kSELF     { result = :self     }
-                | kTRUE     { result = :true     }
-                | kFALSE    { result = :false    }
-                | k__FILE__ { result = :__FILE__ }
-                | k__LINE__ { result = :__LINE__ }
+                | kNIL      { result = s(:nil)   }
+                | kSELF     { result = s(:self)  }
+                | kTRUE     { result = s(:true)  }
+                | kFALSE    { result = s(:false) }
+                | k__FILE__ { result = s(:str, self.file) }
+                | k__LINE__ { result = s(:lit, lexer.src.current_line) }
 
          var_ref: variable
                     {
-                      result = self.gettable val[0]
+                      var = val[0]
+                      result = Sexp === var ? var : self.gettable(var)
                     }
 
          var_lhs: variable

data/lib/ruby_parser_extras.rb

@@ -123,7 +123,7 @@ class RPStringScanner < StringScanner
 end
 
 class RubyParser < Racc::Parser
-  VERSION = '2.3.0' unless constants.include? "VERSION" # SIGH
+  VERSION = '2.3.1' unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments
@@ -292,16 +292,7 @@ class RubyParser < Racc::Parser
   end
 
   def gettable(id)
-    raise "no: #{id.inspect}" if Sexp === id
-    id = id.to_sym if Sexp   === id # HACK
-    id = id.to_sym if String === id # HACK
-
-    return s(:self)                  if id == :self
-    return s(:nil)                   if id == :nil
-    return s(:true)                  if id == :true
-    return s(:false)                 if id == :false
-    return s(:str, self.file)        if id == :"__FILE__"
-    return s(:lit, lexer.src.current_line) if id == :"__LINE__"
+    id = id.to_sym if String === id
 
     result = case id.to_s
              when /^@@/ then
@@ -323,9 +314,9 @@ class RubyParser < Racc::Parser
                end
              end
 
-    return result if result
+    raise "identifier #{id.inspect} is not valid" unless result
 
-    raise "identifier #{id.inspect} is not valid"
+    result
   end
 
   ##

data/test/test_ruby_parser.rb

@@ -593,6 +593,13 @@ class TestRubyParser < RubyParserTestCase
     assert_equal 4, result.call.line
   end
 
+  def test_parse_line_newlines
+    rb = "true\n\n"
+    pt = s(:true)
+
+    assert_parse_line rb, pt, 1
+  end
+
   def test_parse_line_return
     rb = <<-RUBY
       def blah

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-09-06 00:00:00 Z
+date: 2011-09-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor