ruby-next-core 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cab7345f16f61d3a35a307024885c4b9a0055bb946f473bdd5a386b27175ec2
-  data.tar.gz: c3b2004bf5cd1b9dd49d2a7892bd3e88472a632f4cdc8da310bdb56fb96171d9
+  metadata.gz: b97da767efae69a9faa9ed2b4c4a3daf9c38a5b70768502b013692b7a3c04a50
+  data.tar.gz: 05ba2f4c4677c40d46a451a68a94e434b54d4e9daa9a2af51cbd508ef0a198ab
 SHA512:
-  metadata.gz: 4f6b3d6f64e0303e1b69fa5a99ececcf605c7413285c05feb03d9308da8449296fbea96b8779a3ac6b72dca8351ac10cd20f11161b1581ac6a60a85d951ca0d3
-  data.tar.gz: 44e5f05020cae47e13d1a89627c94d890b07daccd1e7dcf51e2e4e0eed208fca2c946e4db674f53fa0581477a368e80c73474ffc657a53f55c1e962bd3d668ba
+  metadata.gz: ef678d9b8ed431a8a8f005b00c445da56096c39a3c9ffc1ce88708c4b1280e630cb5c58a63a154381c384b54968ec19b3c88a4a49665b3503bd5df62f454a168
+  data.tar.gz: a25ebf4e0c3456213a1f682d27df031a6add5bc117800026d8b0f9b48cacb49e72a4b97115f9b1b1acf058ca3f6974dfa94402498a58a19ac532916eb9a81199

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 0.10.1 (2020-09-09)
+
+- Fix regression when `nextify` produces incorrect files for 2.7. ([@palkan][])
+
 ## 0.10.0 (2020-09-02)
 
 - Add proposed shorthand Hash syntax. ([@palkan][])

data/lib/.rbnext/2.3/ruby-next/language/rewriters/base.rb

@@ -72,6 +72,10 @@ module RubyNext
             self::MIN_SUPPORTED_VERSION > version
           end
 
+          def min_supported_minor_version
+            Gem::Version.new(self::MIN_SUPPORTED_VERSION.segments[0..1].join(".") + ".0")
+          end
+
           private
 
           def transform(source)

data/lib/.rbnext/2.3/ruby-next/language/rewriters/right_hand_assignment.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      class RightHandAssignment < Base
+        NAME = "right-hand-assignment"
+        SYNTAX_PROBE = "1 + 2 => a"
+        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
+
+        def on_rasgn(node)
+          context.track! self
+
+          node = super(node)
+
+          val_node, asgn_node = *node
+
+          remove(val_node.loc.expression.end.join(asgn_node.loc.expression))
+          insert_before(val_node.loc.expression, "#{asgn_node.loc.expression.source} = ")
+
+          asgn_node.updated(
+            nil,
+            asgn_node.children + [val_node]
+          )
+        end
+
+        def on_vasgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          name, val_node = *node
+
+          remove(val_node.loc.expression.end.join(node.loc.name))
+          insert_before(val_node.loc.expression, "#{name} = ")
+
+          super(node)
+        end
+
+        def on_casgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          scope_node, name, val_node = *node
+
+          if scope_node
+            scope = scope_node.type == :cbase ? scope_node.loc.expression.source : "#{scope_node.loc.expression.source}::"
+            name = "#{scope}#{name}"
+          end
+
+          remove(val_node.loc.expression.end.join(node.loc.name))
+          insert_before(val_node.loc.expression, "#{name} = ")
+
+          super(node)
+        end
+
+        def on_mrasgn(node)
+          context.track! self
+
+          node = super(node)
+
+          lhs, rhs = *node
+
+          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
+          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
+
+          node.updated(
+            :masgn,
+            [rhs, lhs]
+          )
+        end
+
+        def on_masgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          rhs, lhs = *node
+
+          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
+          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
+
+          super(node)
+        end
+
+        private
+
+        def rightward?(node)
+          # Location could be empty for node built by rewriters
+          return false unless ((!node.loc.nil?) || nil) && node.loc.operator
+
+          assignee_loc =
+            if node.type == :masgn
+              node.children[0].loc.expression
+            else
+              node.loc.name
+            end
+
+          return false unless assignee_loc
+
+          assignee_loc.begin_pos > node.loc.operator.end_pos
+        end
+      end
+    end
+  end
+end

