kapusta 0.3.0 → 0.5.0

data/lib/kapusta/reader.rb

@@ -6,8 +6,8 @@ module Kapusta
   class Reader
     class Error < Kapusta::Error; end
 
-    WHITESPACE = [' ', "\t", "\n", "\r", "\f", "\v", ','].freeze
-    DELIMS = ['(', ')', '[', ']', '{', '}', '"', ';'].freeze
+    WHITESPACE = [' ', "\t", "\n", "\r", "\f", "\v"].freeze
+    DELIMS = ['(', ')', '[', ']', '{', '}', '"', ';', '`', ','].freeze
     CLOSING_DELIMS = [')', ']', '}'].freeze
 
     def self.read_all(source, preserve_comments: false)
@@ -23,9 +23,10 @@ module Kapusta
     def read_all
       forms = []
       loop do
-        skip_ws
+        had_blank = skip_ws
         break if eof?
 
+        forms << BlankLine.new if @preserve_comments && had_blank && !forms.empty?
         forms << read_next_item
       end
       forms
@@ -47,10 +48,14 @@ module Kapusta
       char
     end
 
-    def skip_ws
+    def skip_ws # rubocop:disable Naming/PredicateMethod
+      newlines = 0
       until eof?
         char = peek
-        if WHITESPACE.include?(char)
+        if char == "\n"
+          newlines += 1
+          advance
+        elsif WHITESPACE.include?(char)
           advance
         elsif !@preserve_comments && char == ';'
           advance until eof? || peek == "\n"
@@ -58,6 +63,7 @@ module Kapusta
           break
         end
       end
+      newlines >= 2
     end
 
     def delim?(char)
@@ -66,7 +72,7 @@ module Kapusta
 
     def read_next_item
       skip_ws
-      raise Error, 'unexpected eof' if eof?
+      raise reader_error(:unexpected_eof, source_position) if eof?
 
       return read_comment if @preserve_comments && peek == ';'
 
@@ -75,10 +81,11 @@ module Kapusta
 
     def read_form
       skip_ws
-      raise Error, 'unexpected eof' if eof?
+      raise reader_error(:unexpected_eof, source_position) if eof?
 
       return read_comment if @preserve_comments && peek == ';'
 
+      position = source_position
       form =
         case peek
         when '(' then read_list
@@ -86,27 +93,59 @@ module Kapusta
         when '{' then read_hash
         when '"' then read_string
         when '#' then read_hashfn
+        when '`' then read_quasiquote
+        when ',' then read_unquote
         when *CLOSING_DELIMS then raise unexpected_closing_delim(peek)
         else
           read_atom
         end
 
+      attach_position(form, position)
       read_postfix(form)
     end
 
+    def attach_position(form, position)
+      return form unless form.respond_to?(:line=)
+
+      form.line ||= position[0]
+      form.column ||= position[1]
+      form
+    end
+
+    def read_quasiquote
+      advance
+      Quasiquote.new(read_form)
+    end
+
+    def read_unquote
+      advance
+      if peek == '@'
+        advance
+        UnquoteSplice.new(read_form)
+      else
+        Unquote.new(read_form)
+      end
+    end
+
     def read_list
       opening_position = source_position
       advance
       items = []
       loop do
-        skip_ws
+        had_blank = skip_ws
         raise unclosed_opening_delim('(', opening_position) if eof?
         break if peek == ')'
 
+        items << BlankLine.new if @preserve_comments && had_blank && !items.empty?
         items << read_next_item
       end
+      closing_position = source_position
       advance
-      List.new(items)
+      list = List.new(items)
+      list.multiline_source = closing_position[0] != opening_position[0]
+      list.line = opening_position[0]
+      list.column = opening_position[1]
+      list
     end
 
     def read_vec
@@ -114,14 +153,20 @@ module Kapusta
       advance
       items = []
       loop do
-        skip_ws
+        had_blank = skip_ws
         raise unclosed_opening_delim('[', opening_position) if eof?
         break if peek == ']'
 
+        items << BlankLine.new if @preserve_comments && had_blank && !items.empty?
         items << read_next_item
       end
+      closing_position = source_position
       advance
-      Vec.new(items)
+      vec = Vec.new(items)
+      vec.multiline_source = closing_position[0] != opening_position[0]
+      vec.line = opening_position[0]
+      vec.column = opening_position[1]
+      vec
     end
 
     def read_hash
@@ -146,14 +191,20 @@ module Kapusta
         entries << normalize_hash_pair(pending[0], pending[1])
         pending.clear
       end
+      closing_position = source_position
       advance
 
-      raise Error, 'odd number of forms in hash' unless pending.empty?
+      raise reader_error(:odd_forms_in_hash, opening_position) unless pending.empty?
 
-      HashLit.new(entries)
+      hash = HashLit.new(entries)
+      hash.multiline_source = closing_position[0] != opening_position[0]
+      hash.line = opening_position[0]
+      hash.column = opening_position[1]
+      hash
     end
 
     def read_string
+      opening_position = source_position
       advance
       buffer = +''
       until eof? || peek == '"'
@@ -177,7 +228,7 @@ module Kapusta
           buffer << advance
         end
       end
-      raise Error, 'unterminated string' if eof?
+      raise reader_error(:unterminated_string, opening_position) if eof?
 
       advance
       buffer
@@ -215,22 +266,25 @@ module Kapusta
     end
 
     def read_atom
+      position = source_position
       start = @pos
       advance until delim?(peek)
       token = @src[start...@pos]
-      raise Error, 'empty token' if token.empty?
+      raise reader_error(:empty_token, position) if token.empty?
 
-      parse_atom(token)
+      parse_atom(token, position)
     end
 
     def unexpected_closing_delim(char)
-      line, column = source_position
-      Error.new("unexpected closing delimiter '#{char}' at line #{line}, column #{column}")
+      reader_error(:unexpected_closing_delimiter, source_position, char:)
     end
 
     def unclosed_opening_delim(char, position)
-      line, column = position
-      Error.new("unclosed opening delimiter '#{char}' at line #{line}, column #{column}")
+      reader_error(:unclosed_delimiter, position, char:)
+    end
+
+    def reader_error(code, position, **args)
+      Error.new(Kapusta::Errors.format(code, **args), line: position[0], column: position[1])
     end
 
     def source_position
@@ -242,15 +296,19 @@ module Kapusta
       [line, column]
     end
 
-    def parse_atom(token)
+    def parse_atom(token, position)
       return true if token == 'true'
       return false if token == 'false'
       return if token == 'nil'
       return Integer(token, 10) if token.match?(/\A-?\d+\z/)
       return Float(token) if token.match?(/\A-?\d+\.\d+\z/)
 
+      raise reader_error(:could_not_read_number, position, token:) if token.match?(/\A-?\d/)
+
       if token.start_with?(':') && token.length > 1
         Kapusta.kebab_to_snake(token[1..]).to_sym
+      elsif token.length > 1 && token.end_with?('#') && !token[0..-2].include?('#')
+        AutoGensym.new(token.chomp('#'))
       else
         Sym.new(token)
       end
@@ -258,7 +316,7 @@ module Kapusta
 
     def normalize_hash_pair(item, value)
       if item.is_a?(Sym) && item.name == ':'
-        raise Error, 'bad shorthand' unless value.is_a?(Sym)
+        raise reader_error(:bad_shorthand, source_position) unless value.is_a?(Sym)
 
         key = Kapusta.kebab_to_snake(value.name).to_sym
         [key, value]

data/lib/kapusta/version.rb

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

data/lib/kapusta.rb

@@ -2,6 +2,7 @@
 
 require_relative 'kapusta/version'
 require_relative 'kapusta/error'
+require_relative 'kapusta/errors'
 require_relative 'kapusta/support'
 require_relative 'kapusta/ast'
 require_relative 'kapusta/reader'
@@ -42,14 +43,14 @@ module Kapusta
 
     @installed = true
     Kernel.module_eval do
-      alias_method :__kapusta_original_require_relative, :require_relative
-      private :__kapusta_original_require_relative
-
       def require_relative(path)
-        kap_path = Kapusta.send(:resolve_kap_relative, path, caller_locations(1, 1).first)
+        location = caller_locations(1, 1).first
+        kap_path = Kapusta.send(:resolve_kap_relative, path, location)
         return Kapusta.send(:require_kapusta_file, kap_path) if kap_path
 
-        __kapusta_original_require_relative(path)
+        base_file = location&.absolute_path || location&.path
+        target = base_file ? File.expand_path(path, File.dirname(base_file)) : path
+        Kernel.require(target)
       end
     end
   end

data/spec/examples_errors_spec.rb

@@ -0,0 +1,229 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'open3'
+require 'rbconfig'
+
+ERRORS_DIR = File.expand_path('../examples-errors', __dir__)
+KAPUSTA_BIN = File.expand_path('../exe/kapusta', __dir__)
+KAPFMT_BIN = File.expand_path('../exe/kapfmt', __dir__)
+
+def run_error_example(name)
+  k_out, k_err, k_status = Open3.capture3(RbConfig.ruby, KAPUSTA_BIN, name, chdir: ERRORS_DIR)
+  f_out, f_err, f_status = Open3.capture3(RbConfig.ruby, KAPFMT_BIN, name, chdir: ERRORS_DIR)
+
+  raise "kapusta unexpectedly succeeded for #{name}" if k_status.success?
+  raise "kapfmt unexpectedly succeeded for #{name}" if f_status.success?
+  raise "kapusta wrote to stdout for #{name}: #{k_out.inspect}" unless k_out.empty?
+  raise "kapfmt wrote to stdout for #{name}: #{f_out.inspect}" unless f_out.empty?
+  raise "kapusta and kapfmt disagree for #{name}:\n  kapusta: #{k_err}  kapfmt: #{f_err}" unless k_err == f_err
+
+  k_err
+end
+
+RSpec.describe 'examples-errors' do
+  it 'accumulate-missing-iterator.kap' do
+    expect(run_error_example('accumulate-missing-iterator.kap'))
+      .to eq("accumulate-missing-iterator.kap:5:3: expected initial value and iterator binding table\n")
+  end
+
+  it 'call-empty-form.kap' do
+    expect(run_error_example('call-empty-form.kap'))
+      .to eq("call-empty-form.kap:7:8: expected a function, macro, or special to call\n")
+  end
+
+  it 'call-literal-number.kap' do
+    expect(run_error_example('call-literal-number.kap'))
+      .to eq("call-literal-number.kap:6:14: cannot call literal value 1\n")
+  end
+
+  it 'case-no-patterns.kap' do
+    expect(run_error_example('case-no-patterns.kap'))
+      .to eq("case-no-patterns.kap:3:5: expected at least one pattern/body pair\n")
+  end
+
+  it 'case-odd-pattern-body.kap' do
+    expect(run_error_example('case-odd-pattern-body.kap'))
+      .to eq("case-odd-pattern-body.kap:2:3: expected even number of pattern/body pairs\n")
+  end
+
+  it 'destructure-literal-number.kap' do
+    expect(run_error_example('destructure-literal-number.kap'))
+      .to eq("destructure-literal-number.kap:5:3: could not destructure literal\n")
+  end
+
+  it 'destructure-literal-table.kap' do
+    expect(run_error_example('destructure-literal-table.kap'))
+      .to eq("destructure-literal-table.kap:4:1: could not destructure literal\n")
+  end
+
+  it 'destructure-rest-as-table.kap' do
+    expect(run_error_example('destructure-rest-as-table.kap'))
+      .to eq("destructure-rest-as-table.kap:6:3: unable to bind table ...\n")
+  end
+
+  it 'dot-without-table.kap' do
+    expect(run_error_example('dot-without-table.kap'))
+      .to eq("dot-without-table.kap:5:15: expected table argument\n")
+  end
+
+  it 'each-not-binding-table.kap' do
+    expect(run_error_example('each-not-binding-table.kap'))
+      .to eq("each-not-binding-table.kap:6:3: expected binding table\n")
+  end
+
+  it 'faccumulate-missing-iterator.kap' do
+    expect(run_error_example('faccumulate-missing-iterator.kap'))
+      .to eq("faccumulate-missing-iterator.kap:7:3: expected initial value and iterator binding table\n")
+  end
+
+  it 'fcollect-missing-range.kap' do
+    expect(run_error_example('fcollect-missing-range.kap'))
+      .to eq("fcollect-missing-range.kap:6:3: expected range to include start and stop\n")
+  end
+
+  it 'fn-non-symbol-param.kap' do
+    expect(run_error_example('fn-non-symbol-param.kap'))
+      .to eq("fn-non-symbol-param.kap:4:1: destructure pattern this compiler cannot translate: [1 2]\n")
+  end
+
+  it 'fn-without-params.kap' do
+    expect(run_error_example('fn-without-params.kap'))
+      .to eq("fn-without-params.kap:4:11: expected parameters table\n")
+  end
+
+  it 'for-missing-stop.kap' do
+    expect(run_error_example('for-missing-stop.kap'))
+      .to eq("for-missing-stop.kap:6:3: expected range to include start and stop\n")
+  end
+
+  it 'global-non-symbol-name.kap' do
+    expect(run_error_example('global-non-symbol-name.kap'))
+      .to eq("global-non-symbol-name.kap:6:1: unable to bind integer 1\n")
+  end
+
+  it 'global-without-value.kap' do
+    expect(run_error_example('global-without-value.kap'))
+      .to eq("global-without-value.kap:6:1: expected name and value\n")
+  end
+
+  it 'icollect-missing-iterator.kap' do
+    expect(run_error_example('icollect-missing-iterator.kap'))
+      .to eq("icollect-missing-iterator.kap:6:3: expected iterator binding table\n")
+  end
+
+  it 'if-no-body.kap' do
+    expect(run_error_example('if-no-body.kap'))
+      .to eq("if-no-body.kap:8:5: expected condition and body\n")
+  end
+
+  it 'import-macros-missing-module.kap' do
+    expect(run_error_example('import-macros-missing-module.kap'))
+      .to eq("import-macros-missing-module.kap:4:1: import-macros is not yet supported\n")
+  end
+
+  it 'let-odd-bindings.kap' do
+    expect(run_error_example('let-odd-bindings.kap'))
+      .to eq("let-odd-bindings.kap:2:3: expected even number of name/value bindings\n")
+  end
+
+  it 'let-without-body-form.kap' do
+    expect(run_error_example('let-without-body-form.kap'))
+      .to eq("let-without-body-form.kap:4:5: expected body expression\n")
+  end
+
+  it 'local-with-extra-args.kap' do
+    expect(run_error_example('local-with-extra-args.kap'))
+      .to eq("local-with-extra-args.kap:6:3: local: expected name and value\n")
+  end
+
+  it 'local-without-value.kap' do
+    expect(run_error_example('local-without-value.kap'))
+      .to eq("local-without-value.kap:6:3: local: expected name and value\n")
+  end
+
+  it 'macro-unsafe-bind.kap' do
+    expect(run_error_example('macro-unsafe-bind.kap'))
+      .to eq("macro-unsafe-bind.kap:13:8: macro tried to bind unsafe without gensym\n")
+  end
+
+  it 'macro-vararg-with-operator.kap' do
+    expect(run_error_example('macro-vararg-with-operator.kap'))
+      .to eq("macro-vararg-with-operator.kap:5:3: tried to use vararg with operator\n")
+  end
+
+  it 'match-no-patterns.kap' do
+    expect(run_error_example('match-no-patterns.kap'))
+      .to eq("match-no-patterns.kap:3:5: expected at least one pattern/body pair\n")
+  end
+
+  it 'mismatched-brackets.kap' do
+    expect(run_error_example('mismatched-brackets.kap'))
+      .to eq("mismatched-brackets.kap:4:19: unexpected closing delimiter ')'\n")
+  end
+
+  it 'only-rest-param.kap' do
+    expect(run_error_example('only-rest-param.kap'))
+      .to eq("only-rest-param.kap:4:1: expected rest argument before last parameter\n")
+  end
+
+  it 'quote-runtime.kap' do
+    expect(run_error_example('quote-runtime.kap'))
+      .to eq("quote-runtime.kap:6:1: cannot emit form: `hello\n")
+  end
+
+  it 'rest-not-last.kap' do
+    expect(run_error_example('rest-not-last.kap'))
+      .to eq("rest-not-last.kap:6:3: expected rest argument before last parameter\n")
+  end
+
+  it 'set-immutable-local.kap' do
+    expect(run_error_example('set-immutable-local.kap'))
+      .to eq("set-immutable-local.kap:8:3: expected var counter\n")
+  end
+
+  it 'shadow-special-fn.kap' do
+    expect(run_error_example('shadow-special-fn.kap'))
+      .to eq("shadow-special-fn.kap:6:3: local fn was overshadowed by a special form or macro\n")
+  end
+
+  it 'shadow-special-if.kap' do
+    expect(run_error_example('shadow-special-if.kap'))
+      .to eq("shadow-special-if.kap:4:1: local if was overshadowed by a special form or macro\n")
+  end
+
+  it 'symbol-starting-with-digit.kap' do
+    expect(run_error_example('symbol-starting-with-digit.kap'))
+      .to eq("symbol-starting-with-digit.kap:6:10: could not read number \"5var\"\n")
+  end
+
+  it 'tset-missing-value.kap' do
+    expect(run_error_example('tset-missing-value.kap'))
+      .to eq("tset-missing-value.kap:5:5: tset: expected table, key, and value arguments\n")
+  end
+
+  it 'unbalanced-parens.kap' do
+    expect(run_error_example('unbalanced-parens.kap'))
+      .to eq("unbalanced-parens.kap:4:1: unclosed opening delimiter '('\n")
+  end
+
+  it 'unclosed-table.kap' do
+    expect(run_error_example('unclosed-table.kap'))
+      .to eq("unclosed-table.kap:4:21: unexpected closing delimiter ']'\n")
+  end
+
+  it 'unquote-outside-quote.kap' do
+    expect(run_error_example('unquote-outside-quote.kap'))
+      .to eq("unquote-outside-quote.kap:5:10: cannot emit form: ,x\n")
+  end
+
+  it 'var-without-value.kap' do
+    expect(run_error_example('var-without-value.kap'))
+      .to eq("var-without-value.kap:6:3: var: expected name and value\n")
+  end
+
+  it 'when-no-body.kap' do
+    expect(run_error_example('when-no-body.kap'))
+      .to eq("when-no-body.kap:4:3: when: expected body\n")
+  end
+end

