sirop 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1641ee60187094fe9dcdeebefbfc5283c0d2ea535aa161b17f7bf6f720d63854
-  data.tar.gz: c9abaef1a8b7116760f92e143bcb2e58fbc4424fe3d4afe110bc10bf552852cf
+  metadata.gz: 5a44761c6907c2bd7358e0b7d6c4079b8582949121ff32161b508a0950d0032c
+  data.tar.gz: 99cf621e80d420ec1a4245e8fd9efdbb06633614982d804d45f545f0a1966a0b
 SHA512:
-  metadata.gz: 3900ece58c932df6181676abb597fa6deedfbd8801e28f4993cc36cce7584a188e88b73e6ef2b0fea33b5dbc8a8d284949159973cb108e149dd0d9b3ea5dd762
-  data.tar.gz: 7f848b0e842792a33e3fc7c9b7d6cf72e924040307e2db5ccb0cff16af1e947e7053ee81e54ab688c131532b66432dc1283651ceeef5820ded58c3b8447d193a
+  metadata.gz: de992959d865f0ace64d1be7b9c0149a10d193f54e2bfa0e9b20dcd2fe70f7bf4fe3ec5984c29a75cf89bc70dc385d29747ba372174bfe4286654b3543e0f946
+  data.tar.gz: '00393520ab9df84615c35a104411d4aad118c07ac4d4212debbf21df536f90883dd924e31e4d9064d4ce7344fa425716c292d4f9fbe3e1fb3b675ccea054fe95'

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2024-04-19 0.3
+
+- Add support for injecting (prefixed) parameters to a lambda node
+- Fix whitespace adjustment in DSL compiler
+- Improve DSL compiler to support embedded string expressions
+- Correctly handle eval'd proc
+
 # 2024-02-27 0.2
 
 - Update README

data/lib/sirop/injection.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Sirop
+  class Injection
+    attr_reader :slice
+
+    def initialize(slice)
+      @slice = slice
+    end
+  end
+end

data/lib/sirop/prism_ext.rb

@@ -8,3 +8,27 @@ class Prism::BasicVisitor
     self
   end
 end
+
+class Prism::ParametersNode
+  attr_accessor :injected_prefix
+end
+
+class Prism::BlockParametersNode
+  attr_accessor :injected_parameters
+end
+
+class Prism::LambdaNode
+  # @param params [String] injected parameters
+  # @return [void]
+  def inject_parameters(params)
+    if parameters
+      if parameters.parameters
+        parameters.parameters.injected_prefix = Sirop::Injection.new(params)
+      else
+        parameters.injected_parameters = Sirop::Injection.new(params)
+      end
+    else
+      instance_variable_set(:@parameters, Sirop::Injection.new("(#{params})"))
+    end
+  end
+end

data/lib/sirop/sourcifier.rb

@@ -30,11 +30,14 @@ module Sirop
     end
 
     def adjust_whitespace(loc)
+      return if loc.is_a?(Sirop::Injection)
+
       if @last_loc_start
-        if @last_loc_end.first != loc.start_line
-          @buffer << "\n" * (loc.start_line - @last_loc_end.first)
+        line_diff = loc.start_line - @last_loc_end.first
+        if line_diff > 0
+          @buffer << "\n" * line_diff
           @buffer << ' ' * loc.start_column
-        else
+        elsif line_diff == 0
           ofs = loc.start_column - @last_loc_end.last
           if ofs > 0
             @buffer << ' ' * ofs
