kapusta 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64991d78295bfc4a633136af86607f2d9536f3e113ae9ea819a0c5708837427
-  data.tar.gz: 0d656fcf3afefbb2c89acad7a0fa4de8a57f8a484c2ce887e5bc70e7493c71ea
+  metadata.gz: 520158590f1244ac17f70b58ded945f66be00060f6da89cebb366fefaf27b62e
+  data.tar.gz: 6773e0faa320f23cb15106e710f380a39093c9fc6e56cead8941c28e0ccf16c5
 SHA512:
-  metadata.gz: a27e51a26db8069c998d7e0b586beb4fda1505c2f13f572b82bbbda92bc79dbe6e3d4e308547877a0e455cd56b5c9f1c226830ca2645664dae65b47b552dc3a1
-  data.tar.gz: e6e675b9be4492d7bf75e341915bfd5e022a733240a2b7c4139c2904a99577207a7b4d182208ad1706c31bcded3ebaf3a50e03d18f27eafc68373b96141ae8b0
+  metadata.gz: 814d37c473287d2d1e54568c7d21c22d88703cd89da761100c1f20950e47cb18eb2ac4807aa596878ded72eb7049a6083d2b9de46bc76ce2ea55787f6993f61f
+  data.tar.gz: 3a15fc05522e617cf46e8709a55dc8497252503f2b995dffaa4f8995fc34a54e9bcc2a711cd501884203bf0113c7924f159377459de8f2524e9c371c018d8238

data/README.md

@@ -104,7 +104,7 @@ Kapusta keeps most core Fennel forms. The main differences come from Ruby's runt
 Kapusta-specific additions:
 
 - `module` and `class` for Ruby host structure, including file-header forms
