kapusta 0.8.0 → 0.10.0

data/lib/kapusta/reader.rb

@@ -95,6 +95,8 @@ module Kapusta
         when '#' then read_hashfn
         when '`' then read_quasiquote
         when ',' then read_unquote
+        when '@' then peek_at(@pos + 1) == '@' ? read_sigil(:cvar, 2) : read_sigil(:ivar, 1)
+        when '$' then read_sigil(:gvar, 1)
         when *CLOSING_DELIMS then raise unexpected_closing_delim(peek)
         else
           read_atom
@@ -117,6 +119,32 @@ module Kapusta
       Quasiquote.new(read_form)
     end
 
+    def read_sigil(kind, prefix_length)
+      return read_atom unless sigil_id_start?(peek_at(@pos + prefix_length))
+
+      position = source_position
+      prefix_length.times { advance }
+      name_position = source_position
+      name_start = @pos
+      advance until delim?(peek) || peek == '.'
+      inner = Sym.new(@src[name_start...@pos])
+      inner.line = name_position[0]
+      inner.column = name_position[1]
+      list = List.new([Sym.new(kind.to_s), inner])
+      list.sigil = kind
+      list.line = position[0]
+      list.column = position[1]
+      list
+    end
+
+    def peek_at(pos)
+      @src[pos]
+    end
+
+    def sigil_id_start?(char)
+      !char.nil? && char.match?(/[A-Za-z_]/)
+    end
+
     def read_unquote
       advance
       if peek == '@'

data/lib/kapusta/version.rb

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

data/lib/kapusta.rb

@@ -23,8 +23,8 @@ module Kapusta
     self.eval(source, path:)
   end
 
-  def self.compile(source, path: '(eval)', **_opts)
-    Compiler.compile(source, path:)
+  def self.compile(source, path: '(eval)', target: nil, **_opts)
+    Compiler.compile(source, path:, target:)
   end
 
   def self.require(feature, relative_to: nil)

data/spec/cli_spec.rb

@@ -66,6 +66,19 @@ RSpec.describe Kapusta::CLI do
     end
   end
 
+  it 'compiles case and match forms for mruby with --target=mruby' do
+    path = File.expand_path('../examples/match.kap', __dir__)
+
+    ruby = capture_stdout do
+      described_class.start(['--compile', '--target=mruby', path])
+    end
+
+    expect(ruby).not_to match(/^\s*in\b/)
+    expect(ruby).not_to include('^(')
+    expect(ruby).to include("case\n")
+    expect(ruby).to include('when ')
+  end
+
   it 'rejects extra positional arguments in compile mode' do
     path = File.expand_path('../examples/fizzbuzz.kap', __dir__)
 
@@ -77,6 +90,28 @@ RSpec.describe Kapusta::CLI do
     expect(error_output).to include('usage: kapusta')
   end
 
