parser 2.6.2.1 → 2.6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079e9a23e1c61dbd3964edff00120c9d9df0993aee3b1a0070a64c1b717a1450'
-  data.tar.gz: f42199a0777690e615515ca481ee2bf56aa3c5090d9702e65ae19c1db8fb499a
+  metadata.gz: bceee2aee10ca7b86d7fb0e29f985b0b1848425b3d256af84e5dd324046ab2f7
+  data.tar.gz: 9ea970432bb2dc6dc68320baf39d7f24d928c45fc8ca236c14ed4c7c8db4d29e
 SHA512:
-  metadata.gz: ca3de4d39f2c9e67366c22c9a2c5640efcbbee28cb3b0ed030425de55806dd03580d9111195eb9e66f65189638ee5935adb94441a4018e2e0901c66d450e18a7
-  data.tar.gz: c29b708ab12eef3c14f2f472b152e1adf090481a3127a10c9bdb4a24cb34849e4f00bbdf14f97e71916157dce66c6d74faa9658603a95db82e246c92d68bf15b
+  metadata.gz: 577db299468896bb4dec4ca23dc14d78e58dd41dd323219de110e70ad2c691d6a9d3563339c1c4dcded9e7aaa69df5227f80ed1565f910d562928cf64c0936b4
+  data.tar.gz: 28c3a2a9e40727a71ac9255f1ad076ff86d2b60652eb4ac81719645c2542c3be0c818862003eae32b13c983397b86e023d9c0177f495dd45299845f1902871d5

data/.travis.yml

@@ -17,8 +17,8 @@ matrix:
     - name: 2.5.5 / Parser tests
       rvm: 2.5.5
       script: bundle exec rake test_cov
-    - name: 2.6.2 / Parser tests
-      rvm: 2.6.2
+    - name: 2.6.3 / Parser tests
+      rvm: 2.6.3
       script: bundle exec rake test_cov
     - name: ruby-head / Parser tests
       rvm: ruby-head
@@ -32,8 +32,8 @@ matrix:
     - name: 2.5.5 / Rubocop tests
       rvm: 2.5.5
       script: ./ci/run_rubocop_specs
-    - name: 2.6.2 / Rubocop tests
-      rvm: 2.6.2
+    - name: 2.6.3 / Rubocop tests
+      rvm: 2.6.3
       script: ./ci/run_rubocop_specs
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 Changelog
 =========
 
-Not released (2019-04-05)
+Not released (2019-04-28)
 -------------------------
 