@@ -85,38 +88,41 @@ module Sirop
     end
 
     VISIT_PLANS = {
-      and:                    [:left, :operator_loc, :right],
-      assoc:                  :visit_child_nodes,
-      assoc_splat:            [:operator_loc, :value],
-      block:                  [:opening_loc, :parameters, :body, :closing_loc],
-      block_argument:         [:operator_loc, :expression],
-      block_parameter:        [:operator_loc, :name_loc],
-      block_parameters:       [:opening_loc, :parameters, :closing_loc],
-      break:                  [:keyword_loc, :arguments],
-      constant_path:          [:parent, :delimiter_loc, :child],
-      constant_read:          :emit_verbatim,
-      else:                   [:else_keyword_loc, :statements],
-      embedded_statements:    [:opening_loc, :statements, :closing_loc],
-      false:                  :emit_verbatim,
-      integer:                :emit_verbatim,
-      keyword_rest_parameter: [:operator_loc, :name_loc],
-      lambda:                 [:operator_loc, :parameters, :opening_loc, :body,
-                               :closing_loc],
-      local_variable_read:    :emit_verbatim,
-      local_variable_write:   [:name_loc, :operator_loc, :value],
-      next:                   [:keyword_loc, :arguments],
-      nil:                    :emit_verbatim,
-      optional_parameter:     [:name_loc, :operator_loc, :value],
-      or:                     [:left, :operator_loc, :right],
-      parentheses:            [:opening_loc, :body, :closing_loc],
-      required_parameter:     :emit_verbatim,
-      rest_parameter:         [:operator_loc, :name_loc],
-      splat:                  [:operator_loc, :expression],
-      statements:             :visit_child_nodes,
-      string:                 :emit_verbatim,
-      symbol:                 :emit_verbatim,
-      true:                   :emit_verbatim,
-      yield:                  [:keyword_loc, :lparen_loc, :arguments, :rparen_loc],
+      and:                        [:left, :operator_loc, :right],
+      assoc:                      :visit_child_nodes,
+      assoc_splat:                [:operator_loc, :value],
+      block:                      [:opening_loc, :parameters, :body, :closing_loc],
+      block_argument:             [:operator_loc, :expression],
+      block_parameter:            [:operator_loc, :name_loc],
+      block_parameters:           [:opening_loc, :injected_parameters, :parameters, :closing_loc],
+      break:                      [:keyword_loc, :arguments],
+      constant_path:              [:parent, :delimiter_loc, :child],
+      constant_read:              :emit_verbatim,
+      else:                       [:else_keyword_loc, :statements],
+      embedded_statements:        [:opening_loc, :statements, :closing_loc],
+      false:                      :emit_verbatim,
+      integer:                    :emit_verbatim,
+      keyword_rest_parameter:     [:operator_loc, :name_loc],
+      keyword_parameter:          :emit_verbatim,
+      lambda:                     [:operator_loc, :parameters, :opening_loc, :body,
+                                   :closing_loc],
+      local_variable_read:        :emit_verbatim,
+      local_variable_write:       [:name_loc, :operator_loc, :value],
+      next:                       [:keyword_loc, :arguments],
+      nil:                        :emit_verbatim,
+      optional_parameter:         [:name_loc, :operator_loc, :value],
+      optional_keyword_parameter: [:name_loc, :value],
+      or:                         [:left, :operator_loc, :right],
+      parentheses:                [:opening_loc, :body, :closing_loc],
+      required_parameter:         :emit_verbatim,
+      required_keyword_parameter: :emit_verbatim,
+      rest_parameter:             [:operator_loc, :name_loc],
+      splat:                      [:operator_loc, :expression],
+      statements:                 :visit_child_nodes,
+      string:                     :emit_verbatim,
+      symbol:                     :emit_verbatim,
+      true:                       :emit_verbatim,
+      yield:                      [:keyword_loc, :lparen_loc, :arguments, :rparen_loc],
     }
 
     VISIT_PLANS.each do |key, plan|
@@ -152,9 +158,21 @@ module Sirop
     end
 
     def visit_parameters_node(node)
-      comma = visit_comma_separated_nodes(node.requireds)
+      comma = false
+      # injected_prefix is a custom attribute added by Sirop to the
+      # ParametersNode class (in lib/sirop/prism_ext.rb). It is used
+      # as a way to add a first parameter to a block or method.
+      if node.injected_prefix
+        emit_code(node.injected_prefix)
+        # adjust last_loc_end for proper whitespace after comma
+        @last_loc_end[1] -= 2 if @last_loc_end
+        # binding.irb
+        comma = true
+      end
+      comma = visit_comma_separated_nodes(node.requireds, comma)
       comma = visit_comma_separated_nodes(node.optionals, comma)
       comma = visit_comma_separated_nodes(node.posts, comma)
+      comma = visit_comma_separated_nodes(node.keywords, comma)
       if node.rest
         emit_comma if comma
         comma = true

data/lib/sirop/version.rb

@@ -1,4 +1,4 @@
 module Sirop
   # Sirop version
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/lib/sirop.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 require 'prism'
+require 'sirop/injection'
 require 'sirop/prism_ext'
 require 'sirop/finder'
 require 'sirop/sourcifier'
 
 module Sirop
+  class Error < StandardError
+  end
+
   class << self
     def to_ast(obj)
       case obj
@@ -43,6 +47,8 @@ module Sirop
           super(node)
         end
       end
+    rescue Errno::ENOENT
+      raise Sirop::Error, "Could not get source for proc"
     end
 
     def method_ast(method)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sirop
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -49,6 +49,7 @@ files:
 - README.md
 - lib/sirop.rb
 - lib/sirop/finder.rb
+- lib/sirop/injection.rb
 - lib/sirop/prism_ext.rb
 - lib/sirop/sourcifier.rb
 - lib/sirop/version.rb