data/spec/examples_spec.rb

@@ -500,4 +500,55 @@ RSpec.describe 'examples' do
   it 'subtract-product-sum.kap' do
     expect(run_example('subtract-product-sum.kap')).to eq("15\n21\n0\n")
   end
+
+  it 'ugly-number.kap' do
+    expect(run_example('ugly-number.kap')).to eq("true\ntrue\nfalse\nfalse\ntrue\n")
+  end
+
+  it 'macros-unless.kap' do
+    expect(run_example('macros-unless.kap')).to eq(<<~OUT)
+      "shown"
+      "also shown"
+    OUT
+  end
+
+  it 'macros-swap.kap' do
+    expect(run_example('macros-swap.kap')).to eq("2\n1\n")
+  end
+
+  it 'macros-when-let.kap' do
+    expect(run_example('macros-when-let.kap')).to eq(<<~OUT)
+      "got"
+      3
+      "done"
+    OUT
+  end
+
+  it 'macros-multi.kap' do
+    expect(run_example('macros-multi.kap')).to eq("10\n20\n7\n")
+  end
+
+  it 'macros-thrice-if.kap' do
+    expect(run_example('macros-thrice-if.kap')).to eq(<<~OUT)
+      "tick"
+      1
+      "tick"
+      2
+      "tick"
+      3
+      "final"
+      3
+    OUT
+  end
+
+  it 'macros-dbg.kap' do
+    expect(run_example('macros-dbg.kap')).to eq(<<~OUT)
+      "dbg"
+      6
+      "result"
+      6
+      "dbg"
+      50
+    OUT
+  end
 end