-- `ivar` (`@var`) / `cvar` (`@@var`) / `gvar` (`$var`) escape hatches
+- `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

data/bin/fennel-parity

@@ -43,6 +43,7 @@ COMPATIBLE = %w[
   shapes.kap
   squares.kap
   sum.kap
+  thread-styles.kap
   tic-tac-toe.kap
   underscore-patterns.kap
 ].freeze

data/examples/hit-counter.kap

@@ -0,0 +1,17 @@
+(class HitCounter)
+
+(set @@total 0)
+
+(fn initialize [name] (set @name name))
+
+(fn hit []
+  (set @@total (+ @@total 1))
+  (set $last-hitter @name)
+  @@total)
+
+(let [a (HitCounter.new "alice")
+      b (HitCounter.new "bob")]
+  (print (a.hit))
+  (print (b.hit))
+  (print (a.hit))
+  (print $last-hitter))

data/examples/parking-system.kap

@@ -0,0 +1,18 @@
+(class ParkingSystem)
+
+(fn initialize [big medium small]
+  (set @big big)
+  (set @medium medium)
+  (set @small small))
+
+(fn add-car [car-type]
+  (if (and (= car-type 1) (> @big 0)) (do (set @big (- @big 1)) true)
+      (and (= car-type 2) (> @medium 0)) (do (set @medium (- @medium 1)) true)
+      (and (= car-type 3) (> @small 0)) (do (set @small (- @small 1)) true)
+      false))
+
+(let [parking (ParkingSystem.new 1 1 0)]
+  (print (parking.add-car 1))
+  (print (parking.add-car 2))
+  (print (parking.add-car 3))
+  (print (parking.add-car 1)))

data/examples/thread-styles.kap

@@ -0,0 +1,41 @@
+(fn positive? [n] (> n 0))
+(fn square [n] (* n n))
+(fn add [x y] (+ x y))
+(fn mul [x y] (* x y))
+(fn nonzero [n] (if (= n 0) nil n))
+(fn non-empty [s] (if (= s "") nil s))
+(fn wrap [s] (.. ">>" s "<<"))
+(fn shout [s] (.. s "!"))
+
+(fn keep [pred xs]
+  (icollect [_ x (ipairs xs)]
+    (when (pred x) x)))
+
+(fn map [f xs]
+  (icollect [_ x (ipairs xs)]
+    (f x)))
+
+(fn join [sep xs]
+  (var s "")
+  (each [_ x (ipairs xs)]
+    (if (= s "")
+        (set s (.. x))
+        (set s (.. s sep x))))
+  s)
+
+(let [scores [-2 3 -1 4 0 5]
+      report (->> scores
+                  (keep positive?)
+                  (map square)
+                  (join ", "))
+      adjusted (-> 7 (add 3) (mul 2) (square))
+      ok (-?> "hello" (non-empty) (wrap) (shout))
+      bad (-?> "" (non-empty) (wrap) (shout))
+      live (-?>> 5 (nonzero) (mul 3) (add 1))
+      dead (-?>> 0 (nonzero) (mul 3) (add 1))]
+  (print report)
+  (print adjusted)
+  (print ok)
+  (print bad)
+  (print live)
+  (print dead))

data/lib/kapusta/ast.rb

@@ -117,7 +117,7 @@ module Kapusta
 
   class List
     attr_reader :items
-    attr_accessor :multiline_source, :line, :column
+    attr_accessor :multiline_source, :line, :column, :sigil
 
     def initialize(items)
       @items = items

data/lib/kapusta/compiler/normalizer.rb

@@ -104,19 +104,29 @@ module Kapusta
       end
 
       def thread_short(forms, position)
-        forms[1..].reduce(forms.first) do |memo, form|
-          temp = thread_temp
-          List.new([
-                     Sym.new('let'),
-                     Vec.new([temp, memo]),
-                     List.new([
-                                Sym.new('if'),
-                                List.new([Sym.new('='), temp, nil]),
-                                nil,
-                                thread_step(temp, form, position)
-                              ])
-                   ])
+        steps = forms[1..]
+        return forms.first if steps.empty?
+
+        prev_temp = thread_temp
+        binding_items = [prev_temp, forms.first]
+        body = nil
+        last_index = steps.length - 1
+        steps.each_with_index do |form, i|
+          guarded = List.new([
+                               Sym.new('if'),
+                               List.new([Sym.new('='), prev_temp, nil]),
+                               nil,
+                               thread_step(prev_temp, form, position)
+                             ])
+          if i == last_index
+            body = guarded
+          else
+            temp = thread_temp
+            binding_items.push(temp, guarded)
+            prev_temp = temp
+          end
         end
+        List.new([Sym.new('let'), Vec.new(binding_items), body])
       end
 
       def thread_step(memo, form, position)

data/lib/kapusta/formatter.rb

@@ -178,7 +178,7 @@ module Kapusta
 
       case form
       when Comment then form.text
-      when List then render_list(form, indent, top_level:)
+      when List then form.sigil ? render_sigil(form) : render_list(form, indent, top_level:)
       when Vec then render_vec(form, indent, layout:, top_level:, force_expand:)
       when HashLit then render_hash(form, indent)
       when Quasiquote then render_prefix('`', form.form, indent, force_expand:)
@@ -189,6 +189,13 @@ module Kapusta
       end
     end
 
+    SIGIL_PREFIXES = { ivar: '@', cvar: '@@', gvar: '$' }.freeze
+    private_constant :SIGIL_PREFIXES
+
+    def render_sigil(list)
+      "#{SIGIL_PREFIXES.fetch(list.sigil)}#{list.items[1].name}"
+    end
+
     def render_prefix(prefix, inner, indent, force_expand: false)
       rendered = render(inner, indent + prefix.length, force_expand:)
       lines = rendered.lines(chomp: true)
@@ -221,6 +228,7 @@ module Kapusta
 
         "{#{rendered.join(' ')}}"
       when List
+        return render_sigil(form) if form.sigil
         return if contains_comments?(form.items)
         return "##{flat_render(semantic_items(form.items)[1])}" if hashfn_literal?(form)
         return if multiline_in_source?(form)

data/lib/kapusta/lsp/scope_walker.rb

@@ -16,7 +16,7 @@ module Kapusta
         end
       end
 
