ruby_parser 3.0.2 → 3.0.3

data/History.txt

@@ -1,3 +1,13 @@
+=== 3.0.3 / 2012-11-23
+
+* 1 minor enhancement:
+
+  * Improved error output on invalid char in expression.
+
+* 1 bug fix:
+
+  * Fixed lexing of no-name ivars. (whitequark)
+
 === 3.0.2 / 2012-11-21
 
 52 down makes 99.9767% or 3.7σ. 130 files failed to parse out of 558k.

data/lib/ruby_lexer.rb

@@ -774,7 +774,7 @@ class RubyLexer
           self.lex_strterm = [:strterm, STR_DQUOTE, '"', "\0"] # TODO: question this
           self.yacc_value = "\""
           return :tSTRING_BEG
-        elsif src.scan(/\@\@?\w*/) then
+        elsif src.scan(/\@\@?\w+/) then
           self.token = src.matched
 
           rb_compile_error "`#{token}` is not allowed as a variable name" if
@@ -1244,9 +1244,8 @@ class RubyLexer
       if src.scan(/\004|\032|\000/) || src.eos? then # ^D, ^Z, EOF
         return RubyLexer::EOF
       else # alpha check
-        unless src.check IDENT_RE then
-          rb_compile_error "Invalid char #{src.matched.inspect} in expression"
-        end
+        rb_compile_error "Invalid char #{src.rest[0].chr} in expression" unless
+          src.check IDENT_RE
       end
 
       self.token = src.matched if self.src.scan IDENT_RE
@@ -1419,7 +1418,6 @@ class RubyLexer
 
     self.yacc_value = token
 
-
     self.lex_state = :expr_end if
       last_state != :expr_dot && self.parser.env[token.to_sym] == :lvar
 

data/lib/ruby_parser_extras.rb

@@ -108,7 +108,7 @@ class RPStringScanner < StringScanner
 end
 
 module RubyParserStuff
-  VERSION = '3.0.2' unless constants.include? "VERSION" # SIGH
+  VERSION = '3.0.3' unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments

data/test/test_ruby_lexer.rb

@@ -973,6 +973,10 @@ class TestRubyLexer < MiniTest::Unit::TestCase
     util_bad_token "@1"
   end
 
+  def test_yylex_ivar_bad_0_length
+    util_bad_token "1+@\n", :tINTEGER, 1, :tPLUS, "+"
+  end
+
   def test_yylex_keyword_expr
     @lex.lex_state = :expr_endarg
 
@@ -1969,4 +1973,3 @@ class TestRubyLexer < MiniTest::Unit::TestCase
     deny @lex.advance, "must be empty, but had #{[@lex.token, @lex.yacc_value].inspect}"
   end
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 3
+  version: 3.0.3
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2012-11-21 00:00:00 Z
+date: 2012-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 4
-        - 2
-        version: "4.2"
+        - 3
+        version: "4.3"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency