O.o eeetz alieeeve!

Can't believe it was that easy!

bin/ddir

@@ -36,7 +36,7 @@ parse_opts = {
             c.downcase
               .upcase
               .chars.join '.'
-    #     .map (c.downcase)
+          .map (c.downcase)
     #     .map (c*2)
     #     .map.with_index (c.upcase, i*2)
     #     .each.with_object "" ((char.downcase, index/2), str)
@@ -45,7 +45,7 @@ parse_opts = {
     #       else
     #         str << "nothin"
           .chars.each_slice 2 (c1, c2) c1 + c2
-    #     .chars.each_slice 2 (c1 + c2)
+          .chars.each_slice 2 (c1 + c2)
   BODY
 }
 

lib/ddir/ast.rb

@@ -7,8 +7,9 @@ class Context
       attr_reader :depth
 
       def initialize
-        @depth = 0
+        @depth             = 0
         @expressions_stack = []
+        @locals_stack      = [[]]
       end
 
       def push_expressions
@@ -41,6 +42,17 @@ def update_depth(new_depth)
         @depth = new_depth
         @expressions_stack.pop while depth < current_expressions.depth
       end
+
+      def declare_local(local)
+        @locals_stack.last << local
+        local
+      end
+
+      def record_locals
+        @locals_stack.push []
+        yield
+        @locals_stack.pop
+      end
     end
 
 

lib/ddir/ddir.treetop

@@ -216,9 +216,10 @@ grammar DayDreamInRuby
     }
     /
      expression:expression {
-      # doesn't work yet
       def param_asts(context)
-        [expression.to_ast(context)]
+        context.record_locals { expression.to_ast context }
+               .uniq(&:name)
+               .map { |local| Ddir::Ast::OrdinalParam.new name: local.name }
       end
       def expression_asts(context)
         [expression.to_ast(context)]
@@ -270,7 +271,9 @@ grammar DayDreamInRuby
   rule local_variable
     identifier {
       def to_ast(context)
-        Ddir::Ast::LocalVariable.new name: text_value.intern
+        local = Ddir::Ast::LocalVariable.new name: text_value.intern
+        context.declare_local local
+        local
       end
     }
   end

lib/ddir/ddir.treetop.generated.rb

@@ -1093,9 +1093,10 @@ def expression
   end
 
   module Param9
-    # doesn't work yet
     def param_asts(context)
-      [expression.to_ast(context)]
+      context.record_locals { expression.to_ast context }
+             .uniq(&:name)
+             .map { |local| Ddir::Ast::OrdinalParam.new name: local.name }
     end
     def expression_asts(context)
       [expression.to_ast(context)]
@@ -1544,7 +1545,9 @@ def _nt_variable
 
   module LocalVariable0
     def to_ast(context)
-      Ddir::Ast::LocalVariable.new name: text_value.intern
+      local = Ddir::Ast::LocalVariable.new name: text_value.intern
+      context.declare_local local
+      local
     end
   end
 

spec/ddir_spec.rb

@@ -218,25 +218,31 @@ class << self
 
       context 'code in the argument lists' do
         it 'identifies the locals by order of access and turns them into ordinals' do
-          pending
-          parses! '@.m (a.next, a + b)', block: {
+          parses! '@.m (a.next, 1 + b)', block: {
             params: [
               { type: :ordinal_param, name: :a },
               { type: :ordinal_param, name: :b },
             ],
             body: [
-              { type:   :send_message,
-                name:   :next,
-                target: { type: :local_variable, name: :a },
+              { type:     :send_message,
+                name:     :next,
+                receiver: { type: :local_variable, name: :a },
               },
-              { type:   :send_message,
-                name:   :next,
-                target: { type: :local_variable, name: :b },
+              { type:        :binary_expression,
+                operator:    :+,
+                left_child:  { type: :integer, value: 1 },
+                right_child: { type: :local_variable, name: :b },
               },
             ],
           }
         end
 
+        it 'doesn\'t get all confused by the same var being used multiple times', t2:true do
+          parses! '@.m (a+a)', block: {
+            params: [{type: :ordinal_param, name: :a }]
+          }
+        end
+
         it 'ignores locals in the surrounding environment'
         it 'moves the code down into the body'
         it 'accepts mixes of code args and other style args'

spec/spec_helper.rb

@@ -43,6 +43,7 @@ def recursive_assert(ast, expectations)
           actual.zip(expected) { |actual_at_index, expected_at_index|
             recursive_assert actual_at_index, expected_at_index
           }
+          expect(actual.count).to eq expected.count
         end
       else
         expect(actual).to eq expected