parser 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd043e73889dc0f7bad2b24a2353199f79279bd1
-  data.tar.gz: a20161bda1ac0a18221e6d2f7d113ea70359fda3
+  metadata.gz: af4585f0f54966cb0ea90fc757545580f56cc42f
+  data.tar.gz: bc60ac2087e03379fc3932f13ba81823d59f555b
 SHA512:
-  metadata.gz: 3dbd1cc98702afb4a0c5825da36403b41f0e00d44d1204b71c3c9b1084a33024a5faa1ea8c58feddc14fe7d5c448f357134cfa6de22e2be99c4f955a6a978fdb
-  data.tar.gz: 85ec9a63f96c123ff6bc72178d5a0c6505bd3e9568e66ba7fd795c03e0b9ba5302dcfd7fa10016ff1f0b081b8b8ec94b6102bb0796edcc2c6972889fb021974d
+  metadata.gz: adc95d57bebd0e1cfaa53f08d13aec17cf3d86866cc257f43814204a41c1f1d0ba686dc0a6f367fc7e3f57235201e2c46a02714149e26d393a85bc5edf80395b
+  data.tar.gz: e54e2aa83194bc33d6d2f10ef1a7fd033902b34b0d91018e6d2227887cda5b4e7f38020f43235bc69e154d06948822ce0bcc3507b275b81059db3aa7c70210e1

data/.travis.yml

@@ -7,4 +7,8 @@ rvm:
  - jruby-18mode
  - jruby-19mode
  - rbx
-cache: bundler
+before_install:
+ - gem update bundler
+ - bundle --version
+ - gem update --system 2.1.11
+ - gem --version

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v2.1.2 (2014-01-05)
+-------------------
+
+Bugs fixed:
+ * lexer.rl: in "foo!= x", foo is tIDENTIFIER, not tFID (closes #126). (Peter Zotov)
+
 v2.1.1 (2013-12-25)
 -------------------
 

data/doc/AST_FORMAT.md

@@ -334,6 +334,8 @@ Format:
 
 ### Global variable
 
+#### Regular global variable
+
 Format:
 
 ~~~
@@ -342,6 +344,32 @@ Format:
  ~~~~ expression
 ~~~
 
+#### Regular expression capture groups
+
+Format:
+
+~~~
+(nth-ref 1)
+"$1"
+ ~~ expression
+~~~
+
+#### Regular expression back-references
+
+Format:
+
+~~~
+(back-ref :$&)
+"$&"
+ ~~ expression
+(back-ref :$`)
+"$`"
+(back-ref :$')
+"$'"
+(back-ref :$+)
+"$+"
+~~~
+
 ### Constant
 
 #### Top-level constant
@@ -588,12 +616,12 @@ Logical operator-assignment features the same "incomplete assignments" and "inco
 Format:
 
 ~~~
-(or-asgn (iasgn :@a) (int 1))
+(or-asgn (ivasgn :@a) (int 1))
 "@a ||= 1"
     ~~~ operator
  ~~~~~~~~ expression
 
-(and-asgn (lasgn :a) (int 1))
+(and-asgn (lvasgn :a) (int 1))
 "a &&= 1"
    ~~~ operator
  ~~~~~~~ expression
@@ -602,10 +630,10 @@ Format:
 Ruby_parser output for reference:
 ~~~
 "@a ||= 1"
-s(:op_asgn_or, s(:ivar, :@a), s(:iasgn, :@a, s(:int, 1)))
+s(:op_asgn_or, s(:ivar, :@a), s(:ivasgn, :@a, s(:int, 1)))
 
 "a &&= 1"
-s(:op_asgn_and, s(:lvar, :a), s(:lasgn, :a, s(:int, 1)))
+s(:op_asgn_and, s(:lvar, :a), s(:lvasgn, :a, s(:int, 1)))
 ~~~
 
 #### Method logical operator-assignment
@@ -1042,6 +1070,13 @@ Format:
  ~~~~~~~~~~~ expression
 ~~~
 
+~~~
+(or (lvar :foo) (lvar :bar))
+"foo or bar"
+     ~~ operator
+ ~~~~~~~~~~ expression
+~~~
+
 #### Unary (! not) (1.8)
 
 Format:
@@ -1274,13 +1309,13 @@ Format:
 Format:
 
 ~~~
-(while-post (lvar :condition) (begin (send nil :foo)))
+(while-post (lvar :condition) (kwbegin (send nil :foo)))
 "begin; foo; end while condition"
  ~~~~~ begin (begin)
              ~~~ end (begin)
                  ~~~~~ keyword (while-post)
 
-(until-post (lvar :condition) (begin (send nil :foo)))
+(until-post (lvar :condition) (kwbegin (send nil :foo)))
 "begin; foo; end until condition"
  ~~~~~ begin (begin)
              ~~~ end (begin)
@@ -1292,7 +1327,7 @@ Format:
 Format:
 
 ~~~
-(for (lasgn :a) (lvar :array) (send nil :p (lvar :a)))
+(for (lvasgn :a) (lvar :array) (send nil :p (lvar :a)))
 "for a in array do p a; end"
  ~~~ keyword
        ~~ in
@@ -1305,7 +1340,7 @@ Format:
                       ~~~ end
 
 (for
-  (mlhs (lasgn :a) (lasgn :b)) (lvar :array)
+  (mlhs (lvasgn :a) (lvasgn :b)) (lvar :array)
   (send nil :p (lvar :a) (lvar :b)))
 "for a, b in array; p a, b; end"
 ~~~

data/lib/parser/lexer.rl

@@ -2014,9 +2014,17 @@ class Parser::Lexer
       => local_ident;
 
       bareword ambiguous_fid_suffix
-      => { emit(:tFID, tok(@ts, tm), @ts, tm)
-           p = tm - 1
-           fnext expr_arg; fbreak; };
+      => {
+        if tm == @te
+          # Suffix was consumed, e.g. foo!
+          emit(:tFID)
+        else
+          # Suffix was not consumed, e.g. foo!=
+          emit(:tIDENTIFIER, tok(@ts, tm), @ts, tm)
+          p = tm - 1
+        end
+        fnext expr_arg; fbreak;
+      };
 
       #
       # OPERATORS

data/lib/parser/runner.rb

@@ -72,7 +72,7 @@ module Parser
         @parser_class = Parser::Ruby20
       end
 
-      @slop.on '21', 'Parse as Ruby trunk would (use with caution)' do
+      @slop.on '21', 'Parse as Ruby 2.1.0 would' do
         require 'parser/ruby21'
         @parser_class = Parser::Ruby21
       end

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

data/test/test_lexer.rb

@@ -888,16 +888,17 @@ class TestLexer < Minitest::Test
   end
 
   def test_identifier
-    assert_scanned("identifier", :tIDENTIFIER, "identifier")
+    assert_scanned("identifier",
+                   :tIDENTIFIER, "identifier")
   end
 
   def test_identifier_bang
     assert_scanned("identifier!",
-                   :tFID, "identifier!")
+                   :tFID,        "identifier!")
 
     assert_scanned("identifier!=",
-                   :tFID, "identifier",
-                   :tNEQ, "!=")
+                   :tIDENTIFIER, "identifier",
+                   :tNEQ,        "!=")
   end
 
   def test_identifier_cmp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast