kapusta 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9b062de9860ef3b9f3cfcbac8503e69c1549f0f09af35b41e5eb13303c1ddb
-  data.tar.gz: daa87e0b3b65dfc82f21ff47e88b41652d05f087e46320ca1c3f49bac2457b71
+  metadata.gz: 693c32746a17e6f3a2aa7ac2a2d23cd6e3b3d981f1ef9355a69c5cd14ea09bbe
+  data.tar.gz: 7a500a84cbb1c8e3c1937c1fb987aa14db1b835cd63416e2f2e1d9b18309324e
 SHA512:
-  metadata.gz: 564c441ea9395cd4f28daaa631de6022e39125eede47032bf32bbc2a45f18979b7376f264b5302459b78403ef039ef8aca93e6f469cc0666b033f6e6717894a2
-  data.tar.gz: 38479cb8d38b81df15697a56c1a14e63d4dda7a0dd793db4e121e06126395339d9c7676a4bb14411a6b43398b64196f877ce3126990eb07d24f2a0c769a577e2
+  metadata.gz: fb9f5ac51dbc88892e7d2b2527c6b94d13c972276899cdf86a76f6460e7073c0c4610cbaee2142e66638108226b9a66efe1415e42394e6c8c7abd74bd4ac0d2c
+  data.tar.gz: 53eac046879c094bd002cb6d0e9c199dfb39680d2140dde5699f62a36a26a8cc5d928ccc02315b1cad568e9b8f383cafeddf2e26cfaa4d07db3f53a29783de7e

data/README.md

@@ -67,8 +67,8 @@ def ack(m, n)
     ack(m - 1, ack(m, n - 1))
   end
 end