data/lib/ruby-next/language.rb

@@ -39,7 +39,7 @@ module RubyNext
       # Called by rewriter when it performs transfomrations
       def track!(rewriter)
         @dirty = true
-        versions << rewriter.class::MIN_SUPPORTED_VERSION
+        versions << rewriter.class.min_supported_minor_version
       end
 
       def use_ruby_next!

data/lib/ruby-next/language/rewriters/base.rb

@@ -73,6 +73,10 @@ module RubyNext
             self::MIN_SUPPORTED_VERSION > version
           end
 
+          def min_supported_minor_version
+            Gem::Version.new(self::MIN_SUPPORTED_VERSION.segments[0..1].join(".") + ".0")
+          end
+
           private
 
           def transform(source)

data/lib/ruby-next/language/rewriters/right_hand_assignment.rb

@@ -11,34 +11,96 @@ module RubyNext
         def on_rasgn(node)
           context.track! self
 
+          node = super(node)
+
           val_node, asgn_node = *node
 
           remove(val_node.loc.expression.end.join(asgn_node.loc.expression))
           insert_before(val_node.loc.expression, "#{asgn_node.loc.expression.source} = ")
 
-          process(
-            asgn_node.updated(
-              nil,
-              asgn_node.children + [val_node]
-            )
+          asgn_node.updated(
+            nil,
+            asgn_node.children + [val_node]
           )
         end
 
+        def on_vasgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          name, val_node = *node
+
+          remove(val_node.loc.expression.end.join(node.loc.name))
+          insert_before(val_node.loc.expression, "#{name} = ")
+
+          super(node)
+        end
+
+        def on_casgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          scope_node, name, val_node = *node
+
+          if scope_node
+            scope = scope_node.type == :cbase ? scope_node.loc.expression.source : "#{scope_node.loc.expression.source}::"
+            name = "#{scope}#{name}"
+          end
+
+          remove(val_node.loc.expression.end.join(node.loc.name))
+          insert_before(val_node.loc.expression, "#{name} = ")
+
+          super(node)
+        end
+
         def on_mrasgn(node)
           context.track! self
 
+          node = super(node)
+
           lhs, rhs = *node
 
           replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
           insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
 
-          process(
-            node.updated(
-              :masgn,
-              [rhs, lhs]
-            )
+          node.updated(
+            :masgn,
+            [rhs, lhs]
           )
         end
+
+        def on_masgn(node)
+          return super(node) unless rightward?(node)
+
+          context.track! self
+
+          rhs, lhs = *node
+
+          replace(lhs.loc.expression.end.join(rhs.loc.expression), ")")
+          insert_before(lhs.loc.expression, "#{rhs.loc.expression.source} = (")
+
+          super(node)
+        end
+
+        private
+
+        def rightward?(node)
+          # Location could be empty for node built by rewriters
+          return false unless node.loc&.operator
+
+          assignee_loc =
+            if node.type == :masgn
+              node.children[0].loc.expression
+            else
+              node.loc.name
+            end
+
+          return false unless assignee_loc
+
+          assignee_loc.begin_pos > node.loc.operator.end_pos
+        end
       end
     end
   end

data/lib/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-parser
@@ -61,6 +61,7 @@ files:
 - lib/.rbnext/2.3/ruby-next/language/rewriters/base.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/endless_range.rb
 - lib/.rbnext/2.3/ruby-next/language/rewriters/pattern_matching.rb
+- lib/.rbnext/2.3/ruby-next/language/rewriters/right_hand_assignment.rb
 - lib/.rbnext/2.3/ruby-next/utils.rb
 - lib/ruby-next.rb
 - lib/ruby-next/cli.rb