parser 2.3.3.1 → 2.4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe7089df6fb85523b63d43e3a2392797b918b15
-  data.tar.gz: 984d8422f2c36a025ac342ffd121cdd050e0f6cc
+  metadata.gz: 255b58022cc99fb078d57e0fcc881d5892401872
+  data.tar.gz: e00f38a300cc9c62b6bab48a155e6dc3639e51ac
 SHA512:
-  metadata.gz: ea6ea562998ed255c0428e547ce062eb1cfa94bb5ecc4201d7bf339cbc689d59428310f549f1e56da69880157291075bebe597ce68bd92760ad774f95db68ba2
-  data.tar.gz: 1af370b8acdcbc65a690c98032296bd99d6d636420a7a717492fa9081b08ace7423e17349654f8a3ec09a7e72a9e43133c09d760b581d62f1c3c673a9c62621b
+  metadata.gz: ad1ae6b22370cd26b56a39791984aae59e440bd58ce2f738522b71224b07cf3d0db45abf4bf8b2765c659d81dfa4117f57c03da7e7696f63da9ee25389a40a88
+  data.tar.gz: c3e9d34d73795b90501ce47cae91886198358dd3d5bb62de1e44485b3280537463e79da30ae652c4fc21da017a9d5be0fa57a86acdcdca4439414e5049de6607

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
- - 1.8.7
  - 1.9.2
  - 1.9.3
  - 2.0.0

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+v2.4.0.0 (2017-02-07)
+---------------------
+
+API modifications:
+ * parser/current: update for the 2.4 release. (whitequark)
+ * rubymotion.y: "a&.b": implement safe navigation operator in RubyMotion. (Mark Villacampa)
+
+Bugs fixed:
+ * lexer.rl: "a &. b": accept &. in EXPR_ARG also. (whitequark)
+
 v2.3.3.1 (2016-12-02)
 ---------------------
 
@@ -122,7 +132,7 @@ Bugs fixed:
  * Add :csend to Parser::Meta::NODE_TYPES (Markus Schirp)
  * lexer/dedenter: "\<\<x\n  y\\n  z\nx": don't dedent after escaped newline. (whitequark)
 
-v2.3.3.1 (2016-01-16)
+v2.4.0.0 (2016-01-16)
 ---------------------
 
 v2.3.0.1 (2016-01-14)

data/lib/parser/current.rb

@@ -64,7 +64,7 @@ module Parser
     CurrentRuby = Ruby23
 
   when /^2\.4\./
-    current_version = 'HEAD'
+    current_version = '2.4.0'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby24', current_version
     end
@@ -74,8 +74,8 @@ module Parser
 
   else # :nocov:
     # Keep this in sync with released Ruby.
-    warn_syntax_deviation 'parser/ruby23', '2.3.x'
-    require 'parser/ruby22'
-    CurrentRuby = Ruby22
+    warn_syntax_deviation 'parser/ruby24', '2.4.x'
+    require 'parser/ruby24'
+    CurrentRuby = Ruby24
   end
 end

data/lib/parser/lexer.rl

@@ -1490,6 +1490,8 @@ class Parser::Lexer
                   ( '=' | c_space_nl )?    |
       # x rescue y: Modifier keyword.
       w_space* keyword_modifier            |
+      # a &. b: Safe navigation operator.
+      w_space* '&.'                        |
       # Miscellanea.
       w_space* punctuation_end
       => {

data/lib/parser/rubymotion.y

@@ -16,7 +16,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       tBACK_REF2 tSYMBEG tSTRING_BEG tXSTRING_BEG tREGEXP_BEG tREGEXP_OPT
       tWORDS_BEG tQWORDS_BEG tSTRING_DBEG tSTRING_DVAR tSTRING_END
       tSTRING tSYMBOL tNL tEH tCOLON tCOMMA tSPACE tSEMI tLAMBDA tLAMBEG
-      tCHARACTER
+      tCHARACTER tANDDOT
 
 prechigh
   right    tBANG tTILDE tUPLUS
@@ -170,14 +170,14 @@ rule
                                     val[0], val[1], val[2], val[3]),
                                   val[4], val[5])
                     }
-                | primary_value tDOT tIDENTIFIER tOP_ASGN command_call
+                | primary_value call_op tIDENTIFIER tOP_ASGN command_call
                     {
                       result = @builder.op_assign(
                                   @builder.call_method(
                                     val[0], val[1], val[2]),
                                   val[3], val[4])
                     }
-                | primary_value tDOT tCONSTANT tOP_ASGN command_call
+                | primary_value call_op tCONSTANT tOP_ASGN command_call
                     {
                       result = @builder.op_assign(
                                   @builder.call_method(
@@ -251,7 +251,7 @@ rule
                     }
 
    block_command: block_call
-                | block_call tDOT operation2 command_args
+                | block_call call_op operation2 command_args
                     {
                       result = @builder.call_method(val[0], val[1], val[2],
                                   *val[3])
@@ -287,12 +287,12 @@ rule
                       result      = @builder.block(method_call,
                                       begin_t, args, body, end_t)
                     }
-                | primary_value tDOT operation2 command_args =tLOWEST
+                | primary_value call_op operation2 command_args =tLOWEST
                     {
                       result = @builder.call_method(val[0], val[1], val[2],
                                   *val[3])
                     }
-                | primary_value tDOT operation2 command_args cmd_brace_block
+                | primary_value call_op operation2 command_args cmd_brace_block
                     {
                       method_call = @builder.call_method(val[0], val[1], val[2],
                                         *val[3])
@@ -423,7 +423,7 @@ rule
                     {
                       result = @builder.index_asgn(val[0], val[1], val[2], val[3])
                     }
-                | primary_value tDOT tIDENTIFIER
+                | primary_value call_op tIDENTIFIER
                     {
                       result = @builder.attr_asgn(val[0], val[1], val[2])
                     }
@@ -431,7 +431,7 @@ rule
                     {
                       result = @builder.attr_asgn(val[0], val[1], val[2])
                     }
-                | primary_value tDOT tCONSTANT
+                | primary_value call_op tCONSTANT
                     {
                       result = @builder.attr_asgn(val[0], val[1], val[2])
                     }
@@ -458,7 +458,7 @@ rule
                     {
                       result = @builder.index_asgn(val[0], val[1], val[2], val[3])
                     }
-                | primary_value tDOT tIDENTIFIER
+                | primary_value call_op tIDENTIFIER
                     {
                       result = @builder.attr_asgn(val[0], val[1], val[2])
                     }
@@ -466,7 +466,7 @@ rule
                     {
                       result = @builder.attr_asgn(val[0], val[1], val[2])
                     }
-                | primary_value tDOT tCONSTANT
+                | primary_value call_op tCONSTANT
                     {
                       result = @builder.attr_asgn(val[0], val[1], val[2])
                     }
@@ -581,14 +581,14 @@ rule
                                     val[0], val[1], val[2], val[3]),
                                   val[4], val[5])
                     }