data/spec/formatter_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe Kapusta::Formatter do
     Dir.mktmpdir do |dir|
       path = File.join(dir, 'sample.kap')
       File.write(path, <<~KAP)
-        (let [uri (URI.join (ivar base-uri) (.. "/posts/" id)) body (Net.HTTP.get uri) post (JSON.parse body {:symbolize-names true}) {: title : author} post] (values title author))
+        (fn fetch-post [id] (let [uri (URI.join (ivar base-uri) (.. "/posts/" id)) body (Net.HTTP.get uri) post (JSON.parse body {:symbolize-names true}) {: title : author} post] (values title author)))
       KAP
 
       previous_path = ENV.fetch('PATH', nil)
@@ -54,11 +54,12 @@ RSpec.describe Kapusta::Formatter do
       end
 
       expect(output).to eq(<<~KAP)
-        (let [uri (URI.join (ivar base-uri) (.. "/posts/" id))
-              body (Net.HTTP.get uri)
-              post (JSON.parse body {:symbolize-names true})
-              {: title : author} post]
-          (values title author))
+        (fn fetch-post [id]
+          (let [uri (URI.join (ivar base-uri) (.. "/posts/" id))
+                body (Net.HTTP.get uri)
+                post (JSON.parse body {:symbolize-names true})
+                {: title : author} post]
+            (values title author)))
       KAP
     ensure
       ENV['PATH'] = previous_path