-      SKIPPED_HEADS = %w[macros ivar cvar gvar quasi-sym quasi-list
+      SKIPPED_HEADS = %w[macros quasi-sym quasi-list
                          quasi-list-tail quasi-vec quasi-vec-tail quasi-hash quasi-gensym].freeze
 
       DISPATCHERS = {
@@ -42,7 +42,10 @@ module Kapusta
         'class' => :walk_module_class,
         'hashfn' => :walk_hashfn,
         'macro' => :walk_macro_def,
-        'import-macros' => :walk_import_macros
+        'import-macros' => :walk_import_macros,
+        'ivar' => :walk_sigil_form,
+        'cvar' => :walk_sigil_form,
+        'gvar' => :walk_sigil_form
       }.freeze
 
       attr_reader :bindings, :references, :root_scope
@@ -58,7 +61,9 @@ module Kapusta
         @references = []
         @scope_seq = 0
         @root_scope = make_scope(nil, :file)
+        @gvar_scope = make_scope(nil, :gvars)
         @in_module_or_class = 0
+        @sigil_scope_stack = [make_sigil_scopes]
       end
 
       def walk_top(forms)
@@ -132,7 +137,7 @@ module Kapusta
           name_sym, supers, = split_class_args(form.items[1..] || [])
           supers&.items&.each { |item| walk_form(item, scope) }
           add_constant_binding(name_sym, scope, :class) if name_sym.is_a?(Sym)
-          inside_module_or_class do
+          inside_class do
             remaining_forms.each { |item| walk_form(item, scope) }
           end
         end
@@ -154,6 +159,21 @@ module Kapusta
         @in_module_or_class -= 1
       end
 
+      def inside_class
+        inside_module_or_class do
+          @sigil_scope_stack.push(make_sigil_scopes)
+          begin
+            yield
+          ensure
+            @sigil_scope_stack.pop
+          end
+        end
+      end
+
+      def make_sigil_scopes
+        { ivar: make_scope(nil, :ivars), cvar: make_scope(nil, :cvars) }
+      end
+
       def walk_form(form, scope)
         case form
         when List then walk_list(form, scope)
@@ -291,6 +311,10 @@ module Kapusta
         target = list.items[1]
         value = list.items[2]
         walk_form(value, scope) if value
+        if target.is_a?(List)
+          walk_form(target, scope)
+          return
+        end
         return unless target.is_a?(Sym) && !target.dotted?
 
         existing = scope.lookup(target.name)
@@ -301,6 +325,29 @@ module Kapusta
         end
       end
 
+      def walk_sigil_form(list, _scope)
+        return if list.items.length < 2
+
+        inner = list.items[1]
+        return unless inner.is_a?(Sym)
+
+        kind = list.head.name.to_sym
+        target_scope = sigil_target_scope(kind)
+        existing = target_scope.bindings[inner.name]
+        if existing
+          add_reference(inner, target_scope, existing)
+        else
+          add_binding(inner, target_scope, kind)
+        end
+      end
+
+      def sigil_target_scope(kind)
+        case kind
+        when :ivar, :cvar then @sigil_scope_stack.last.fetch(kind)
+        when :gvar then @gvar_scope
+        end
+      end
+
       def walk_fn(list, scope)
         items = list.items
         if items[1].is_a?(Vec)
@@ -472,8 +519,11 @@ module Kapusta
 
         add_constant_binding(name_sym, scope, kind) if name_sym.is_a?(Sym)
 
-        inside_module_or_class do
-          list.items[body_start..]&.each { |form| walk_form(form, scope) }
+        body = list.items[body_start..] || []
+        if kind == :class
+          inside_class { body.each { |form| walk_form(form, scope) } }
+        else
+          inside_module_or_class { body.each { |form| walk_form(form, scope) } }
         end
       end
 

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

data/spec/examples_spec.rb

@@ -563,4 +563,17 @@ 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

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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -57,6 +57,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
@@ -81,6 +82,7 @@ files:
 - 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 +105,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