kapusta 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85bcd0988a353fb851e5ff955c2b5196f39193e1c3c8fb6ca4a111d6260e774d
-  data.tar.gz: 80efbc138038947b866eaac96ef21d5cdccd04a461a25f2e17cbd7ce925ceaec
+  metadata.gz: 0ba2ee0fbbd336f3604e9c51014a458c0a54eefcb30939fc6f2a72ba25941fb6
+  data.tar.gz: 687f46ff98b74d65d523404ba9350fd62921eada8e105f4fe0d9215eac036118
 SHA512:
-  metadata.gz: 16d02e652b9221990ac027423e677a8f27c285d582c6bfb368f585140305e1c48dff5add4a8491a7996b5be99e34efd761e7fb280d8932fc6548622939b166b4
-  data.tar.gz: 8ab10f9991b7029d9366e47d434a9e9166568b870369f1fe585007fbe2cf9b750c84e8eb3b8fb015db255977eef80fd3255750fa99006d577a9564b640d84319
+  metadata.gz: 070c9c5f4435f2e825f0bdb70ceb25f3cc5eba62745cae80f9d348aa4fc886d74a5f8ed06a93a62d572adbfadfbce5e93b3e37993a5d637e68d615af6e1ecfa7
+  data.tar.gz: fc1697cfb31821c867c468666eee7bb3cd6af985c446cba8ea35e3c50c5928750a0989ce31c250d2c1d47f79b4f338e319a17cb00abb314c7213a1e3f2eb89e1

data/README.md

@@ -2,11 +2,9 @@
 
 Kapusta is a Lisp for the Ruby runtime.
 