-                | primary_value tDOT tIDENTIFIER tOP_ASGN arg
+                | primary_value call_op tIDENTIFIER tOP_ASGN arg
                     {
                       result = @builder.op_assign(
                                   @builder.call_method(
                                     val[0], val[1], val[2]),
                                   val[3], val[4])
                     }
-                | primary_value tDOT tCONSTANT tOP_ASGN arg
+                | primary_value call_op tCONSTANT tOP_ASGN arg
                     {
                       result = @builder.op_assign(
                                   @builder.call_method(
@@ -1470,7 +1470,7 @@ rule
                       result      = @builder.block(val[0],
                                       begin_t, block_args, body, end_t)
                     }
-                | block_call tDOT operation2 opt_paren_args
+                | block_call call_op operation2 opt_paren_args
                     {
                       lparen_t, args, rparen_t = val[3]
                       result = @builder.call_method(val[0], val[1], val[2],
@@ -1489,7 +1489,7 @@ rule
                       result = @builder.call_method(nil, nil, val[0],
                                   lparen_t, args, rparen_t)
                     }
-                | primary_value tDOT operation2 opt_paren_args
+                | primary_value call_op operation2 opt_paren_args
                     {
                       lparen_t, args, rparen_t = val[3]
                       result = @builder.call_method(val[0], val[1], val[2],
@@ -1505,7 +1505,7 @@ rule
                     {
                       result = @builder.call_method(val[0], val[1], val[2])
                     }
-                | primary_value tDOT paren_args
+                | primary_value call_op paren_args
                     {
                       lparen_t, args, rparen_t = val[2]
                       result = @builder.call_method(val[0], val[1], nil,
@@ -2104,7 +2104,15 @@ regexp_contents: # nothing
        operation: tIDENTIFIER | tCONSTANT | tFID
       operation2: tIDENTIFIER | tCONSTANT | tFID | op
       operation3: tIDENTIFIER | tFID | op
-    dot_or_colon: tDOT | tCOLON2
+    dot_or_colon: call_op | tCOLON2
+         call_op: tDOT
+                    {
+                      result = [:dot, val[0][1]]
+                    }
+                | tANDDOT
+                    {
+                      result = [:anddot, val[0][1]]
+                    }
        opt_terms:  | terms
           opt_nl:  | tNL
           rparen: opt_nl tRPAREN

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.3.3.1'
+  VERSION = '2.4.0.0'
 end

data/test/test_lexer.rb

@@ -231,7 +231,13 @@ class TestLexer < Minitest::Test
     assert_lex_fname "&", :tAMPER2, [0, 1]
   end
 
-  def test_and_dot
+  def test_and_dot_arg
+    @lex.state = :expr_arg
+
+    assert_scanned "&.", :tANDDOT, "&.", [0, 2]
+  end
+
+  def test_and_dot_cmdarg
     @lex.state = :expr_cmdarg
 
     assert_scanned "&.", :tANDDOT, "&.", [0, 2]

data/test/test_parser.rb

@@ -3453,7 +3453,7 @@ class TestParser < Minitest::Test
       s(:csend, s(:send, nil, :a), :b),
       %q{a&.b},
       %q{ ^^ dot},
-      SINCE_2_3)
+      SINCE_2_3 + %w{ios})
   end
 
   def test_send_attr_asgn_conditional
@@ -3461,7 +3461,7 @@ class TestParser < Minitest::Test
       s(:csend, s(:send, nil, :a), :b=, s(:int, 1)),
       %q{a&.b = 1},
       %q{ ^^ dot},
-      SINCE_2_3)
+      SINCE_2_3 + %w{ios})
   end
 
   def test_send_block_conditional
@@ -3472,7 +3472,7 @@ class TestParser < Minitest::Test
         s(:args), nil),
       %q{foo&.bar {}},
       %q{},
-      SINCE_2_3)
+      SINCE_2_3 + %w{ios})
   end
 
   def test_send_op_asgn_conditional
@@ -3480,7 +3480,7 @@ class TestParser < Minitest::Test
       s(:and_asgn, s(:csend, s(:send, nil, :a), :b), s(:int, 1)),
       %q{a&.b &&= 1},
       %q{},
-      SINCE_2_3)
+      SINCE_2_3 + %w{ios})
   end
 
   def test_lvar_injecting_match

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.3.3.1
+  version: 2.4.0.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.
@@ -315,4 +315,3 @@ test_files:
 - test/test_source_rewriter.rb
 - test/test_source_rewriter_action.rb
 - test/test_static_environment.rb
-has_rdoc: yard