+  it 'rejects unsupported targets' do
+    path = File.expand_path('../examples/fizzbuzz.kap', __dir__)
+
+    error_output = capture_stderr do
+      expect { described_class.start(['--compile', '--target=mri', path]) }
+        .to raise_error(SystemExit)
+    end
+
+    expect(error_output).to include('unknown target "mri"; only mruby 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]) }
+        .to raise_error(SystemExit)
+    end
+
+    expect(error_output).to include('--target requires --compile')
+  end
+
   it 'passes remaining arguments through to the Kapusta program' do
     path = File.expand_path('../examples/greet.kap', __dir__)
 

data/spec/examples_spec.rb

@@ -2,10 +2,21 @@
 
 require 'spec_helper'
 require 'fileutils'
+require 'open3'
 require 'stringio'
+require 'tempfile'
 
 EXAMPLES_DIR = File.expand_path('../examples', __dir__)
 
+def example_list(name)
+  File.readlines(File.join(EXAMPLES_DIR, name), chomp: true)
+      .reject(&:empty?)
+      .map { |example| "#{example}.kap" }
+      .freeze
+end
+
+MRUBY_RUNTIME_EXAMPLES = example_list('mruby-runtime-examples.txt')
+
 def run_example(name, argv: [])
   previous_argv = ARGV.dup
   previous_stdout = $stdout
@@ -27,6 +38,39 @@ ensure
   $stdout = previous_stdout
 end
 
+def compile_example(name, target: nil)
+  path = File.join(EXAMPLES_DIR, name)
+  Kapusta.compile(File.read(path), path:, target:)
+end
+
+def run_compiled_source(source, path:)
+  previous_argv = ARGV.dup
+  previous_stdout = $stdout
+  ARGV.replace([])
+  $stdout = StringIO.new
+  TOPLEVEL_BINDING.eval(source, path, 1)
+  $stdout.string
+ensure
+  $stdout = previous_stdout
+  ARGV.replace(previous_argv)
+end
+
+def run_mruby_source(source, path:)
+  stdout, stderr, status = capture_mruby_source(source, path:)
+
+  raise "mruby failed for #{path}:\n#{stderr}" unless status.success?
+
+  stdout
+end
+
+def capture_mruby_source(source, path:)
+  Tempfile.create([File.basename(path, '.kap'), '.rb']) do |file|
+    file.write(source)
+    file.close
+    Open3.capture3('mruby', file.path)
+  end
+end
+
 RSpec.describe 'examples' do
   it 'ackermann.kap' do
     expect(run_example('ackermann.kap')).to eq("9\n61\n")
@@ -36,6 +80,18 @@ RSpec.describe 'examples' do
     expect(run_example('accumulator.kap')).to eq("22\n")
   end
 
+  it 'account-lockout.kap' do
+    expect(run_example('account-lockout.kap')).to eq(<<~OUT)
+      :ok
+      :locked
+      :locked
+    OUT
+  end
+
+  it 'circle.kap' do
+    expect(run_example('circle.kap')).to eq("78.53975\n31.4159\n")
+  end
+
   it 'anagram.kap' do
     expect(run_example('anagram.kap')).to eq("true\ntrue\nfalse\n")
   end
@@ -107,6 +163,26 @@ RSpec.describe 'examples' do
     expect(run_example('happy-number.kap')).to eq("true\nfalse\ntrue\n")
   end
 
+  it 'number-of-1-bits.kap' do
+    expect(run_example('number-of-1-bits.kap')).to eq("3\n1\n31\n")
+  end
+
+  it 'number-of-steps.kap' do
+    expect(run_example('number-of-steps.kap')).to eq("6\n4\n12\n")
+  end
+
+  it 'convert-temperature.kap' do
+    expect(run_example('convert-temperature.kap')).to eq("309.65\n97.7\n395.26\n251.798\n")
+  end
+
+  it 'count-effects.kap' do
+    expect(run_example('count-effects.kap')).to eq("1\n2\n")
+  end
+
+  it 'max-achievable.kap' do
+    expect(run_example('max-achievable.kap')).to eq("6\n7\n10\n")
+  end
+
   it 'move-zeroes.kap' do
     expect(run_example('move-zeroes.kap')).to eq(<<~OUT)
       [1, 3, 12, 0, 0]
@@ -368,6 +444,18 @@ RSpec.describe 'examples' do
     OUT
   end
 
+  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)
+
+    expect(run_mruby_source(ruby, path:)).to eq(<<~OUT)
+      5
+      nil
+      5
+      "fallback"
+    OUT
+  end
+
   it 'scopes.kap' do
     expect(run_example('scopes.kap')).to eq("5\n9\n9\n9\n")
   end
@@ -563,4 +651,44 @@ RSpec.describe 'examples' do
   it 'macros-import-whole.kap' do
     expect(run_example('macros-import-whole.kap')).to eq("7\n")
   end
+
+  it 'parking-system.kap' do
+    expect(run_example('parking-system.kap')).to eq("true\ntrue\nfalse\nfalse\n")
+  end
+
+  it 'hit-counter.kap' do
+    expect(run_example('hit-counter.kap')).to eq(<<~OUT)
+      1
+      2
+      3
+      "alice"
+    OUT
+  end
+end
+
+RSpec.describe 'mruby runtime examples' do
+  MRUBY_RUNTIME_EXAMPLES.each do |name|
+    it name do
+      path = File.join(EXAMPLES_DIR, name)
+      ruby = compile_example(name)
+      expected = run_example(name)
+      expect(run_compiled_source(ruby, path:)).to eq(expected)
+      mruby_stdout, _mruby_stderr, mruby_status = capture_mruby_source(ruby, path:)
+
+      if mruby_status.success? && mruby_stdout == expected
+        expect(run_mruby_source(ruby, path:)).to eq(expected)
+      else
+        mruby_ruby = compile_example(name, target: :mruby)
+
+        if mruby_ruby == ruby
+          expect(mruby_status).to be_success
+        else
+          expect(mruby_ruby).not_to match(/^\s*in\b/)
+          expect(mruby_ruby).not_to include('^(')
+          expect(run_compiled_source(mruby_ruby, path:)).to eq(expected)
+          run_mruby_source(mruby_ruby, path:)
+        end
+      end
+    end
+  end
 end

data/spec/lsp_spec.rb

@@ -587,6 +587,92 @@ RSpec.describe Kapusta::LSP do
     end
   end
 
+  it 'renames an @ivar across methods within a class' do
+    text = "(class C)\n(fn one [] (set @counter 1))\n(fn two [] @counter)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **cursor_at(text, 'counter'), new_name: 'total')
+    )
+    changes = result_for(responses)['result']['documentChanges']
+
+    expect(changes.length).to eq(1)
+    edits = changes.first['edits']
+    expect(edits.map { |e| e['newText'] }).to eq(%w[total total])
+    expect(edits.map { |e| [e['range']['start']['line'], e['range']['start']['character']] })
+      .to contain_exactly([1, 17], [2, 12])
+  end
+
+  it 'renames @ivar without touching a same-named fn parameter or value reference' do
+    text = "(class C)\n(fn init [val] (set @counter val))\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **cursor_at(text, 'counter'), new_name: 'total')
+    )
+    changes = result_for(responses)['result']['documentChanges']
+
+    expect(changes.length).to eq(1)
+    edits = changes.first['edits']
+    expect(edits.length).to eq(1)
+    expect(edits.first['newText']).to eq('total')
+    expect(edits.first['range']['start']).to eq('line' => 1, 'character' => 21)
+  end
+
+  it 'renames a $gvar within a file' do
+    text = "(set $last 1)\n(print $last)\n"
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **cursor_at(text, 'last'), new_name: 'latest')
+    )
+    changes = result_for(responses)['result']['documentChanges']
+
+    expect(changes.length).to eq(1)
+    edits = changes.first['edits']
+    expect(edits.map { |e| e['newText'] }).to eq(%w[latest latest])
+  end
+
+  it 'keeps @x and @@x in separate sigil namespaces' do
+    text = "(class C)\n(set @@flag 1)\n(fn show [] (set @flag 2))\n"
+    ivar_position = { line: 2, character: 18 }
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_rename(uri: 'file:///x.kap', **ivar_position, new_name: 'mark')
+    )
+    changes = result_for(responses)['result']['documentChanges']
+
+    expect(changes.length).to eq(1)
+    edits = changes.first['edits']
+    expect(edits.length).to eq(1)
+    expect(edits.first['newText']).to eq('mark')
+    expect(edits.first['range']['start']).to eq('line' => 2, 'character' => 18)
+  end
+
+  it 'jumps to the first @@cvar binding from a later use site' do
+    text = "(class C)\n(set @@total 0)\n(fn add [] (set @@total (+ @@total 1)))\n"
+    use_index = text.rindex('@@total') + 2
+    prefix = text[0...use_index]
+    last_nl = prefix.rindex("\n")
+    pos = { line: prefix.count("\n"), character: last_nl ? use_index - last_nl - 1 : use_index }
+
+    responses = run(
+      frame_initialize,
+      frame_did_open('file:///x.kap', text),
+      frame_definition(uri: 'file:///x.kap', **pos)
+    )
+    result = result_for(responses)['result']
+
+    expect(result).to eq(
+      'uri' => 'file:///x.kap',
+      'range' => {
+        'start' => { 'line' => 1, 'character' => 7 },
+        'end' => { 'line' => 1, 'character' => 12 }
+      }
+    )
+  end
+
   it 'escapes file URIs built during workspace scans' do
     Dir.mktmpdir do |dir|
       nested = File.join(dir, 'space dir')

data/spec/spec_helper.rb

@@ -3,6 +3,15 @@
 require 'bundler/setup'
 require 'kapusta'
 
+module SilenceConstantRedefinitionWarnings
+  def warn(message, category: nil)
+    return if /already initialized constant|previous definition of/.match?(message)
+
+    super
+  end
+end
+Warning.singleton_class.prepend(SilenceConstantRedefinitionWarnings)
+
 RSpec.configure do |config|
   config.disable_monkey_patching!
   config.example_status_persistence_file_path = '.rspec_status'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -26,6 +26,7 @@ files:
 - bin/console
 - bin/fennel-parity
 - bin/setup
+- examples/account-lockout.kap
 - examples/accumulator.kap
 - examples/ackermann.kap
 - examples/anagram.kap
@@ -38,9 +39,12 @@ files:
 - examples/block-sort.kap
 - examples/blocks-and-kwargs.kap
 - examples/calc.kap
+- examples/circle.kap
 - examples/classify-wallet.kap
 - examples/climbing-stairs.kap
 - examples/contains-duplicate.kap
+- examples/convert-temperature.kap
+- examples/count-effects.kap
 - examples/counter.kap
 - examples/describe.kap
 - examples/destructure.kap
@@ -50,6 +54,8 @@ files:
 - examples/even-squares.kap
 - examples/exceptions.kap
 - examples/factorial.kap
+- examples/falling-drops.kap
+- examples/fennel-parity-examples.txt
 - examples/fib.kap
 - examples/files.kap
 - examples/fizzbuzz.kap
@@ -57,6 +63,7 @@ files:
 - examples/greet.kap
 - examples/happy-number.kap
 - examples/hashfn.kap
+- examples/hit-counter.kap
 - examples/import-helpers.kapm
 - examples/kwargs.kap
 - examples/leap-year.kap
@@ -73,14 +80,19 @@ files:
 - examples/majority-element.kap
 - examples/manhattan-distance.kap
 - examples/match.kap
+- examples/max-achievable.kap
 - examples/maximum-subarray.kap
 - examples/min-max.kap
 - examples/module-header.kap
 - examples/move-zeroes.kap
+- examples/mruby-runtime-examples.txt
+- examples/number-of-1-bits.kap
+- examples/number-of-steps.kap
 - examples/or-patterns.kap
 - examples/packet-router.kap
 - examples/palindrome.kap
 - examples/pangram.kap
+- examples/parking-system.kap
 - examples/pcall.kap
 - examples/pipeline.kap
 - examples/pivot-index.kap
@@ -103,6 +115,7 @@ files:
 - examples/stack.kap
 - examples/subtract-product-sum.kap
 - examples/sum.kap
+- examples/thread-styles.kap
 - examples/threading.kap
 - examples/tic-tac-toe.kap
 - examples/tset.kap