-It is inspired by [Fennel](https://fennel-lang.org). It is not intended to be production-ready like Clojure: that would be a lot of work, and Ruby is already a rich, elegant language.
+It is inspired by [Fennel](https://fennel-lang.org). Kapusta aims to bring the simplicity and joy of Lisp to Ruby. Where Fennel uses Lua's stdlib and runtime, Kapusta uses Ruby's.
 
-Instead, Kapusta aims to bring some of the simplicity and joy of Lisp to Ruby. Where Fennel uses Lua's stdlib and runtime, Kapusta uses Ruby's. You can use it for small apps, LeetCode, DragonRuby, or maybe even Rails.
-
-For more information about Kapusta, see the official Fennel documentation and tutorials.
+For more information about Kapusta, see the official Fennel documentation and tutorials, but replace Lua with Ruby.
 
 ## Features
 
@@ -41,14 +39,14 @@ exe/kapusta examples/fizzbuzz.kap
 or
 
 ```
-exe/kapusta --compile examples/fizzbuzz.kap > examples/fizzbuzz.rb
+kapusta --compile examples/fizzbuzz.kap > examples/fizzbuzz.rb
 ruby examples/fizzbuzz.rb
 ```
 
-For mruby-compatible output, such as DragonRuby, use:
+For mruby 3 compatible output, such as DragonRuby, use:
 
 ```
-exe/kapusta --compile --target=mruby examples/match.kap > examples/match-mruby.rb
+kapusta --compile --target=mruby3 examples/match.kap > examples/match-mruby3.rb
 ```
 
 ## Use from Ruby
@@ -115,8 +113,8 @@ Kapusta-specific additions:
 - `ivar` or `@var` / `cvar` or `@@var` / `gvar` or `$var`
 - `try` / `catch` / `finally` plus `raise` for exceptions
 - `(ruby "...")` raw host escape hatch
-- a trailing symbol-keyed hash is emitted as Ruby keyword arguments
-- a final function literal argument is emitted as a Ruby block
+- pass Ruby keyword arguments by ending a call with a symbol-keyed hash: `(File.open path "r" {:encoding "UTF-8"})`
+- pass a Ruby block by ending a call with a `(fn ...)` or `#(...)` literal: `(File.open path "r" (fn [io] (: io :read)))`
 
 ## Format
 
@@ -130,7 +128,7 @@ Use `kapusta-ls` in the editor of your choice.
 
 ## Syntax highlight
 
-For Vim, you can use https://git.sr.ht/~m15a/vim-fennel-syntax
+For Vim, you can use [`vim-syntax/`](https://github.com/evmorov/kapusta/tree/main/vim-syntax/).
 
 ## License
 

data/lib/kapusta/cli.rb

@@ -39,7 +39,7 @@ module Kapusta
       OptionParser.new do |parser|
         parser.banner = usage
         parser.on('-c', '--compile', 'Compile .kap to Ruby') { options.compile = true }
-        parser.on('--target=TARGET', 'Compile for mruby') do |target|
+        parser.on('--target=TARGET', 'Compile for mruby3') do |target|
           options.target = Kapusta::Compiler.normalize_target(target)
         end
         parser.on('-h', '--help', 'Show this help') { options.help = true }
@@ -69,7 +69,7 @@ module Kapusta
     end
 
     def self.usage
-      'usage: kapusta [--compile|-c] [--target=mruby] <file.kap> | kapusta <file.kap> [args...]'
+      'usage: kapusta [--compile|-c] [--target=mruby3] <file.kap> | kapusta <file.kap> [args...]'
     end
   end
 end

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

@@ -178,7 +178,7 @@ module Kapusta
 
         def emit_toplevel_method_bridge(ruby_name)
           method_name = ruby_name.to_sym.inspect
-          if mruby_target?
+          if mruby3_target?
             return [
               "define_singleton_method(#{method_name}) do |*args|",
               indent("Object.instance_method(#{method_name}).bind(self).call(*args)"),

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

@@ -96,7 +96,7 @@ module Kapusta
         end
 
         def emit_case_body(value_var, clauses, env, current_scope, mode)
-          return try_emit_compat_case(value_var, clauses, env, current_scope, mode) if mruby_target?
+          return try_emit_compat_case(value_var, clauses, env, current_scope, mode) if mruby3_target?
 
           try_emit_native_case(value_var, clauses, env, current_scope, mode) ||
             try_emit_compat_case(value_var, clauses, env, current_scope, mode)

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

@@ -25,8 +25,8 @@ module Kapusta
           (@form_stack ||= []).last
         end
 
-        def mruby_target?
-          @target == :mruby
+        def mruby3_target?
+          @target == :mruby3
         end
 
         def positionable?(form)

data/lib/kapusta/compiler.rb

@@ -61,7 +61,7 @@ module Kapusta
     def self.normalize_target(target)
       case target
       when nil then nil
-      when :mruby, 'mruby' then :mruby
+      when :mruby3, 'mruby3', :mruby, 'mruby' then :mruby3
       else
         raise Error, Kapusta::Errors.format(:unknown_target, target: target.inspect)
       end

data/lib/kapusta/errors.rb

@@ -64,7 +64,7 @@ module Kapusta
       unexpected_eof: 'unexpected eof',
       unexpected_vararg: 'unexpected vararg',
       unknown_special_form: 'unknown special form: %{name}',
-      unknown_target: 'unknown target %{target}; only mruby is supported',
+      unknown_target: 'unknown target %{target}; only mruby3 is supported',
       unquote_outside_quasiquote: 'unquote outside quasiquote',
       unquote_splice_outside_list: 'unquote-splice must appear inside a quoted list/vec',
       unterminated_string: 'unterminated string',

data/lib/kapusta/version.rb

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

data/spec/cli_spec.rb

@@ -66,11 +66,11 @@ RSpec.describe Kapusta::CLI do
     end
   end
 
-  it 'compiles case and match forms for mruby with --target=mruby' do
+  it 'compiles case and match forms for mruby3 with --target=mruby3' do
     path = File.expand_path('../examples/match.kap', __dir__)
 
     ruby = capture_stdout do
-      described_class.start(['--compile', '--target=mruby', path])
+      described_class.start(['--compile', '--target=mruby3', path])
     end
 
     expect(ruby).not_to match(/^\s*in\b/)
@@ -98,14 +98,14 @@ RSpec.describe Kapusta::CLI do
         .to raise_error(SystemExit)
     end
 
-    expect(error_output).to include('unknown target "mri"; only mruby is supported')
+    expect(error_output).to include('unknown target "mri"; only mruby3 is supported')
   end
 
   it 'rejects target without compile mode' do
     path = File.expand_path('../examples/fizzbuzz.kap', __dir__)
 
     error_output = capture_stderr do
-      expect { described_class.start(['--target=mruby', path]) }
+      expect { described_class.start(['--target=mruby3', path]) }
         .to raise_error(SystemExit)
     end
 

data/spec/examples_spec.rb

@@ -446,7 +446,7 @@ RSpec.describe 'examples' do
 
   it 'underscore-patterns.kap on mruby keeps loose nil and strict fallback separate' do
     path = File.join(EXAMPLES_DIR, 'underscore-patterns.kap')
-    ruby = compile_example('underscore-patterns.kap', target: :mruby)
+    ruby = compile_example('underscore-patterns.kap', target: :mruby3)
 
     expect(run_mruby_source(ruby, path:)).to eq(<<~OUT)
       5
@@ -699,7 +699,7 @@ RSpec.describe 'mruby runtime examples' do
       if mruby_status.success? && mruby_stdout == expected
         expect(run_mruby_source(ruby, path:)).to eq(expected)
       else
-        mruby_ruby = compile_example(name, target: :mruby)
+        mruby_ruby = compile_example(name, target: :mruby3)
 
         if mruby_ruby == ruby
           expect(mruby_status).to be_success

metadata

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