@@ -210,16 +211,14 @@ RSpec.describe Kapusta::Formatter do
       end
 
       expect(output).to eq(<<~KAP)
-        (let
-          [
-            profile
-            {
-              :name "Ada"
-              ; active user
-              :active true}
-            ; next binding
-            role
-            "Engineer"]
+        (let [
+               profile
+               {:name "Ada"
+                ; active user
+                :active true}
+               ; next binding
+               role
+               "Engineer"]
           (print profile role))
       KAP
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -20,8 +20,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/check-all
 - bin/compile-examples
 - bin/console
+- bin/fennel-parity
 - bin/setup
 - examples/accumulator.kap
 - examples/ackermann.kap
@@ -56,6 +58,12 @@ files:
 - examples/kwargs.kap
 - examples/leap-year.kap
 - examples/length-of-last-word.kap
+- examples/macros-dbg.kap
+- examples/macros-multi.kap
+- examples/macros-swap.kap
+- examples/macros-thrice-if.kap
+- examples/macros-unless.kap
+- examples/macros-when-let.kap
 - examples/majority-element.kap
 - examples/manhattan-distance.kap
 - examples/match.kap
@@ -92,6 +100,7 @@ files:
 - examples/tset.kap
 - examples/two-sum-hash.kap
 - examples/two-sum.kap
+- examples/ugly-number.kap
 - examples/underscore-patterns.kap
 - examples/use_bank_account.rb
 - examples/valid-parentheses-1.kap
@@ -113,17 +122,19 @@ files:
 - lib/kapusta/compiler/emitter/interop.rb
 - lib/kapusta/compiler/emitter/patterns.rb
 - lib/kapusta/compiler/emitter/support.rb
+- lib/kapusta/compiler/macro_expander.rb
 - lib/kapusta/compiler/normalizer.rb
 - lib/kapusta/env.rb
 - lib/kapusta/error.rb
+- lib/kapusta/errors.rb
 - lib/kapusta/formatter.rb
 - lib/kapusta/reader.rb
 - lib/kapusta/support.rb
 - lib/kapusta/version.rb
 - spec/cli_spec.rb
+- spec/examples_errors_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: