kapusta 0.1.4 → 0.2.0

data/spec/examples_spec.rb

@@ -18,6 +18,15 @@ ensure
   ARGV.replace(previous_argv)
 end
 
+def run_ruby_example(name)
+  previous_stdout = $stdout
+  $stdout = StringIO.new
+  load File.join(EXAMPLES_DIR, name)
+  $stdout.string
+ensure
+  $stdout = previous_stdout
+end
+
 RSpec.describe 'examples' do
   it 'ackermann.kap' do
     expect(run_example('ackermann.kap')).to eq("9\n61\n")
@@ -32,7 +41,21 @@ RSpec.describe 'examples' do
   end
 
   it 'anonymous-greeter.kap' do
-    expect(run_example('anonymous-greeter.kap')).to eq("Hello, anonymous!\nHello, Ada!\n")
+    expect(run_example('anonymous-greeter.kap')).to eq(<<~OUT)
+      "Hello, anonymous!"
+      "Hello, Ada!"
+    OUT
+  end
+
+  it 'bank-account.kap' do
+    expect(run_example('bank-account.kap')).to eq('')
+  end
+
+  it 'use_bank_account.rb' do
+    expect(run_ruby_example('use_bank_account.rb')).to eq(<<~OUT)
+      Owner:   Ada
+      Balance: 120
+    OUT
   end
 
   it 'calc.kap' do
@@ -51,12 +74,17 @@ RSpec.describe 'examples' do
     path = File.expand_path('../tmp/blocks-and-kwargs.txt', EXAMPLES_DIR)
     FileUtils.rm_f(path)
 
-    expect(run_example('blocks-and-kwargs.kap')).to eq("Ada\nLin\n2\n")
+    expect(run_example('blocks-and-kwargs.kap')).to eq(<<~'OUT')
+      "Ada\nLin"
+      2
+    OUT
     expect(File.exist?(path)).to eq(false)
   end
 
   it 'block-sort.kap' do
-    expect(run_example('block-sort.kap')).to eq("3, 2, 1\n")
+    expect(run_example('block-sort.kap')).to eq(<<~OUT)
+      "3, 2, 1"
+    OUT
   end
 
   it 'counter.kap' do
@@ -67,16 +95,59 @@ RSpec.describe 'examples' do
     expect(run_example('contains-duplicate.kap')).to eq("true\nfalse\ntrue\n")
   end
 
+  it 'climbing-stairs.kap' do
+    expect(run_example('climbing-stairs.kap')).to eq("2\n3\n8\n89\n")
+  end
+
+  it 'maximum-subarray.kap' do
+    expect(run_example('maximum-subarray.kap')).to eq("6\n1\n23\n")
+  end
+
+  it 'happy-number.kap' do
+    expect(run_example('happy-number.kap')).to eq("true\nfalse\ntrue\n")
+  end
+
+  it 'move-zeroes.kap' do
+    expect(run_example('move-zeroes.kap')).to eq(<<~OUT)
+      [1, 3, 12, 0, 0]
+      [0]
+      [1, 2, 3]
+    OUT
+  end
+
   it 'doto.kap' do
-    expect(run_example('doto.kap')).to eq("1, 2, 3\n")
+    expect(run_example('doto.kap')).to eq(<<~OUT)
+      "1, 2, 3"
+    OUT
+  end
+
+  it 'doto-hygiene.kap' do
+    expect(run_example('doto-hygiene.kap')).to eq(<<~OUT)
+      "[99]"
+    OUT
   end
 
   it 'describe.kap' do
-    expect(run_example('describe.kap')).to eq("-3\tnegative\n0\tzero\n1\tone\n2\tmany\n99\tmany\n")
+    expect(run_example('describe.kap')).to eq(<<~OUT)
+      -3
+      "negative"
+      0
+      "zero"
+      1
+      "one"
+      2
+      "many"
+      99
+      "many"
+    OUT
   end
 
   it 'destructure.kap' do
-    expect(run_example('destructure.kap')).to eq("6\nAda\t36\n")
+    expect(run_example('destructure.kap')).to eq(<<~OUT)
+      6
+      "Ada"
+      36
+    OUT
   end
 
   it 'egg-count.kap' do
@@ -84,22 +155,43 @@ RSpec.describe 'examples' do
   end
 
   it 'even-squares.kap' do
-    expect(run_example('even-squares.kap')).to eq("4, 16, 36\n")
+    expect(run_example('even-squares.kap')).to eq(<<~OUT)
+      "4, 16, 36"
+    OUT
   end
 
   it 'exceptions.kap' do
-    expect(run_example('exceptions.kap')).to eq("seen: 12\n12\nseen: oops\nbad: oops\n")
+    expect(run_example('exceptions.kap')).to eq(<<~OUT)
+      "seen: 12"
+      12
+      "seen: oops"
+      "bad: oops"
+    OUT
   end
 
   it 'factorial.kap' do
-    expect(run_example('factorial.kap')).to eq("0\t1\n1\t1\n5\t120\n6\t720\n10\t3628800\n")
+    expect(run_example('factorial.kap')).to eq(<<~OUT)
+      0
+      1
+      1
+      1
+      5
+      120
+      6
+      720
+      10
+      3628800
+    OUT
   end
 
   it 'files.kap' do
     path = File.expand_path('../tmp/file-io-example.txt', EXAMPLES_DIR)
     FileUtils.rm_f(path)
 
-    expect(run_example('files.kap')).to eq("Ada\nLin\n2\n")
+    expect(run_example('files.kap')).to eq(<<~'OUT')
+      "Ada\nLin"
+      2
+    OUT
     expect(File.exist?(path)).to eq(false)
   end
 
@@ -108,7 +200,28 @@ RSpec.describe 'examples' do
   end
 
   it 'fizzbuzz.kap' do
-    expected = "1\n2\nFizz\n4\nBuzz\nFizz\n7\n8\nFizz\nBuzz\n11\nFizz\n13\n14\nFizzBuzz\n16\n17\nFizz\n19\nBuzz\n"
+    expected = <<~OUT
+      1
+      2
+      "Fizz"
+      4
+      "Buzz"
+      "Fizz"
+      7
+      8
+      "Fizz"
+      "Buzz"
+      11
+      "Fizz"
+      13
+      14
+      "FizzBuzz"
+      16
+      17
+      "Fizz"
+      19
+      "Buzz"
+    OUT
     expect(run_example('fizzbuzz.kap')).to eq(expected)
   end
 
@@ -117,7 +230,9 @@ RSpec.describe 'examples' do
   end
 
   it 'greet.kap' do
-    expect(run_example('greet.kap', argv: ['Ada'])).to eq("Hello, Ada!\n")
+    expect(run_example('greet.kap', argv: ['Ada'])).to eq(<<~OUT)
+      "Hello, Ada!"
+    OUT
   end
 
   it 'hashfn.kap' do
@@ -125,27 +240,49 @@ RSpec.describe 'examples' do
   end
 
   it 'inheritance.kap' do
-    expect(run_example('inheritance.kap')).to eq("true\tanimalia\tPoppy the dog\twoof\n")
+    expect(run_example('inheritance.kap')).to eq(<<~OUT)
+      true
+      "animalia"
+      "Poppy the dog"
+      "woof"
+    OUT
   end
 
   it 'leap-year.kap' do
     expect(run_example('leap-year.kap')).to eq("true\n")
   end
 
+  it 'length-of-last-word.kap' do
+    expect(run_example('length-of-last-word.kap')).to eq("5\n4\n6\n")
+  end
+
   it 'min-max.kap' do
-    expect(run_example('min-max.kap')).to eq("1\t9\n")
+    expect(run_example('min-max.kap')).to eq(<<~OUT)
+      1
+      9
+    OUT
   end
 
   it 'module-header.kap' do
-    expect(run_example('module-header.kap')).to eq("Hello, Ada!\n")
+    expect(run_example('module-header.kap')).to eq(<<~OUT)
+      "Hello, Ada!"
+    OUT
   end
 
   it 'pipeline.kap' do
-    expect(run_example('pipeline.kap')).to eq("BLUE\nRED\n")
+    expect(run_example('pipeline.kap')).to eq(<<~OUT)
+      "BLUE"
+      "RED"
+    OUT
   end
 
   it 'points.kap' do
-    expect(run_example('points.kap')).to eq("origin\ny-axis\nx-axis\npoint\n")
+    expect(run_example('points.kap')).to eq(<<~OUT)
+      "origin"
+      "y-axis"
+      "x-axis"
+      "point"
+    OUT
   end
 
   it 'primes.kap' do
@@ -153,44 +290,74 @@ RSpec.describe 'examples' do
   end
 
   it 'raindrops.kap' do
-    expect(run_example('raindrops.kap')).to eq("PlingPlang\n")
+    expect(run_example('raindrops.kap')).to eq(<<~OUT)
+      "PlingPlang"
+    OUT
   end
 
   it 'record.kap' do
-    expect(run_example('record.kap')).to eq("Ada / engineer / ruby, lisp\n")
+    expect(run_example('record.kap')).to eq(<<~OUT)
+      "Ada / engineer / ruby, lisp"
+    OUT
   end
 
   it 'regex.kap' do
-    expected = <<~OUT
-      2026-04-23 -> {"year"=>"2026", "month"=>"04", "day"=>"23"}
-      hello -> nil
-      1999-12-31 -> {"year"=>"1999", "month"=>"12", "day"=>"31"}
-    OUT
+    first = { 'year' => '2026', 'month' => '04', 'day' => '23' }
+    last = { 'year' => '1999', 'month' => '12', 'day' => '31' }
+    expected = [
+      "2026-04-23 -> #{first}".inspect,
+      'hello -> '.inspect,
+      "1999-12-31 -> #{last}".inspect
+    ].map { |line| "#{line}\n" }.join
     expect(run_example('regex.kap')).to eq(expected)
   end
 
   it 'ruby-eval.kap' do
-    expect(run_example('ruby-eval.kap')).to eq("10-20-30\n")
+    expect(run_example('ruby-eval.kap')).to eq(<<~OUT)
+      "10-20-30"
+    OUT
   end
 
   it 'kwargs.kap' do
-    expect(run_example('kwargs.kap')).to eq("Ada has 3 tasks\n")
+    expect(run_example('kwargs.kap')).to eq(<<~OUT)
+      "Ada has 3 tasks"
+    OUT
   end
 
   it 'match.kap' do
-    expect(run_example('match.kap')).to eq("Ada: 9\nLin: no score\nunknown\n")
+    expect(run_example('match.kap')).to eq(<<~OUT)
+      "Ada: 9"
+      "Lin: no score"
+      "unknown"
+    OUT
   end
 
   it 'packet-router.kap' do
-    expect(run_example('packet-router.kap')).to eq("score:9\nother\ncity:nil\n5\n0\nping:7\n")
+    expect(run_example('packet-router.kap')).to eq(<<~OUT)
+      "score:9"
+      "other"
+      "city:nil"
+      5
+      0
+      "ping:7"
+    OUT
   end
 
   it 'or-patterns.kap' do
-    expect(run_example('or-patterns.kap')).to eq("1:2\n2:1\nother\n")
+    expect(run_example('or-patterns.kap')).to eq(<<~OUT)
+      "1:2"
+      "2:1"
+      "other"
+    OUT
   end
 
   it 'underscore-patterns.kap' do
-    expect(run_example('underscore-patterns.kap')).to eq("5\nnil\n5\nfallback\n")
+    expect(run_example('underscore-patterns.kap')).to eq(<<~OUT)
+      5
+      nil
+      5
+      "fallback"
+    OUT
   end
 
   it 'scopes.kap' do
@@ -198,13 +365,13 @@ RSpec.describe 'examples' do
   end
 
   it 'pcall.kap' do
-    expected = <<~OUT
+    expected = <<~'OUT'
       true
       12
       false
       ArgumentError
       false
-      invalid value for Integer(): "oops"
+      "invalid value for Integer(): \"oops\""
     OUT
     expect(run_example('pcall.kap')).to eq(expected)
   end
@@ -218,7 +385,10 @@ RSpec.describe 'examples' do
   end
 
   it 'safe-lookup.kap' do
-    expect(run_example('safe-lookup.kap')).to eq("Ada\nnil\n")
+    expect(run_example('safe-lookup.kap')).to eq(<<~OUT)
+      "Ada"
+      nil
+    OUT
   end
 
   it 'shapes.kap' do
@@ -230,7 +400,12 @@ RSpec.describe 'examples' do
   end
 
   it 'stack.kap' do
-    expect(run_example('stack.kap')).to eq('')
+    expect(run_example('stack.kap')).to eq(<<~OUT)
+      -3
+      0
+      -2
+      true
+    OUT
   end
 
   it 'sum.kap' do
@@ -238,74 +413,46 @@ RSpec.describe 'examples' do
   end
 
   it 'tset.kap' do
-    expect(run_example('tset.kap')).to eq("{:name=>\"Ada\", :city=>\"Amsterdam\"}\nAmsterdam\n")
+    person = { name: 'Ada', city: 'Amsterdam' }
+    expect(run_example('tset.kap')).to eq("#{person.inspect}\n#{'Amsterdam'.inspect}\n")
   end
 
   it 'two-sum.kap' do
     expect(run_example('two-sum.kap')).to eq("[0, 1]\n[1, 2]\nnil\n")
   end
 
-  it 'threading.kap' do
-    expect(run_example('threading.kap')).to eq("[Ada Lovelace]!\t<Ada!>\tnil\tATSUPAK\tnil\n")
-  end
-
-  it 'tic-tac-toe.kap' do
-    expect(run_example('tic-tac-toe.kap')).to eq("X\nO\nX\ndraw\n")
+  it 'two-sum-hash.kap' do
+    expect(run_example('two-sum-hash.kap')).to eq("[0, 1]\n[1, 2]\nnil\n")
   end
-end
 
-RSpec.describe Kapusta do
-  it 'exposes a gem version' do
-    expect(Kapusta::VERSION).to match(/\A\d+\.\d+\.\d+\z/)
+  it 'baseball-game.kap' do
+    expect(run_example('baseball-game.kap')).to eq("30\n27\n")
   end
 
-  it 'defaults classes to Object when the superclass is omitted' do
-    source = <<~KAP
-      (let [klass (class Stack
-                    (fn initialize []
-                      nil))]
-        (values (= Stack.superclass Object)
-                (= (Stack.new.class) Stack)
-                (= klass Stack)))
-    KAP
-
-    expect(Kapusta.eval(source)).to eq([true, true, true])
+  it 'valid-parentheses-1.kap' do
+    expect(run_example('valid-parentheses-1.kap')).to eq('')
   end
 
-  it 'still accepts an explicit superclass vector' do
-    source = <<~KAP
-      (let [klass (class KapustaError [StandardError])]
-        (values (= KapustaError.superclass StandardError)
-                (= klass KapustaError)))
-    KAP
-
-    expect(Kapusta.eval(source)).to eq([true, true])
+  it 'valid-parentheses-2.kap' do
+    expect(run_example('valid-parentheses-2.kap')).to eq("true\ntrue\ntrue\nfalse\nfalse\n")
   end
 
-  it 'preserves nested arithmetic precedence' do
-    source = <<~KAP
-      (values (/ (+ 3 5) 2)
-              (* (+ 1 2) (- 10 4))
-              (% (+ 10 5) 4))
-    KAP
-
-    expect(Kapusta.eval(source)).to eq([4, 18, 3])
-  end
-
-  it 'supports postfix zero-arg method calls on non-symbol expressions' do
-    source = <<~KAP
-      (values [1 2].inspect
-              (+ 1 2).inspect
-              "Listen".downcase.chars.sort.join)
-    KAP
-
-    expect(Kapusta.eval(source)).to eq(['[1, 2]', '3', 'eilnst'])
+  it 'threading.kap' do
+    expect(run_example('threading.kap')).to eq(<<~OUT)
+      "[Ada Lovelace]!"
+      "<Ada!>"
+      nil
+      "ATSUPAK"
+      nil
+    OUT
   end
-end
 
-RSpec.describe 'errors' do
-  it 'raises on unclosed list' do
-    expect { Kapusta.eval('(fn hello [name] (.. "Hi " name "!")') }
-      .to raise_error(Kapusta::Reader::Error, /unclosed \(/)
+  it 'tic-tac-toe.kap' do
+    expect(run_example('tic-tac-toe.kap')).to eq(<<~OUT)
+      "X"
+      "O"
+      "X"
+      "draw"
+    OUT
   end
 end

data/spec/reader_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Kapusta::Reader do
+  describe 'error messages' do
+    it 'reports unexpected closing delimiters with their source position' do
+      expect { Kapusta.eval('(print 1))') }
+        .to raise_error(Kapusta::Reader::Error,
+                        /unexpected closing delimiter '\)' at line 1, column 10/)
+    end
+
+    it 'reports unclosed opening delimiters with their source position' do
+      cases = {
+        '(print 1' => /unclosed opening delimiter '\(' at line 1, column 1/,
+        '[1 2' => /unclosed opening delimiter '\[' at line 1, column 1/,
+        '{:name "A"' => /unclosed opening delimiter '\{' at line 1, column 1/
+      }
+
+      cases.each do |source, message|
+        expect { Kapusta.eval(source) }
+          .to raise_error(Kapusta::Reader::Error, message)
+      end
+    end
+  end
+end

metadata

@@ -1,17 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Evgenii Morozov
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Kapusta is a Lisp for the Ruby runtime.
-email:
 executables:
 - kapfmt
 - kapusta
@@ -22,21 +20,26 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/compile-examples
 - bin/console
 - bin/setup
 - examples/accumulator.kap
 - examples/ackermann.kap
 - examples/anagram.kap
 - examples/anonymous-greeter.kap
+- examples/bank-account.kap
+- examples/baseball-game.kap
 - examples/binary-search.kap
 - examples/binary-to-decimal.kap
 - examples/block-sort.kap
 - examples/blocks-and-kwargs.kap
 - examples/calc.kap
+- examples/climbing-stairs.kap
 - examples/contains-duplicate.kap
 - examples/counter.kap
 - examples/describe.kap
 - examples/destructure.kap
+- examples/doto-hygiene.kap
 - examples/doto.kap
 - examples/egg-count.kap
 - examples/even-squares.kap
@@ -47,13 +50,17 @@ files:
 - examples/fizzbuzz.kap
 - examples/gcd.kap
 - examples/greet.kap
+- examples/happy-number.kap
 - examples/hashfn.kap
 - examples/inheritance.kap
 - examples/kwargs.kap
 - examples/leap-year.kap
+- examples/length-of-last-word.kap
 - examples/match.kap
+- examples/maximum-subarray.kap
 - examples/min-max.kap
 - examples/module-header.kap
+- examples/move-zeroes.kap
 - examples/or-patterns.kap
 - examples/packet-router.kap
 - examples/palindrome.kap
@@ -75,8 +82,12 @@ files:
 - examples/threading.kap
 - examples/tic-tac-toe.kap
 - examples/tset.kap
+- examples/two-sum-hash.kap
 - examples/two-sum.kap
 - examples/underscore-patterns.kap
+- examples/use_bank_account.rb
+- examples/valid-parentheses-1.kap
+- examples/valid-parentheses-2.kap
 - exe/kapfmt
 - exe/kapusta
 - kapusta.gemspec
@@ -103,6 +114,7 @@ files:
 - spec/cli_spec.rb
 - spec/examples_spec.rb
 - spec/formatter_spec.rb
+- spec/reader_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/evmorov/kapusta
 licenses: []
@@ -111,7 +123,6 @@ metadata:
   homepage_uri: https://github.com/evmorov/kapusta
   source_code_uri: https://github.com/evmorov/kapusta
   bug_tracker_uri: https://github.com/evmorov/kapusta/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,8 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Lisp for the Ruby runtime
 test_files: []