kapusta 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9b062de9860ef3b9f3cfcbac8503e69c1549f0f09af35b41e5eb13303c1ddb
-  data.tar.gz: daa87e0b3b65dfc82f21ff47e88b41652d05f087e46320ca1c3f49bac2457b71
+  metadata.gz: 1a5fcd922c54b5fa491785e6087c4fc2f8e6de1a8d94deab10fca3f775518b9b
+  data.tar.gz: d95f4bce9e6673104c44fc0ff281a705e796797490285cc50ef509b6b9fe5e97
 SHA512:
-  metadata.gz: 564c441ea9395cd4f28daaa631de6022e39125eede47032bf32bbc2a45f18979b7376f264b5302459b78403ef039ef8aca93e6f469cc0666b033f6e6717894a2
-  data.tar.gz: 38479cb8d38b81df15697a56c1a14e63d4dda7a0dd793db4e121e06126395339d9c7676a4bb14411a6b43398b64196f877ce3126990eb07d24f2a0c769a577e2
+  metadata.gz: cb5ba4420166be83a152c22bf56a12563efdb8cc64e54f230f6d299051761c5abc2329ae42dfc5e6127a721f66250b9804d6ec86a9b053dc36282599b2f8c986
+  data.tar.gz: 334d34e9e47bdecf6a4aa35cc6e905770efb6913fa6c2e9f90b0f3b1a95915b9044c8e3f36c81778a865f91a6d43f675318bf1ae892e19292cb4a2d2de179685

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/examples/anagram.kap

@@ -1,8 +1,8 @@
 (fn normalize-word [word]
-  (let [lower (word.downcase)
-        chars (lower.chars)
-        sorted (chars.sort)]
-    (sorted.join)))
+  (-> word
+      (: :downcase)
+      (: :chars)
+      (: :sort)))
 
 (fn anagram? [a b]
   (= (normalize-word a)

data/examples/baseball-game.kap

@@ -4,7 +4,7 @@
       (if (= op "C") (do (-?> (scores.pop) (: :abs)) nil)
           (= op "D") (scores.push (* 2 (. scores -1)))
           (= op "+") (scores.push (+ (. scores -1) (. scores -2)))
-          (scores.push (Integer op))))
+          (scores.push (: op :to-i))))
     scores.sum))
 
 (print (cal-points ["5" "2" "C" "D" "+"]))

data/examples/exceptions.kap

@@ -1,7 +1,7 @@
 (fn require-score [s]
   (if (= s "oops")
       (raise (ArgumentError.new "not a number"))
-      (Integer s)))
+      (: s :to-i)))
 
 (fn parse-score [s]
   (try (require-score s)

data/examples/pcall.kap

@@ -1,6 +1,9 @@
-(let [[ok value] (pcall Integer "12")
-      [bad-ok error] (pcall Integer "oops")
-      [handled-ok handled] (xpcall Integer (fn [e] (e.message)) "oops")]
+(fn parse-int [s]
+  (: Kernel :Integer s))
+
+(let [[ok value] (pcall parse-int "12")
+      [bad-ok error] (pcall parse-int "oops")
+      [handled-ok handled] (xpcall parse-int (fn [e] (e.message)) "oops")]
   (print ok)
   (print value)
   (print bad-ok)

data/examples/raindrops.kap

@@ -7,7 +7,7 @@
   (when (div? n 5) (add-drop "Plang"))
   (when (div? n 7) (add-drop "Plong"))
   (if (empty? drops)
-      (tostring n)
+      (: n :to-s)
       (drops.join)))
 
 (print (raindrops 15))

data/examples/single-number.kap

@@ -0,0 +1,7 @@
+(fn single-number [nums]
+  (accumulate [acc 0 _ n (ipairs nums)]
+    (: acc :^ n)))
+
+(print (single-number [2 2 1]))
+(print (single-number [4 1 2 1 2]))
+(print (single-number [1]))

data/kapusta.gemspec

@@ -7,13 +7,13 @@ Gem::Specification.new do |spec|
   spec.version = Kapusta::VERSION
   spec.authors = ['Evgenii Morozov']
   spec.homepage = 'https://github.com/evmorov/kapusta'
+  spec.license = 'MIT'
 
   spec.summary = 'A Lisp for the Ruby runtime'
   spec.description = 'Kapusta is a Lisp for the Ruby runtime.'
   spec.required_ruby_version = '>= 3.1'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
-  spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues"
 

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)
@@ -242,7 +242,7 @@ module Kapusta
           body_code, = emit_sequence(body, child_env, current_scope,
                                      allow_method_definitions: false,
                                      result:)
-          [binding_codes.join("\n"), body_code]
+          [binding_codes.reject(&:empty?).join("\n"), body_code]
         end
 
         def join_code(*chunks)
@@ -258,7 +258,7 @@ module Kapusta
             ["#{ruby_name} = #{value_code}\nnil", env]
           else
             bind_code, env = emit_pattern_bind(target, value_code, env)
-            ["#{bind_code}\nnil", env]
+            [join_code(bind_code, 'nil'), env]
           end
         end
 

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|
@@ -169,7 +156,7 @@ module Kapusta
 
             code, current_env = emit_pattern_bind(pattern, value_code, current_env)
             code
-          end.compact
+          end.compact.reject(&:empty?)
           [codes.join("\n"), current_env]
         end
 

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

@@ -21,20 +21,37 @@ module Kapusta
           runtime_call(:qget_path, object_code, "[#{keys}]")
         end
 
+        BINARY_OPERATOR_METHODS = %w[<=> ** << >> & | ^ === =~].freeze
+        private_constant :BINARY_OPERATOR_METHODS
+
         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 && binary_operator_call?(literal_name.to_s, positional, kwargs, block_form)
+            return emit_binary_operator_call(receiver, literal_name.to_s, positional[0])
+          end
+          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
 
+        def binary_operator_call?(name, positional, kwargs, block_form)
+          BINARY_OPERATOR_METHODS.include?(name) &&
+            positional.length == 1 && !kwargs && !block_form
+        end
+
+        def emit_binary_operator_call(receiver, operator, arg_code)
+          "#{parenthesize(receiver)} #{operator} #{parenthesize(arg_code)}"
+        end
+
         def emit_require(arg, env, current_scope)
           path_code =
             case arg
@@ -163,7 +180,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)
@@ -209,6 +233,9 @@ module Kapusta
         def emit_compare(args, env, current_scope, operator)
           values = args.map { |arg| emit_expr(arg, env, current_scope) }
           return 'true' if values.length <= 1
+          if (nil_pred = nil_predicate(args, values, operator, negate: false))
+            return nil_pred
+          end
 
           (0...(values.length - 1)).map do |i|
             "#{parenthesize(values[i])} #{operator} #{parenthesize(values[i + 1])}"
@@ -218,12 +245,27 @@ module Kapusta
         def emit_compare_any(args, env, current_scope, operator)
           values = args.map { |arg| emit_expr(arg, env, current_scope) }
           return 'false' if values.length <= 1
+          if (nil_pred = nil_predicate(args, values, operator, negate: true))
+            return nil_pred
+          end
 
           (0...(values.length - 1)).map do |i|
             "#{parenthesize(values[i])} #{operator} #{parenthesize(values[i + 1])}"
           end.join(' || ')
         end
 
+        def nil_predicate(args, values, operator, negate:)
+          return unless args.length == 2
+          return unless (operator == '==' && !negate) || (operator == '!=' && negate)
+
+          nil_idx = args.find_index(&:nil?)
+          return unless nil_idx
+
+          other = values[1 - nil_idx]
+          receiver = simple_expression?(other) ? other : parenthesize(other)
+          "#{'!' if negate}#{receiver}.nil?"
+        end
+
         def emit_reduce(args, env, current_scope, empty_value, operator)
           return empty_value if args.empty?
 
@@ -246,7 +288,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 +324,17 @@ 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 binary_operator_call?(segments.last, positional, kwargs, block_form)
+              return emit_binary_operator_call(receiver, segments.last, positional[0])
+            end
+            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 +351,43 @@ 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)
-          method_name = Kapusta.kebab_to_snake(name).to_sym.inspect
+          positional, kwargs, block_form = split_call_args(args, env, current_scope)
+          snake = Kapusta.kebab_to_snake(name)
+          if direct_method_name?(snake)
+            return emit_direct_self_call(snake, positional, kwargs, block_form, env, current_scope)
+          end
+
+          block = emit_block_proc(block_form, env, current_scope)
+          method_name = snake.to_sym.inspect
           parts = build_call_args([method_name, *positional], kwargs, block)
-          "send(#{parts})"
+          "public_send(#{parts})"
+        end
+
+        def emit_direct_self_call(method_name, positional, kwargs, block_form, env, current_scope)
+          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)
+          call = parts.empty? ? "#{method_name}()" : "#{method_name}(#{parts})"
+          attached ? "#{call} #{attached}" : call
         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 +398,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 +487,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/patterns.rb

@@ -8,7 +8,7 @@ module Kapusta
 
         def emit_pattern_bind(pattern, value_code, env)
           if pattern.is_a?(Sym)
-            return ['nil', env] if pattern.name == '_'
+            return ['', env] if pattern.name == '_'
 
             ruby_name = define_local(env, pattern)
             ["#{ruby_name} = #{value_code}", env]

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.3'
 end

data/spec/examples_spec.rb

@@ -399,6 +399,10 @@ RSpec.describe 'examples' do
     expect(run_example('shapes.kap')).to eq("78.5\n9\n8\n0\n")
   end
 
+  it 'single-number.kap' do
+    expect(run_example('single-number.kap')).to eq("1\n4\n1\n")
+  end
+
   it 'squares.kap' do
     expect(run_example('squares.kap')).to eq("1\n4\n9\n16\n25\n")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -80,6 +80,7 @@ files:
 - examples/safe-lookup.kap
 - examples/scopes.kap
 - examples/shapes.kap
+- examples/single-number.kap
 - examples/squares.kap
 - examples/stack.kap
 - examples/sum.kap
@@ -123,10 +124,10 @@ files:
 - spec/reader_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/evmorov/kapusta
-licenses: []
+licenses:
+- MIT
 metadata:
   rubygems_mfa_required: 'true'
-  homepage_uri: https://github.com/evmorov/kapusta
   source_code_uri: https://github.com/evmorov/kapusta
   bug_tracker_uri: https://github.com/evmorov/kapusta/issues
 rdoc_options: []