kapusta 0.1.4 → 0.2.0

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

@@ -17,7 +17,7 @@ module Kapusta
           when List then emit_list(form, env, current_scope)
           when String, Symbol, Numeric, true, false, nil then form.inspect
           else
-            raise Error, "cannot emit form: #{form.inspect}"
+            emit_error!("cannot emit form: #{form.inspect}")
           end
         end
 
@@ -36,7 +36,9 @@ module Kapusta
           if head.is_a?(Sym)
             return emit_special(head.name, args, env, current_scope) if special_form?(head.name)
             return emit_multisym_call(head, args, env, current_scope) if head.dotted?
-            return emit_callable_call(env.lookup(head.name), args, env, current_scope) if env.defined?(head.name)
+            if (binding = env.lookup_if_defined(head.name))
+              return emit_bound_call(binding, args, env, current_scope)
+            end
 
             return emit_self_call(head.name, args, env, current_scope)
           end
@@ -68,24 +70,22 @@ module Kapusta
           when '.' then emit_lookup(args, env, current_scope)
           when '?.' then emit_safe_lookup(args, env, current_scope)
           when ':' then emit_colon(args, env, current_scope)
-          when '..' then runtime_call(:concat, args.map do |arg|
-            emit_expr(arg, env, current_scope)
-          end)
-          when 'length' then "(#{emit_expr(args[0], env, current_scope)}).length"
+          when '..' then emit_concat(args, env, current_scope)
+          when 'length' then "#{parenthesize(emit_expr(args[0], env, current_scope))}.length"
           when 'require' then emit_require(args[0], env, current_scope)
           when 'module' then emit_module_expr(args, env)
           when 'class' then emit_class_expr(args, env)
           when 'try' then emit_try(args, env, current_scope)
           when 'raise' then emit_raise(args, env, current_scope)
-          when 'ivar' then runtime_call(:get_ivar, 'self', args[0].name.inspect)
-          when 'cvar' then runtime_call(:get_cvar, 'self', args[0].name.inspect)
+          when 'ivar' then "@#{Kapusta.kebab_to_snake(args[0].name)}"
+          when 'cvar' then "@@#{Kapusta.kebab_to_snake(args[0].name)}"
           when 'gvar' then emit_gvar(args[0])
           when 'ruby' then "Kernel.eval(#{emit_expr(args[0], env, current_scope)})"
           when 'and' then emit_and(args, env, current_scope)
           when 'or' then emit_or(args, env, current_scope)
-          when 'not' then "(!#{emit_expr(args[0], env, current_scope)})"
+          when 'not' then "!#{parenthesize(emit_expr(args[0], env, current_scope))}"
           when '=' then emit_compare(args, env, current_scope, '==')
-          when 'not=' then "(!#{emit_special('=', args, env, current_scope)})"
+          when 'not=' then emit_compare_any(args, env, current_scope, '!=')
           when '<' then emit_compare(args, env, current_scope, '<')
           when '<=' then emit_compare(args, env, current_scope, '<=')
           when '>' then emit_compare(args, env, current_scope, '>')
@@ -95,13 +95,29 @@ module Kapusta
           when '*' then emit_reduce(args, env, current_scope, '1', :*)
           when '/' then emit_div(args, env, current_scope)
           when '%' then args.map { |arg| parenthesize(emit_expr(arg, env, current_scope)) }.join(' % ')
-          when 'print' then runtime_call(:print_values, *args.map do |arg|
-            emit_expr(arg, env, current_scope)
-          end)
+          when 'print' then emit_print(args, env, current_scope)
           else
-            raise Error, "unknown special form: #{name}"
+            emit_error!("unknown special form: #{name}")
           end
         end
+
+        def emit_concat(args, env, current_scope)
+          return '""' if args.empty?
+
+          args.map { |arg| emit_string_part(arg, env, current_scope) }.join(' + ')
+        end
+
+        def emit_print(args, env, current_scope)
+          return 'p' if args.empty?
+
+          "p(#{args.map { |arg| emit_expr(arg, env, current_scope) }.join(', ')})"
+        end
+
+        def emit_string_part(arg, env, current_scope)
+          return arg.inspect if arg.is_a?(String)
+
+          "(#{emit_expr(arg, env, current_scope)}).to_s"
+        end
       end
     end
   end

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

@@ -8,8 +8,11 @@ module Kapusta
 
         def emit_lookup(args, env, current_scope)
           object_code = emit_expr(args[0], env, current_scope)
-          keys = args[1..].map { |arg| emit_expr(arg, env, current_scope) }.join(', ')
-          runtime_call(:get_path, object_code, "[#{keys}]")
+          keys = args[1..].map { |arg| emit_expr(arg, env, current_scope) }
+          return object_code if keys.empty?
+
+          receiver = simple_expression?(object_code) ? object_code : parenthesize(object_code)
+          "#{receiver}#{keys.map { |k| "[#{k}]" }.join}"
         end
 
         def emit_safe_lookup(args, env, current_scope)
@@ -20,9 +23,16 @@ module Kapusta
 
         def emit_colon(args, env, current_scope)
           receiver = emit_expr(args[0], env, current_scope)
-          method_name = emit_method_name(args[1], env, current_scope)
+          method_form = args[1]
           positional, kwargs, block = split_call_args(args[2..], env, current_scope)
-          runtime_call(:send_call, receiver, method_name, positional, kwargs, block)
+          literal_name = method_form if method_form.is_a?(Symbol) || method_form.is_a?(String)
+          if literal_name && !kwargs && !block && direct_method_name?(literal_name.to_s)
+            return emit_direct_method_call(receiver, Kapusta.kebab_to_snake(literal_name.to_s), positional)
+          end
+
+          method_name = emit_method_name(method_form, env, current_scope)
+          parts = build_call_args([method_name, *positional], kwargs, block)
+          "#{parenthesize(receiver)}.public_send(#{parts})"
         end
 
         def emit_require(arg, env, current_scope)
@@ -33,9 +43,30 @@ module Kapusta
             when String then arg.inspect
             else "(#{emit_expr(arg, env, current_scope)}).to_s"
             end
+          if kapusta_require?(arg)
+            return [
+              'unless defined?(Kapusta)',
+              indent('require "kapusta"'),
+              'end',
+              "Kapusta.require(#{path_code}, relative_to: #{@path.inspect})"
+            ].join("\n")
+          end
+
           "require #{path_code}"
         end
 
+        def kapusta_require?(arg)
+          path =
+            case arg
+            when Sym then arg.name
+            when Symbol then arg.to_s
+            when String then arg
+            end
+          return false unless path
+
+          path.end_with?('.kap') || path.start_with?('./', '../') || File.absolute_path?(path)
+        end
+
         def emit_module_expr(args, env)
           body = emit_sequence(args[1..], env, :module, allow_method_definitions: true, result: false).first
           emit_module_wrapper(args[0], body)
@@ -63,7 +94,7 @@ module Kapusta
 
         def emit_direct_module_header(name_sym, body)
           const_name = simple_constant_name(name_sym)
-          return nil unless const_name
+          return unless const_name
 
           [
             "module #{const_name}",
@@ -94,7 +125,7 @@ module Kapusta
 
         def emit_direct_class_header(name_sym, supers, body)
           const_name = simple_constant_name(name_sym)
-          return nil unless const_name && supers.nil?
+          return unless const_name && supers.nil?
 
           [
             "class #{const_name}",
@@ -105,7 +136,7 @@ module Kapusta
         end
 
         def simple_constant_name(name_sym)
-          return nil unless name_sym.is_a?(Sym) && name_sym.name.match?(/\A[A-Z]\w*\z/)
+          return unless name_sym.is_a?(Sym) && name_sym.name.match?(/\A[A-Z]\w*\z/)
 
           name_sym.name
         end
@@ -184,6 +215,15 @@ module Kapusta
           end.join(' && ')
         end
 
+        def emit_compare_any(args, env, current_scope, operator)
+          values = args.map { |arg| emit_expr(arg, env, current_scope) }
+          return 'false' if values.length <= 1
+
+          (0...(values.length - 1)).map do |i|
+            "#{parenthesize(values[i])} #{operator} #{parenthesize(values[i + 1])}"
+          end.join(' || ')
+        end
+
         def emit_reduce(args, env, current_scope, empty_value, operator)
           return empty_value if args.empty?
 
@@ -207,15 +247,32 @@ module Kapusta
 
         def emit_callable_call(callee_code, args, env, current_scope)
           positional, kwargs, block = split_call_args(args, env, current_scope)
-          return emit_direct_callable_call(callee_code, positional) unless kwargs || block
+          rendered = build_call_args(positional, kwargs, block)
+          suffix = rendered.empty? ? '.call' : ".call(#{rendered})"
+          "#{parenthesize(callee_code)}#{suffix}"
+        end
 
-          runtime_call(:call, callee_code, "[#{positional.join(', ')}]", kwargs, block)
+        def build_call_args(positional, kwargs, block)
+          parts = positional.dup
+          parts << "**#{kwargs}" if kwargs
+          parts << "&#{block}" if block
+          parts.join(', ')
         end
 
-        def emit_direct_callable_call(callee_code, positional)
-          rendered_args = positional.join(', ')
-          suffix = rendered_args.empty? ? '.call' : ".call(#{rendered_args})"
-          "#{parenthesize(callee_code)}#{suffix}"
+        def emit_bound_call(binding, args, env, current_scope)
+          return emit_self_method_binding_call(binding, args, env, current_scope) if method_binding?(binding)
+
+          emit_callable_call(binding, args, env, current_scope)
+        end
+
+        def emit_self_method_binding_call(binding, args, env, current_scope)
+          positional = args.map { |arg| emit_expr(arg, env, current_scope) }
+          emit_direct_self_method_call(binding.ruby_name, positional)
+        end
+
+        def emit_direct_self_method_call(method_name, positional)
+          args = positional.join(', ')
+          args.empty? ? "#{method_name}()" : "#{method_name}(#{args})"
         end
 
         def emit_multisym_call(head, args, env, current_scope)
@@ -223,19 +280,26 @@ module Kapusta
           if segments.empty?
             emit_callable_call(base_code, args, env, current_scope)
           else
-            receiver =
-              if segments.length == 1
-                base_code
-              else
-                runtime_call(:method_path_value, base_code, segments[0...-1].inspect)
-              end
-            method_name = Kapusta.kebab_to_snake(segments.last).to_sym.inspect
+            receiver = emit_method_path(base_code, segments[0...-1])
             positional, kwargs, block = split_call_args(args, env, current_scope)
-            if segments.length == 1 && !kwargs && !block && direct_method_name?(segments.last)
+            if !kwargs && !block && direct_method_name?(segments.last)
               return emit_direct_method_call(receiver, Kapusta.kebab_to_snake(segments.last), positional)
             end
 
-            runtime_call(:send_call, receiver, method_name, positional, kwargs, block)
+            method_name = Kapusta.kebab_to_snake(segments.last).to_sym.inspect
+            parts = build_call_args([method_name, *positional], kwargs, block)
+            "#{receiver}.public_send(#{parts})"
+          end
+        end
+
+        def emit_method_path(base_code, segments)
+          segments.reduce(base_code) do |acc, segment|
+            snake = Kapusta.kebab_to_snake(segment)
+            if direct_method_name?(segment)
+              "#{acc}.#{snake}"
+            else
+              "#{acc}.public_send(#{snake.to_sym.inspect})"
+            end
           end
         end
 
@@ -249,7 +313,8 @@ module Kapusta
         def emit_self_call(name, args, env, current_scope)
           positional, kwargs, block = split_call_args(args, env, current_scope)
           method_name = Kapusta.kebab_to_snake(name).to_sym.inspect
-          runtime_call(:invoke_self, 'self', method_name, positional, kwargs, block)
+          parts = build_call_args([method_name, *positional], kwargs, block)
+          "send(#{parts})"
         end
 
         def split_call_args(args, env, current_scope)
@@ -285,33 +350,31 @@ module Kapusta
           name = sym.name
           return 'self' if name == 'self'
           return 'Float::INFINITY' if name == 'math.huge'
-          return env.lookup(name) if env.defined?(name)
+
+          if (binding = env.lookup_if_defined(sym))
+            return binding_value_code(binding)
+          end
           return emit_multisym_value(sym, env) if sym.dotted?
           return 'ARGV' if name == 'ARGV'
           return name if name.match?(/\A[A-Z]/)
 
-          raise Error, "undefined symbol: #{name}"
+          emit_error!("undefined symbol: #{name}")
         end
 
         def emit_gvar(sym)
-          ruby_name = global_name(sym.name)
-          return "$#{ruby_name}" if direct_global_name?(ruby_name)
-
-          runtime_call(:get_gvar, sym.name.inspect)
+          "$#{global_name(sym.name)}"
         end
 
         def emit_multisym_value(sym, env)
           base_code, segments = multisym_base(sym.segments, env)
-          return base_code if segments.empty?
-
-          runtime_call(:method_path_value, base_code, segments.inspect)
+          emit_method_path(base_code, segments)
         end
 
         def multisym_base(segments, env)
           if segments[0] == 'self'
             ['self', segments[1..]]
-          elsif env.defined?(segments[0])
-            [env.lookup(segments[0]), segments[1..]]
+          elsif (binding = env.lookup_if_defined(segments[0]))
+            [binding_value_code(binding), segments[1..]]
           else
             idx = 0
             const_path = []
@@ -319,7 +382,7 @@ module Kapusta
               const_path << segments[idx]
               idx += 1
             end
-            raise Error, "bad multisym: #{segments.join('.')}" if const_path.empty?
+            emit_error!("bad multisym: #{segments.join('.')}") if const_path.empty?
 
             [const_path.join('::'), segments[idx..]]
           end
@@ -335,10 +398,6 @@ module Kapusta
           Kapusta.kebab_to_snake(name).match?(/\A[a-z_]\w*[!?=]?\z/)
         end
 
-        def direct_global_name?(name)
-          name.match?(/\A[a-z_]\w*\z/)
-        end
-
         def global_name(name)
           Kapusta.kebab_to_snake(name).gsub(/[^a-zA-Z0-9_]/, '_')
         end
@@ -348,11 +407,19 @@ module Kapusta
             code.match?(/\A[A-Z]\w*(?:::[A-Z]\w*)*\z/) ||
             code.match?(/\A[a-z_]\w*[!?=]?\([^()\n]*\)\z/) ||
             code.match?(/\A\d+(?:\.\d+)?\z/) ||
-            code.match?(/\A[a-z_]\w*(?:\.[a-z_]\w*[!?=]?(?:\([^()\n]*\))?)+\z/) ||
+            code.match?(/\A[a-z_]\w*(?:\.[a-z_]\w*[!?=]?(?:\([^()\n]*\))?|\[[^\[\]]*\])+\z/) ||
             code.match?(/\A:[a-zA-Z_]\w*[!?=]?\z/) ||
             code.match?(/\A"(?:[^"\\]|\\.)*"\z/) ||
             code.match?(/\A'(?:[^'\\]|\\.)*'\z/) ||
-            %w[nil true false self].include?(code)
+            %w[nil true false self].include?(code) ||
+            negation_simple?(code)
+        end
+
+        def negation_simple?(code)
+          return false unless code.start_with?('!') && code.length > 1
+
+          rest = code[1..]
+          simple_expression?(rest) || (rest.start_with?('(') && rest.end_with?(')'))
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Kapusta
           if pattern.is_a?(Sym)
             return ['nil', env] if pattern.name == '_'
 
-            ruby_name = define_local(env, pattern.name)
+            ruby_name = define_local(env, pattern)
             ["#{ruby_name} = #{value_code}", env]
           else
             bindings_var = temp('bindings')
@@ -61,7 +61,7 @@ module Kapusta
             elsif or_pattern?(pattern)
               emit_or_match_pattern(pattern, env, mode:, allow_pins:, state:)
             elsif where_pattern?(pattern)
-              raise Error, '`where` is only valid as a case/match clause head'
+              emit_error!('`where` is only valid as a case/match clause head')
             else
               emit_sequence_match_pattern(pattern.items, env, mode:, allow_pins:, state:)
             end
@@ -70,7 +70,7 @@ module Kapusta
           when Symbol, String, Numeric, true, false
             "[:lit, #{pattern.inspect}]"
           else
-            raise Error, "bad pattern: #{pattern.inspect}"
+            emit_error!("bad pattern: #{pattern.inspect}")
           end
         end
 
@@ -88,10 +88,11 @@ module Kapusta
         end
 
         def emit_named_match_pattern(name, env, mode:, state:, allow_nil:, prefer_pin:)
+          binding = prefer_pin && mode == :match ? env.lookup_if_defined(name) : nil
           if state[:bound_names].key?(name)
             "[:ref, #{name.inspect}]"
-          elsif prefer_pin && mode == :match && env.defined?(name)
-            "[:pin, #{env.lookup(name)}]"
+          elsif binding
+            "[:pin, #{binding_value_code(binding)}]"
           else
             state[:bound_names][name] = true
             state[:binding_names] << name
@@ -115,13 +116,15 @@ module Kapusta
         end
 
         def emit_pin_match_pattern(pattern, env, mode:, allow_pins:)
-          raise Error, 'pin patterns are only supported inside `case` guards' unless allow_pins && mode == :case
+          emit_error!('pin patterns are only supported inside `case` guards') unless allow_pins && mode == :case
 
           name_sym = pattern.items[1]
-          raise Error, "bad pin pattern: #{pattern.inspect}" unless name_sym.is_a?(Sym)
-          raise Error, "cannot pin undefined name: #{name_sym.name}" unless env.defined?(name_sym.name)
+          emit_error!("bad pin pattern: #{pattern.inspect}") unless name_sym.is_a?(Sym)
 
-          "[:pin, #{env.lookup(name_sym.name)}]"
+          binding = env.lookup_if_defined(name_sym.name)
+          emit_error!("cannot pin undefined name: #{name_sym.name}") unless binding
+
+          "[:pin, #{binding_value_code(binding)}]"
         end
 
         def emit_or_match_pattern(pattern, env, mode:, allow_pins:, state:)
@@ -136,7 +139,7 @@ module Kapusta
             compiled = emit_match_pattern(subpattern, env, mode:, allow_pins:, state: alt_state)
             alt_names = alt_state[:binding_names][initial_names..]
             canonical_names ||= alt_names
-            raise Error, 'all `or` patterns must bind the same names' if canonical_names.sort != alt_names.sort
+            emit_error!('all `or` patterns must bind the same names') if canonical_names.sort != alt_names.sort
 
             compiled
           end
@@ -174,7 +177,7 @@ module Kapusta
           when Symbol, String, Numeric, true, false
             "[:lit, #{pattern.inspect}]"
           else
-            raise Error, "bad pattern: #{pattern.inspect}"
+            emit_error!("bad pattern: #{pattern.inspect}")
           end
         end
 

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

@@ -6,6 +6,10 @@ module Kapusta
       module Support
         private
 
+        def emit_error!(message)
+          raise Error, "#{@path}: #{message}"
+        end
+
         def emit_forms_with_headers(forms, env, current_scope, result: true)
           i = 0
           codes = []
@@ -63,9 +67,14 @@ module Kapusta
         end
 
         def emit_form_in_sequence(form, env, current_scope, allow_method_definitions:, result_needed: true)
-          if allow_method_definitions && method_definition_form?(form) && %i[module class].include?(current_scope)
-            [emit_method_definition(form, env), env]
-          elsif named_function_form?(form)
+          if allow_method_definitions &&
+             method_definition_form?(form) &&
+             %i[toplevel module class].include?(current_scope)
+            code, env = emit_definition_form(form, env, current_scope)
+            return [code, env] if code
+          end
+
+          if named_function_form?(form)
             emit_named_fn_assignment(form, env, current_scope)
           elsif local_form?(form)
             code, env = emit_local_form(form, env, current_scope)
@@ -186,7 +195,7 @@ module Kapusta
 
         def local_name(source_name, env, shadow:)
           base = sanitize_local(source_name)
-          base = "user_#{base}" if reserved_generated_name?(base)
+          base = "user_#{base}" if !generated_symbol?(source_name) && reserved_generated_name?(base)
           return base unless ruby_name_defined?(env, base, shadow:)
 
           index = 2
@@ -206,6 +215,10 @@ module Kapusta
           name.start_with?('kap_', '__kap_')
         end
 
+        def generated_symbol?(source_name)
+          source_name.is_a?(GeneratedSym)
+        end
+
         def runtime_helper(name)
           helper = name.to_sym
           @runtime_helpers << helper unless @runtime_helpers.include?(helper)
@@ -219,6 +232,14 @@ module Kapusta
           "#{runtime_helper(name)}(#{rendered_args.join(', ')})"
         end
 
+        def method_binding?(binding)
+          binding.is_a?(Env::MethodBinding)
+        end
+
+        def binding_value_code(binding)
+          method_binding?(binding) ? "method(#{binding.ruby_name.to_sym.inspect})" : binding
+        end
+
         def parse_counted_for_bindings(bindings, env, current_scope)
           name_sym = bindings[0]
           loop_env = env.child
@@ -242,24 +263,18 @@ module Kapusta
 
         def emit_counted_loop(ruby_name:, start_code:, finish_code:, step_code:,
                               until_form:, loop_env:, current_scope:, body_code:)
-          finish_var = temp('finish')
-          step_var = temp('step')
-          cmp_var = temp('cmp')
           until_code = until_form ? "break if #{emit_expr(until_form, loop_env, current_scope)}" : nil
-          body = [until_code, body_code, "#{ruby_name} += #{step_var}"].compact.reject(&:empty?).join("\n")
+          body = [until_code, body_code].compact.reject(&:empty?).join("\n")
+          step_part = step_code == '1' ? '' : ", #{step_code}"
           [
-            "#{ruby_name} = #{start_code}",
-            "#{finish_var} = #{finish_code}",
-            "#{step_var} = #{step_code}",
-            "#{cmp_var} = #{step_var} >= 0 ? :<= : :>=",
-            "while #{ruby_name}.public_send(#{cmp_var}, #{finish_var})",
+            "#{parenthesize(start_code)}.step(#{finish_code}#{step_part}) do |#{ruby_name}|",
             indent(body),
             'end'
           ].join("\n")
         end
 
         def sanitize_local(name)
-          base = Kapusta.kebab_to_snake(name)
+          base = Kapusta.kebab_to_snake(name.respond_to?(:name) ? name.name : name)
           base = base.gsub('?', '_q').gsub('!', '_bang')
           base = base.gsub(/[^a-zA-Z0-9_]/, '_')
           if base.empty? || base.match?(/\A\d/) || base.match?(/\A[A-Z]/) || self.class::RUBY_KEYWORDS.include?(base)

data/lib/kapusta/compiler/emitter.rb

@@ -34,11 +34,7 @@ module Kapusta
         env = Env.new
         body = emit_forms_with_headers(forms, env, :toplevel)
         helpers = Runtime.helper_source(@runtime_helpers)
-        [
-          '# frozen_string_literal: true',
-          helpers,
-          body
-        ].reject(&:empty?).join("\n\n") << "\n"
+        [helpers, body].reject(&:empty?).join("\n\n") << "\n"
       end
     end
   end

data/lib/kapusta/compiler/normalizer.rb

@@ -38,11 +38,11 @@ module Kapusta
         when 'when'
           cond = items[1]
           body = wrap_do(items[2..])
-          List.new([Sym.new('if'), cond, body, nil])
+          List.new([Sym.new('if'), cond, body])
         when 'unless'
           cond = items[1]
           body = wrap_do(items[2..])
-          List.new([Sym.new('if'), cond, nil, body])
+          List.new([Sym.new('if'), List.new([Sym.new('not'), cond]), body])
         when 'tset'
           List.new([Sym.new('set'), List.new([Sym.new('.'), items[1], items[2]]), items[3]])
         when 'pcall'
@@ -74,7 +74,7 @@ module Kapusta
       end
 
       def wrap_do(forms)
-        return nil if forms.empty?
+        return if forms.empty?
         return forms.first if forms.length == 1
 
         List.new([Sym.new('do'), *forms])
@@ -85,29 +85,48 @@ module Kapusta
         short = %w[-?> -?>>].include?(kind)
         position = %w[-> -?>].include?(kind) ? :first : :last
 
+        return thread_short(forms, position) if short
+
         forms[1..].reduce(value) do |memo, form|
-          threaded =
-            if form.is_a?(List)
-              if position == :first
-                List.new([form.items[0], memo, *form.items[1..]])
-              else
-                List.new([*form.items, memo])
-              end
-            else
-              List.new([form, memo])
-            end
-
-          if short
-            List.new([Sym.new('if'), List.new([Sym.new('='), memo, nil]), nil, threaded])
+          thread_step(memo, form, position)
+        end
+      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)
+                              ])
+                   ])
+        end
+      end
+
+      def thread_step(memo, form, position)
+        if form.is_a?(List)
+          if position == :first
+            List.new([form.items[0], memo, *form.items[1..]])
           else
-            threaded
+            List.new([*form.items, memo])
           end
+        else
+          List.new([form, memo])
         end
       end
 
+      def thread_temp
+        gensym('kap_thread')
+      end
+
       def doto(forms)
         value = forms.first
-        temp = Sym.new('__doto__')
+        temp = gensym('kap_doto')
         body = forms[1..].map do |form|
           if form.is_a?(List)
             List.new([form.items[0], temp, *form.items[1..]])
@@ -117,6 +136,11 @@ module Kapusta
         end
         List.new([Sym.new('let'), Vec.new([temp, value]), *body, temp])
       end
+
+      def gensym(prefix)
+        @gensym_index = (@gensym_index || 0) + 1
+        GeneratedSym.new("#{prefix}_#{@gensym_index}", @gensym_index)
+      end
     end
   end
 end