-p(ack(2, 3))
-p(ack(3, 3))
+p ack(2, 3)
+p ack(3, 3)
 ```
 
 ## Comparison with Fennel

data/lib/kapusta/compiler/emitter/bindings.rb

@@ -213,11 +213,11 @@ module Kapusta
 
         def emit_let(args, env, current_scope)
           binding_code, body_code = emit_let_parts(args, env, current_scope, result: true)
-          <<~RUBY.chomp
-            (-> do
-              #{indent(join_code(binding_code, body_code))}
-            end).call
-          RUBY
+          [
+            '(-> do',
+            indent(join_code(binding_code, body_code)),
+            'end).call'
+          ].join("\n")
         end
 
         def emit_let_statement(args, env, current_scope)

data/lib/kapusta/compiler/emitter/collections.rb

@@ -113,12 +113,9 @@ module Kapusta
                 [[binding_pats[0], index_var], [binding_pats[1], value_var]], body_env
               )
               body_code = yield(body_env)
-              return <<~RUBY.chomp
-                #{emit_expr(iter_expr.items[1], env, current_scope)}.each_with_index do |#{value_var}, #{index_var}|
-                  #{bind_code}
-                  #{body_code}
-                end
-              RUBY
+              header = "#{emit_expr(iter_expr.items[1], env, current_scope)}" \
+                       ".each_with_index do |#{value_var}, #{index_var}|"
+              return iteration_block(header, bind_code, body_code)
             when 'pairs'
               key_var = temp('key')
               value_var = temp('value')
@@ -126,12 +123,8 @@ module Kapusta
               bind_code, body_env = emit_iteration_bindings([[binding_pats[0], key_var], [binding_pats[1], value_var]],
                                                             body_env)
               body_code = yield(body_env)
-              return <<~RUBY.chomp
-                #{emit_expr(iter_expr.items[1], env, current_scope)}.each do |#{key_var}, #{value_var}|
-                  #{bind_code}
-                  #{body_code}
-                end
-              RUBY
+              header = "#{emit_expr(iter_expr.items[1], env, current_scope)}.each do |#{key_var}, #{value_var}|"
+              return iteration_block(header, bind_code, body_code)
             end
           end
 
@@ -141,27 +134,21 @@ module Kapusta
             body_env = env.child
             bind_code, body_env = emit_iteration_bindings([[binding_pats[0], value_var]], body_env)
             body_code = yield(body_env)
-            <<~RUBY.chomp
-              #{coll_code}.each do |#{value_var}|
-                #{bind_code}
-                #{body_code}
-              end
-            RUBY
+            iteration_block("#{coll_code}.each do |#{value_var}|", bind_code, body_code)
           else
             parts_var = temp('parts')
             body_env = env.child
             pairs = binding_pats.each_with_index.map { |pattern, i| [pattern, "#{parts_var}[#{i}]"] }
             bind_code, body_env = emit_iteration_bindings(pairs, body_env)
             body_code = yield(body_env)
-            <<~RUBY.chomp
-              #{coll_code}.each do |*#{parts_var}|
-                #{bind_code}
-                #{body_code}
-              end
-            RUBY
+            iteration_block("#{coll_code}.each do |*#{parts_var}|", bind_code, body_code)
           end
         end
 
+        def iteration_block(header, bind_code, body_code)
+          [header, indent(join_code(bind_code, body_code)), 'end'].join("\n")
+        end
+
         def emit_iteration_bindings(pairs, env)
           current_env = env
           codes = pairs.compact.map do |pattern, value_code|

data/lib/kapusta/compiler/emitter/expressions.rb

@@ -110,13 +110,17 @@ module Kapusta
         def emit_print(args, env, current_scope)
           return 'p' if args.empty?
 
-          "p(#{args.map { |arg| emit_expr(arg, env, current_scope) }.join(', ')})"
+          rendered = args.map { |arg| emit_expr(arg, env, current_scope) }
+          return "p #{rendered[0]}" if rendered.length == 1 && simple_expression?(rendered[0])
+
+          "p(#{rendered.join(', ')})"
         end
 
         def emit_string_part(arg, env, current_scope)
           return arg.inspect if arg.is_a?(String)
 
-          "(#{emit_expr(arg, env, current_scope)}).to_s"
+          code = emit_expr(arg, env, current_scope)
+          "#{simple_expression?(code) ? code : "(#{code})"}.to_s"
         end
       end
     end

data/lib/kapusta/compiler/emitter/interop.rb

@@ -24,13 +24,15 @@ module Kapusta
         def emit_colon(args, env, current_scope)
           receiver = emit_expr(args[0], env, current_scope)
           method_form = args[1]
-          positional, kwargs, block = split_call_args(args[2..], env, current_scope)
+          positional, kwargs, block_form = split_call_args(args[2..], env, current_scope)
           literal_name = method_form if method_form.is_a?(Symbol) || method_form.is_a?(String)
-          if literal_name && !kwargs && !block && direct_method_name?(literal_name.to_s)
-            return emit_direct_method_call(receiver, Kapusta.kebab_to_snake(literal_name.to_s), positional)
+          if literal_name && direct_method_name?(literal_name.to_s)
+            return emit_direct_method_call(receiver, Kapusta.kebab_to_snake(literal_name.to_s),
+                                           positional, kwargs, block_form, env, current_scope)
           end
 
           method_name = emit_method_name(method_form, env, current_scope)
+          block = emit_block_proc(block_form, env, current_scope)
           parts = build_call_args([method_name, *positional], kwargs, block)
           "#{parenthesize(receiver)}.public_send(#{parts})"
         end
@@ -163,7 +165,14 @@ module Kapusta
             end
           end
 
-          lines = ['begin', indent(emit_expr(args[0], env, current_scope))]
+          body_form = args[0]
+          body_code =
+            if body_form.is_a?(List) && body_form.head.is_a?(Sym) && body_form.head.name == 'do'
+              emit_sequence(body_form.rest, env, current_scope, allow_method_definitions: false).first
+            else
+              emit_expr(body_form, env, current_scope)
+            end
+          lines = ['begin', indent(body_code)]
           catches.each do |klass_form, bind_sym, body|
             rescue_env = env.child
             rescue_name = define_local(rescue_env, bind_sym.name)
@@ -246,7 +255,8 @@ module Kapusta
         end
 
         def emit_callable_call(callee_code, args, env, current_scope)
-          positional, kwargs, block = split_call_args(args, env, current_scope)
+          positional, kwargs, block_form = split_call_args(args, env, current_scope)
+          block = emit_block_proc(block_form, env, current_scope)
           rendered = build_call_args(positional, kwargs, block)
           suffix = rendered.empty? ? '.call' : ".call(#{rendered})"
           "#{parenthesize(callee_code)}#{suffix}"
@@ -281,12 +291,14 @@ module Kapusta
             emit_callable_call(base_code, args, env, current_scope)
           else
             receiver = emit_method_path(base_code, segments[0...-1])
-            positional, kwargs, block = split_call_args(args, env, current_scope)
-            if !kwargs && !block && direct_method_name?(segments.last)
-              return emit_direct_method_call(receiver, Kapusta.kebab_to_snake(segments.last), positional)
+            positional, kwargs, block_form = split_call_args(args, env, current_scope)
+            if direct_method_name?(segments.last)
+              return emit_direct_method_call(receiver, Kapusta.kebab_to_snake(segments.last),
+                                             positional, kwargs, block_form, env, current_scope)
             end
 
             method_name = Kapusta.kebab_to_snake(segments.last).to_sym.inspect
+            block = emit_block_proc(block_form, env, current_scope)
             parts = build_call_args([method_name, *positional], kwargs, block)
             "#{receiver}.public_send(#{parts})"
           end
@@ -303,25 +315,30 @@ module Kapusta
           end
         end
 
-        def emit_direct_method_call(receiver, method_name, positional)
-          args = positional.join(', ')
+        def emit_direct_method_call(receiver, method_name, positional, kwargs = nil,
+                                    block_form = nil, env = nil, current_scope = nil)
+          attached = block_form && emit_attached_block(block_form, env, current_scope)
+          block = block_form && !attached ? emit_block_proc(block_form, env, current_scope) : nil
+          parts = build_call_args(positional, kwargs, block)
           rendered_receiver = simple_expression?(receiver) ? receiver : parenthesize(receiver)
-          suffix = args.empty? ? method_name : "#{method_name}(#{args})"
-          "#{rendered_receiver}.#{suffix}"
+          call = parts.empty? ? method_name : "#{method_name}(#{parts})"
+          call = "#{call} #{attached}" if attached
+          "#{rendered_receiver}.#{call}"
         end
 
         def emit_self_call(name, args, env, current_scope)
-          positional, kwargs, block = split_call_args(args, env, current_scope)
+          positional, kwargs, block_form = split_call_args(args, env, current_scope)
+          block = emit_block_proc(block_form, env, current_scope)
           method_name = Kapusta.kebab_to_snake(name).to_sym.inspect
           parts = build_call_args([method_name, *positional], kwargs, block)
           "send(#{parts})"
         end
 
         def split_call_args(args, env, current_scope)
-          block = nil
+          block_form = nil
           remaining = args
           if !remaining.empty? && block_form?(remaining.last)
-            block = emit_expr(remaining.last, env, current_scope)
+            block_form = remaining.last
             remaining = remaining[0...-1]
           end
 
@@ -332,7 +349,24 @@ module Kapusta
             kwargs = nil
             positional = remaining.map { |arg| emit_expr(arg, env, current_scope) }
           end
-          [positional, kwargs, block]
+          [positional, kwargs, block_form]
+        end
+
+        def emit_block_proc(block_form, env, current_scope)
+          block_form && emit_expr(block_form, env, current_scope)
+        end
+
+        def emit_attached_block(block_form, env, current_scope)
+          return unless block_form.is_a?(List) && block_form.head.is_a?(Sym)
+          return unless %w[fn lambda λ].include?(block_form.head.name)
+
+          pattern = block_form.items[1]
+          return unless pattern.is_a?(Vec) && simple_parameter_pattern?(pattern)
+
+          body = block_form.items[2..]
+          params, body_code = build_simple_block_parts(pattern, body, env, current_scope)
+          header = params.empty? ? 'do' : "do |#{params.join(', ')}|"
+          [header, indent(body_code), 'end'].join("\n")
         end
 
         def emit_method_name(form, env, current_scope)
@@ -404,13 +438,17 @@ module Kapusta
 
         def simple_expression?(code)
           code.match?(/\A[a-z_]\w*\z/) ||
+            code.match?(/\A@@?[a-z_]\w*\z/) ||
+            code.match?(/\A\$[a-zA-Z_]\w*\z/) ||
             code.match?(/\A[A-Z]\w*(?:::[A-Z]\w*)*\z/) ||
             code.match?(/\A[a-z_]\w*[!?=]?\([^()\n]*\)\z/) ||
             code.match?(/\A\d+(?:\.\d+)?\z/) ||
             code.match?(/\A[a-z_]\w*(?:\.[a-z_]\w*[!?=]?(?:\([^()\n]*\))?|\[[^\[\]]*\])+\z/) ||
+            code.match?(/\A[A-Z]\w*(?:::[A-Z]\w*)*(?:\.[a-z_]\w*[!?=]?(?:\([^()\n]*\))?|\[[^\[\]]*\])+\z/) ||
             code.match?(/\A:[a-zA-Z_]\w*[!?=]?\z/) ||
             code.match?(/\A"(?:[^"\\]|\\.)*"\z/) ||
             code.match?(/\A'(?:[^'\\]|\\.)*'\z/) ||
+            code.match?(/\A\[[^\[\]\n]*\]\z/) ||
             %w[nil true false self].include?(code) ||
             negation_simple?(code)
         end

data/lib/kapusta/compiler/emitter/support.rb

@@ -266,8 +266,9 @@ module Kapusta
           until_code = until_form ? "break if #{emit_expr(until_form, loop_env, current_scope)}" : nil
           body = [until_code, body_code].compact.reject(&:empty?).join("\n")
           step_part = step_code == '1' ? '' : ", #{step_code}"
+          block_args = ruby_name == '_' ? '' : " |#{ruby_name}|"
           [
-            "#{parenthesize(start_code)}.step(#{finish_code}#{step_part}) do |#{ruby_name}|",
+            "#{parenthesize(start_code)}.step(#{finish_code}#{step_part}) do#{block_args}",
             indent(body),
             'end'
           ].join("\n")

data/lib/kapusta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kapusta
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Evgenii Morozov