+Features implemented:
+ * ruby27.y: Added beginless ranges support. (#570) (Ilya Bylich)
+
+v2.6.2.1 (2019-04-05)
+---------------------
+
 API modifications:
  * Bump 2.4 branch to 2.4.6. (#569) (Ilya Bylich)
  * Lexer should know about current parsing context. (#566) (Ilya Bylich)

data/doc/AST_FORMAT.md

@@ -339,6 +339,22 @@ Format:
  ~~~~ expression
 ~~~
 
+### Beginless (2.7)
+
+Format:
+
+~~~
+(irange nil (int 1))
+"..1"
+ ~~ operator
+ ~~~ expression
+
+(erange nil (int 1))
+"...1"
+ ~~~ operator
+ ~~~~ expression
+~~~
+
 ## Access
 
 ### Self

data/lib/parser/builders/default.rb

@@ -1394,10 +1394,12 @@ module Parser
     end
 
     def range_map(start_e, op_t, end_e)
-      if end_e
+      if start_e && end_e
         expr_l = join_exprs(start_e, end_e)
-      else
+      elsif start_e
         expr_l = start_e.loc.expression.join(loc(op_t))
+      elsif end_e
+        expr_l = loc(op_t).join(end_e.loc.expression)
       end
 
       Source::Map::Operator.new(loc(op_t), expr_l)

data/lib/parser/current.rb

@@ -66,7 +66,7 @@ module Parser
     CurrentRuby = Ruby25
 
   when /^2\.6\./
-    current_version = '2.6.2'
+    current_version = '2.6.3'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby26', current_version
     end

data/lib/parser/lexer.rl

@@ -1910,6 +1910,31 @@ class Parser::Lexer
         fbreak;
       };
 
+      #
+      # RUBY 2.7 BEGINLESS RANGE
+
+      '..'
+      => {
+        if @version >= 27
+          emit(:tBDOT2)
+        else
+          emit(:tDOT2)
+        end
+
+        fnext expr_beg; fbreak;
+      };
+
+      '...'
+      => {
+        if @version >= 27
+          emit(:tBDOT3)
+        else
+          emit(:tDOT3)
+        end
+
+        fnext expr_beg; fbreak;
+      };
+
       #
       # CONTEXT-DEPENDENT VARIABLE LOOKUP OR COMMAND INVOCATION
       #

data/lib/parser/ruby26.y

@@ -1893,7 +1893,7 @@ regexp_contents: # nothing
                       result = @builder.symbol(val[0])
                     }
 
-            dsym: tSYMBEG xstring_contents tSTRING_END
+            dsym: tSYMBEG string_contents tSTRING_END
                     {
                       @lexer.state = :expr_end
                       result = @builder.symbol_compose(val[0], val[1], val[2])

data/lib/parser/ruby27.y

@@ -17,7 +17,7 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       tWORDS_BEG tQWORDS_BEG tSYMBOLS_BEG tQSYMBOLS_BEG tSTRING_DBEG
       tSTRING_DVAR tSTRING_END tSTRING_DEND tSTRING tSYMBOL
       tNL tEH tCOLON tCOMMA tSPACE tSEMI tLAMBDA tLAMBEG tCHARACTER
-      tRATIONAL tIMAGINARY tLABEL_END tANDDOT tMETHREF
+      tRATIONAL tIMAGINARY tLABEL_END tANDDOT tMETHREF tBDOT2 tBDOT3
 
 prechigh
   right    tBANG tTILDE tUPLUS
@@ -32,7 +32,7 @@ prechigh
   nonassoc tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
   left     tANDOP
   left     tOROP
-  nonassoc tDOT2 tDOT3
+  nonassoc tDOT2 tDOT3 tBDOT2 tBDOT3
   right    tEH tCOLON
   left     kRESCUE_MOD
   right    tEQL tOP_ASGN
@@ -670,6 +670,14 @@ rule
                     {
                       result = @builder.range_exclusive(val[0], val[1], nil)
                     }
+                | tBDOT2 arg
+                    {
+                      result = @builder.range_inclusive(nil, val[0], val[1])
+                    }
+                | tBDOT3 arg
+                    {
+                      result = @builder.range_exclusive(nil, val[0], val[1])
+                    }
                 | arg tPLUS arg
                     {
                       result = @builder.binary_op(val[0], val[1], val[2])

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '2.6.2.1'
+  VERSION = '2.6.3.0'
 end

data/test/test_parser.rb

@@ -852,6 +852,42 @@ class TestParser < Minitest::Test
       SINCE_2_6)
   end
 
+  def test_beginless_range_before_27
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tDOT2' }],
+      %q{..42},
+      %q{^^ location},
+      ALL_VERSIONS - SINCE_2_7
+    )
+
+    assert_diagnoses(
+      [:error, :unexpected_token, { :token => 'tDOT3' }],
+      %q{...42},
+      %q{^^^ location},
+      ALL_VERSIONS - SINCE_2_7
+    )
+  end
+
+  def test_beginless_range
+    assert_parses(
+      s(:irange, nil,
+        s(:int, 100)),
+      %q{..100},
+      %q{~~~~~ expression
+        |~~ operator},
+      SINCE_2_7
+    )
+
+    assert_parses(
+      s(:erange, nil,
+        s(:int, 100)),
+      %q{...100},
+      %q{~~~~~~ expression
+        |~~~ operator},
+      SINCE_2_7
+    )
+  end
+
   #
   # Access
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.6.2.1
+  version: 2.6.3.0
 platform: ruby
 authors:
 - whitequark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast