riml 0.3.9 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDk4OTEyMjkyYTk1YzVjYjEzNzAxNTllZGVmNjY0NGE5YTJjZWZmYQ==
+    YzcxODgxN2I3YzM3MjdlZjdhMDM1Y2E4NzhmZmM1ZjM3YWQ1ZjQ0YQ==
   data.tar.gz: !binary |-
-    OTY1ZDRlMDVjNGY3ZjA3YmViZGE2M2RjY2VkODg2ZjJhMDk5NTkxZA==
+    NjcxN2EzNDgyZTVjODZkZjE3MGIyZTk2MmQwMzI1NDRhNmViZjI0NA==
 SHA512:
   metadata.gz: !binary |-
-    MTk4MTY0Y2FiMGQ0ZDc4ODNjNDk4NDdmOGViZmFhODUxMmYxY2E1NjY5Njk4
-    ZDIxNGI3ZjI3ZjQyZjcxNDNmYWQxYWUyNTNlNzk0ODc1ZmEzZDU1YmUwZGQ1
-    YmQ1Y2E0N2M4YzE1OWFhMmZlNjkzYTZlOWQ4OWUyYmFlOWVlZmU=
+    YTU5N2JjMjdkODhhZjBkOTlkNmMwYjdkMTg5ZmUxZTIwNzAyNTZhYmMwMGZl
+    ZWE3MmI1ODI3Nzk3OTliOTcwZWZiOTcwMzkwY2I2OTUyZDQwZWNjYmI1ZmQy
+    NDVjYTIzNjdlNWQzNzk5YjBiOGMwZWY4NDBkNmZlZGE1MmU1ZDQ=
   data.tar.gz: !binary |-
-    MTc4ZjZkZjE1MmU3YTRkNDVlYjA2NTE4YzRhYjk1MGE1NTkwM2FlMjM1NTYw
-    OGU2ZWRmZDM2YmM2OTZlZmIwODI0ZmYxNTFjMWNlZWIxM2EyNWMyNDQxYzBk
-    MTU3NjJhMjNlM2Q3YTVkNDYxNjljZjZiNDNlMzA2NzQyOTZlODI=
+    NjhmMTc0MjIzMDMzNmU2ZDIyMWIyZTZlYWZkNWZmNDNkMzVhMzYzYWE4NWQ0
+    YjU5NDI2ZTQ5MmJhYmJjODE1ZDg0ZjFiMTg1MDllNWE3NDJjNjQwZjBlZDhj
+    YzQ4ODgyNTA5Y2JjNWFhZmVhNmIyZWZjMzVlODIxMGFhY2ZmOTI=

data/lib/riml/ast_rewriter.rb

@@ -63,7 +63,7 @@ module Riml
         DefaultParamToIfNode.new(ast, classes),
         DeserializeVarAssignment.new(ast, classes),
         TopLevelDefMethodToDef.new(ast, classes),
-        SplatsToExecuteInCallingContext.new(ast, classes)
+        SplatsToCallFunctionInCallingContext.new(ast, classes)
       ]
       rewriters.each do |rewriter|
         rewriter.rewrite_on_match
@@ -414,10 +414,11 @@ module Riml
 
         InitializeSuperToObjectExtension.new(constructor, classes, node).rewrite_on_match
         ExtendObjectWithMethods.new(node, classes).rewrite_on_match
-        SelfToDictName.new(dict_name).rewrite_on_match(constructor)
+        SelfToDictNameInAssignments.new(dict_name).rewrite_on_match(constructor)
         SuperToSuperclassFunction.new(node, classes).rewrite_on_match
         PrivateFunctionCallToPassObjExplicitly.new(node, classes).rewrite_on_match
-        SplatsToExecuteInCallingContext.new(node, classes).rewrite_on_match
+        SplatsToCallFunctionInCallingContext.new(node, classes).rewrite_on_match
+        SelfToDictName.new(dict_name).rewrite_on_match(constructor)
 
         constructor.expressions.nodes.push(
           ReturnNode.new(GetVariableNode.new(nil, dict_name))
@@ -495,8 +496,11 @@ module Riml
 
       class PrivateFunctionCallToPassObjExplicitly < AST_Rewriter
         def match?(node)
-          CallNode === node && DictGetDotNode === node.name && node.name.dict.scope_modifier.nil? &&
-            node.name.dict.name == 'self' && (node.name.keys & ast.private_function_names).size == 1
+          CallNode === node && node.name.instance_of?(DictGetDotNode) &&
+            !node.name.dict.is_a?(ListOrDictGetNode) &&
+            node.name.dict.scope_modifier.nil? &&
+            node.name.dict.name == 'self' &&
+            (node.name.keys & ast.private_function_names).size == 1
         end
 
         def replace(node)
@@ -575,7 +579,12 @@ module Riml
         end
       end
 
-      class SelfToDictName < AST_Rewriter
+      # if inside 'Foo' class,
+      # transforms:
+      #   self.something = 1
+      # to:
+      #   fooObj.something = 1
+      class SelfToDictNameInAssignments < AST_Rewriter
         attr_reader :dict_name
         def initialize(dict_name)
           @dict_name = dict_name
@@ -586,7 +595,27 @@ module Riml
         end
 
         def replace(node)
-          node.lhs.dict.name = dict_name
+          node.lhs.dict.name = @dict_name
+        end
+      end
+
+      # if inside 'Foo' class,
+      # transforms:
+      #   extend(self, {})
+      # to:
+      #   extend(fooObj, {})
+      class SelfToDictName < AST_Rewriter
+        attr_reader :dict_name
+        def initialize(dict_name)
+          @dict_name = dict_name
+        end
+
+        def match?(node)
+          GetVariableNode === node && node.name == "self" && node.scope_modifier.nil?
+        end
+
+        def replace(node)
+          node.name = @dict_name
         end
       end
 
@@ -726,20 +755,11 @@ module Riml
           # parameter to the function we're in) to the splat arg
           if @function_node.private_function?
             if (splat_node = node_args.detect { |arg| SplatNode === arg })
-              splat_node.expression = WrapInParensNode.new(
-                BinaryOperatorNode.new(
-                  '+',
-                  [
-                    ListNode.new([
-                      GetVariableNode.new('a:', @function_node.parameters.first)
-                    ]),
-                    GetVariableNode.new('a:', '000')
-                  ]
-                )
-              )
+              self_var = GetVariableNode.new('a:', @function_node.parameters.first)
+              splat_node.expression = BinaryOperatorNode.new('+', [ListNode.wrap(self_var), splat_node.expression])
               establish_parents(splat_node.expression)
             end
-            # call s.ClassA_private_func(args)
+            # call s:ClassA_private_func(args)
             call_node_name = superclass_func_name(superclass)
           else
             # call self.ClassA_public_func(args)
@@ -754,6 +774,7 @@ module Riml
             node_args
           )
 
+          call_node.super_call = true
           node.replace_with(call_node)
           # private functions are NOT extended in constructor function
           unless @function_node.private_function?
@@ -803,164 +824,39 @@ module Riml
     #
     # to:
     #
-    #   let __riml_splat_list = a:000
-    #   let __riml_splat_size = len(__riml_splat_list)
-    #   let __riml_splat_str_vars = []
-    #   let __riml_splat_idx = 1
-    #   while __riml_splat_idx <=# __riml_splat_size
-    #     let __riml_splat_var_{__riml_splat_idx} = get(__riml_splat_list, __riml_splat_idx - 1)
-    #     call add(__riml_splat_str_vars, __riml_splat_var_{__riml_splat_idx})
-    #     let __riml_splat_idx += 1
-    #   endwhile
-    #   execute 'let s:animalObj = s:AnimalConstructor(' . join(__riml_splat_str_vars, ', ') . ')'
+    #   let animalObj = call('s:AnimalConstructor', a:000)
     #
     # Basically, mimic Ruby's approach to expanding lists to their
     # constituent argument parts with '*' in calling context.
-    class SplatsToExecuteInCallingContext < AST_Rewriter
+    class SplatsToCallFunctionInCallingContext < AST_Rewriter
 
       def match?(node)
-        if SplatNode === node && CallNode === node.parent
-          @splat_node = node
-        end
+        SplatNode === node && CallNode === node.parent
       end
 
       def replace(node)
-        construct_splat_str_vars_node = build_construct_splat_str_vars_node
-        call_node_args =
-          CallNode.new(
-            nil,
-            'join',
-            [
-              GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_str_vars'),
-              StringNode.new(', ', :s)
-            ]
-          )
         call_node = node.parent
-        node_to_execute = if AssignNode === call_node.parent
-          assign_node = call_node.parent
-          n = call_node
-          until DefNode === n || n.nil?
-            n = n.parent
-          end
-          # This is necessary because this node is getting put into a new
-          # compiler where it not wrapped in a function context, therefore
-          # variables will be script-local there unless their scope_modifier
-          # is set
-          if n && assign_node.lhs.scope_modifier.nil?
-            if global_scope?
-              assign_node.lhs.scope_modifier = 's:'
-            else
-              assign_node.lhs.scope_modifier = 'l:'
-            end
-          end
-          assign_node
-        else
-          call_node
-        end
-        call_node.arguments.clear
-        compiler = Compiler.new
-        # have to dup node_to_execute here because, if not, its parent will
-        # get reset during this next compilation step
-        output = compiler.compile(Nodes.new([node_to_execute.clone]))
-        execute_string_node = StringNode.new(output.chomp[0..-2], :s)
-        if node_to_execute.instance_of?(CallNode)
-          execute_string_node.value.insert(0, 'call ')
-        end
-        execute_arg = BinaryOperatorNode.new(
-          '.',
-          [
-            execute_string_node,
-            BinaryOperatorNode.new(
-              '.',
-              [
-                call_node_args,
-                StringNode.new(')', :s)
-              ]
-            )
-          ]
-        )
-        execute_node = CallNode.new(nil, 'execute', [execute_arg])
-        establish_parents(execute_node)
-        node.remove
-        node_to_execute.replace_with(construct_splat_str_vars_node)
-        execute_node.parent = construct_splat_str_vars_node.parent
-        construct_splat_str_vars_node.parent.insert_after(construct_splat_str_vars_node, execute_node)
-      end
-
-      private
-
-      def build_construct_splat_str_vars_node
-        nodes = Nodes.new([])
-        splat_list_init = AssignNode.new(
-          '=',
-          GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_list'),
-          @splat_node.expression
-        )
-        splat_size = AssignNode.new(
-          '=',
-          GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_size'),
-          CallNode.new(nil, 'len', [GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_list')])
-        )
-        splat_string_vars_init = AssignNode.new(
-          '=',
-          GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_str_vars'),
-          ListNode.new([])
-        )
-        splat_list_idx_init = AssignNode.new(
-          '=',
-          GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_idx'),
-          NumberNode.new('1')
-        )
-        while_loop = WhileNode.new(
-          # condition
-          BinaryOperatorNode.new('<=', [GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_idx'), GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_size')]),
-          # body
-          Nodes.new([
-            AssignNode.new(
-              '=',
-              GetCurlyBraceNameNode.new(tmp_var_modifier.dup, CurlyBraceVariable.new([CurlyBracePart.new('__riml_splat_var_'), CurlyBraceVariable.new([CurlyBracePart.new(GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_idx'))])])),
-              CallNode.new(nil, 'get', [
-                GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_list'),
-                BinaryOperatorNode.new('-', [
-                  GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_idx'),
-                  NumberNode.new('1')
-                ])
-              ])
-            ),
-            ExplicitCallNode.new(nil, 'add', [
-              GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_str_vars'),
-              BinaryOperatorNode.new('.', [StringNode.new('__riml_splat_var_', :s), GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_idx')])
+        is_method_call = call_node.method_call?
+        function_name_expr = if is_method_call && call_node.super_call?
+          BinaryOperatorNode.new('.', [
+            BinaryOperatorNode.new('.', [
+              StringNode.new('<SNR>', :s), CallNode.new('s:', 'SID', [])
             ]),
-            AssignNode.new('+=', GetVariableNode.new(tmp_var_modifier.dup, '__riml_splat_idx'), NumberNode.new('1'))
+            StringNode.new("_s:#{call_node.name.keys.last}", :s)
           ])
-        )
-        nodes << splat_list_init << splat_size << splat_string_vars_init <<
-          splat_list_idx_init << while_loop
-        establish_parents(nodes)
-        nodes
-      end
-
-      def tmp_var_modifier
-        @tmp_var_modifier ||= begin
-          n = @splat_node
-          while n != nil && !(DefNode === n)
-            n = n.parent
-          end
-          # n is either `nil` or DefNode
-          if n.nil?
-            's:'
-          else
-            'n:'
-          end
+        else
+          call_node.scope_modifier = 's:' if call_node.scope_modifier.nil?
+          StringNode.new(call_node.full_name, :s)
         end
-      end
-
-      def global_scope?
-        tmp_var_modifier == 's:'
-      end
-
-      def local_scope?
-        not global_scope?
+        call_node.scope_modifier = ''
+        call_node.name = 'call'
+        call_node.arguments = []
+        call_node.arguments << function_name_expr
+        call_node.arguments << node.expression
+        if is_method_call
+          call_node.arguments << GetVariableNode.new(nil, 'self')
+        end
+        reestablish_parents(call_node)
       end
     end
 
@@ -978,6 +874,13 @@ module Riml
         call_node = node.call_node
         call_node.name = class_node.constructor_name
         call_node.scope_modifier = class_node.constructor.scope_modifier
+        # FIXME: `replace_with` doesn't take into account this scenario!
+        if CallNode === node.parent && node.parent.arguments.include?(node)
+          idx = node.parent.arguments.index(node)
+          node.parent.arguments[idx] = call_node
+        else
+          node.replace_with(call_node)
+        end
       end
     end
 
@@ -1015,19 +918,26 @@ module Riml
         end
 
         if_expression = construct_if_expression(node)
+        if insert_idx.zero?
+          def_node.expressions.nodes.unshift(construct_copy_splat_var_assignment)
+          SplatVarToCopiedSplatVar.new(def_node, classes).rewrite_on_match
+        end
 
         if last_default_param == node
           def_node.parameters.delete_if(&DefNode::DEFAULT_PARAMS)
           def_node.parameters << SPLAT_LITERAL unless def_node.splat
         end
-        def_node.expressions.nodes.insert(insert_idx, if_expression)
+        def_node.expressions.nodes.insert(insert_idx + 1, if_expression)
         reestablish_parents(def_node)
       end
 
+      private
+
       def construct_if_expression(node)
-        get_splat_node = CallNode.new(nil, 'get', [ GetVariableNode.new('a:', '000'), NumberNode.new(0), StringNode.new('rimldefault', :s) ])
-        condition_node = BinaryOperatorNode.new('!=#', [ get_splat_node, StringNode.new('rimldefault', :s) ])
-        remove_from_splat_node = CallNode.new(nil, 'remove', [ GetVariableNode.new('a:', '000'), NumberNode.new(0) ])
+        condition_node = UnaryOperatorNode.new('!', [
+          CallNode.new(nil, 'empty', [ GetVariableNode.new('', '__splat_var_cpy') ])
+        ])
+        remove_from_splat_node = CallNode.new(nil, 'remove', [ GetVariableNode.new('', '__splat_var_cpy'), NumberNode.new(0) ])
         IfNode.new(condition_node,
           Nodes.new([
             AssignNode.new('=', GetVariableNode.new(nil, node.parameter), remove_from_splat_node),
@@ -1038,9 +948,27 @@ module Riml
         )
       end
 
-      def max_recursion_lvl
-        3
+      def construct_copy_splat_var_assignment
+        AssignNode.new('=', GetVariableNode.new('', '__splat_var_cpy'), CallNode.new('', 'copy', [GetVariableNode.new('a:', '000')]))
       end
+
+      # rewrites a:000 or args (if function used *args parameter name) to:
+      #   __splat_var_cpy
+      class SplatVarToCopiedSplatVar < AST_Rewriter
+        def initialize(def_node, classes)
+          super(def_node, classes)
+        end
+
+        def match?(node)
+          GetVariableNode === node &&
+            ( (node.name == '000' && node.scope_modifier.nil?) || ast.is_splat_arg?(node) )
+        end
+
+        def replace(node)
+          node.name = '__splat_var_cpy'
+        end
+      end
+
     end
 
     class DeserializeVarAssignment < AST_Rewriter

data/lib/riml/compiler.rb

@@ -46,9 +46,10 @@ module Riml
       end
 
       def visitor_for_node(node, params={})
-        Compiler.const_get("#{node.class.name.split('::').last}Visitor").new(params)
+        class_name = "#{node.class.name.split('::').last}Visitor"
+        Compiler.const_get(class_name).new(params)
       rescue NameError
-        error = CompileError.new('unexpected construct', node)
+        error = CompileError.new("unexpected construct: #{class_name}", node)
         raise error
       end
 
@@ -756,14 +757,6 @@ module Riml
       end
     end
 
-    class ObjectInstantiationNodeVisitor < Visitor
-      def compile(node)
-        node.call_node.parent_node = node
-        node.call_node.accept(visitor_for_node(node.call_node))
-        node.compiled_output
-      end
-    end
-
     # root node has access to compiler instance in order to append to
     # the compiler's `compile_queue`. This happens when another file is
     # sourced using `riml_source`.

data/lib/riml/constants.rb

@@ -65,7 +65,6 @@ abs
 acos
 add
 append
-append
 argc
 argidx
 argv

data/lib/riml/lexer.rb

@@ -150,8 +150,8 @@ module Riml
 
       elsif @in_function_declaration && (splat_param = @s.scan(/\A(\.{3}|\*[a-zA-Z_]\w*)/))
         @token_buf << [:SPLAT_PARAM, splat_param]
-      # splat in calling context. ex: super(*args) or super(*(args + other_args))
-      elsif !@in_function_declaration && prev_token && prev_token[0] == '(' && @s.check(/\A\*(\w+|\()/)
+      # splat in calling context. ex: super(*args) or super(*(args + other_args)) or func('hey', *args)
+      elsif !@in_function_declaration && prev_token && @s.check(/\A\*(\w+|\()/)
         @token_buf << [:SPLAT_ARG, @s.getch]
       # integer (octal)
       elsif octal = @s.scan(/\A0[0-7]+/)

data/lib/riml/nodes.rb

@@ -1,9 +1,12 @@
 require File.expand_path('../constants', __FILE__)
 require File.expand_path('../errors', __FILE__)
+require File.expand_path('../walkable', __FILE__)
 require 'set'
 
 module Riml
   module Visitable
+    include Walkable
+
     def accept(visitor)
       visitor.visit(self)
     end
@@ -17,7 +20,7 @@ module Riml
       @compiled_output ||= ''
     end
 
-    EMPTY_CHILDREN = []
+    EMPTY_CHILDREN = [].freeze
 
     def children
       EMPTY_CHILDREN
@@ -40,101 +43,6 @@ module Riml
     end
   end
 
-  module Walkable
-    include Enumerable
-
-    def each(&block)
-      children.each(&block)
-    end
-    alias walk each
-
-    def previous
-      idx = index_by_member
-      if idx && parent.members[idx - 1]
-        attr = parent.members[idx - 1]
-        return send(attr)
-      else
-        idx = index_by_children
-        return unless idx
-        parent.children.fetch(idx - 1)
-      end
-    end
-
-    def child_previous_to(node)
-      node.previous
-    end
-
-    def insert_before(node, new_node)
-      idx = children.find_index(node)
-      return unless idx
-      children.insert(idx - 1, new_node)
-    end
-
-    def next
-      idx = index_by_member
-      if idx && parent.members[idx + 1]
-        attr = parent.members[idx + 1]
-        return parent.send(attr)
-      else
-        idx = index_by_children
-        return unless idx
-        parent.children.fetch(idx + 1)
-      end
-    end
-
-    def child_after(node)
-      node.next
-    end
-
-    def insert_after(node, new_node)
-      idx = children.find_index(node)
-      return unless idx
-      children.insert(idx + 1, new_node)
-    end
-
-    def index_by_member
-      attrs = parent.members
-      attrs.each_with_index do |attr, i|
-        if parent.send(attr) == self
-          return i
-        end
-      end
-      nil
-    end
-
-    def index_by_children
-      parent.children.find_index(self)
-    end
-
-    def remove
-      idx = index_by_member
-      if idx
-        attr = parent.members[idx]
-        parent.send("#{attr}=", nil)
-      else
-        idx = index_by_children
-        parent.children.slice!(idx) if idx
-      end
-    end
-
-    def replace_with(new_node)
-      idx = index_by_member
-      if idx
-        attr = parent.members[idx]
-        new_node.parent = parent
-        parent.send("#{attr}=", new_node)
-        new_node
-      else
-        idx = index_by_children
-        return unless idx
-        new_node.parent = parent
-        parent.children.insert(idx, new_node)
-        parent.children.slice!(idx + 1)
-        new_node
-      end
-    end
-  end
-
   module Indentable
     def indent
       @indent ||= ' ' * 2
@@ -167,7 +75,6 @@ module Riml
   # Collection of nodes each one representing an expression.
   class Nodes < Struct.new(:nodes)
     include Visitable
-    include Walkable
 
     def <<(node)
       nodes << node
@@ -212,7 +119,6 @@ module Riml
 
   class StringLiteralConcatNode < Struct.new(:string_nodes)
     include Visitable
-    include Walkable
 
     def initialize(*string_nodes)
       super(string_nodes)
@@ -227,7 +133,6 @@ module Riml
   class RegexpNode < LiteralNode; end
 
   class ListNode < LiteralNode
-    include Walkable
     def self.wrap(value)
       val = Array === value ? value : [value]
       new(val)
@@ -249,7 +154,6 @@ module Riml
   end
 
   class DictionaryNode < LiteralNode
-    include Walkable
 
     def initialize(value)
       super(value.to_a)
@@ -287,7 +191,6 @@ module Riml
   # Ex: `super(*args)`,  `super(*a:000)`, `someFunc(*(list + ['item']))`
   class SplatNode < Struct.new(:expression)
     include Visitable
-    include Walkable
 
     def children
       [expression]
@@ -316,7 +219,6 @@ module Riml
 
   class ReturnNode < Struct.new(:expression)
     include Visitable
-    include Walkable
 
     def children
       [expression]
@@ -325,7 +227,6 @@ module Riml
 
   class WrapInParensNode < Struct.new(:expression)
     include Visitable
-    include Walkable
 
     def force_newline_if_child_call_node?
       false
@@ -360,7 +261,8 @@ module Riml
     include Riml::Constants
     include Visitable
     include FullyNameable
-    include Walkable
+
+    attr_accessor :super_call
 
     ALL_BUILTIN_FUNCTIONS = BUILTIN_FUNCTIONS + BUILTIN_COMMANDS
     ALL_BUILTIN_COMMANDS  = BUILTIN_COMMANDS  + RIML_COMMANDS + VIML_COMMANDS
@@ -391,6 +293,14 @@ module Riml
       false
     end
 
+    def method_call?
+      name.instance_of?(DictGetDotNode) &&
+        name.dict.name == 'self' &&
+        name.dict.scope_modifier.nil?
+    end
+
+    alias super_call? super_call
+
     def autoload?
       name.include?('#')
     end
@@ -519,7 +429,6 @@ module Riml
 
   class OperatorNode < Struct.new(:operator, :operands)
     include Visitable
-    include Walkable
 
     def force_newline_if_child_call_node?
       false
@@ -575,7 +484,6 @@ module Riml
   # let s:var = 4
   class AssignNode < Struct.new(:operator, :lhs, :rhs)
     include Visitable
-    include Walkable
 
     def children
       [lhs, rhs]
@@ -584,7 +492,6 @@ module Riml
 
   class MultiAssignNode < Struct.new(:assigns)
     include Visitable
-    include Walkable
 
     def children
       assigns
@@ -618,6 +525,10 @@ module Riml
     include Visitable
     include FullyNameable
     include QuestionVariableExistence
+
+    def arguments_variable?
+      scope_modifier == 'a:' && name == '000'
+    end
   end
 
   # &autoindent
@@ -629,7 +540,6 @@ module Riml
 
   class GetCurlyBraceNameNode < Struct.new(:scope_modifier, :variable)
     include Visitable
-    include Walkable
 
     def children
       [variable]
@@ -638,7 +548,6 @@ module Riml
 
   class CurlyBraceVariable < Struct.new(:parts)
     include Visitable
-    include Walkable
 
     def <<(part)
       parts << part
@@ -652,7 +561,6 @@ module Riml
 
   class CurlyBracePart < Struct.new(:value)
     include Visitable
-    include Walkable
 
     def interpolated?
       GetVariableNode === value || GetSpecialVariableNode === value ||
@@ -680,7 +588,6 @@ module Riml
 
   class UnletVariableNode < Struct.new(:bang, :variables)
     include Visitable
-    include Walkable
 
     def <<(variable)
       variables << variable
@@ -697,7 +604,6 @@ module Riml
     include Visitable
     include Indentable
     include FullyNameable
-    include Walkable
 
     attr_accessor :private_function
     alias private_function? private_function
@@ -783,6 +689,12 @@ module Riml
       parameters.select(&DEFAULT_PARAMS)
     end
 
+    def is_splat_arg?(node)
+      splat = splat()
+      return false unless splat
+      GetVariableNode === node && node.scope_modifier.nil? && node.name == splat[1..-1]
+    end
+
     def children
       children = if sid?
         [sid, expressions]
@@ -795,7 +707,6 @@ module Riml
 
   class DefaultParamNode < Struct.new(:parameter, :expression)
     include Visitable
-    include Walkable
 
     def children
       [parameter, expression]
@@ -856,7 +767,6 @@ module Riml
   class ControlStructure < Struct.new(:condition, :body)
     include Visitable
     include Indentable
-    include Walkable
 
     def force_newline_if_child_call_node?
       false
@@ -894,7 +804,6 @@ module Riml
 
   class ElseNode < Struct.new(:expressions)
     include Visitable
-    include Walkable
     alias body expressions
 
     def <<(expr)
@@ -917,7 +826,6 @@ module Riml
 
   class ElseifNode < ControlStructure
     include Visitable
-    include Walkable
     alias expressions body
 
     def <<(expr)
@@ -950,7 +858,6 @@ module Riml
   class ForNode < Struct.new(:variable, :in_expression, :expressions)
     include Visitable
     include Indentable
-    include Walkable
 
     alias for_variable variable
 
@@ -981,7 +888,6 @@ module Riml
 
   class DictGetNode < Struct.new(:dict, :keys)
     include Visitable
-    include Walkable
 
     def children
       [dict] + keys
@@ -1006,7 +912,6 @@ module Riml
   # function()[identifier]
   class ListOrDictGetNode < Struct.new(:list_or_dict, :keys)
     include Visitable
-    include Walkable
 
     alias list list_or_dict
     alias dict list_or_dict
@@ -1022,7 +927,6 @@ module Riml
 
   class GetVariableByScopeAndDictNameNode < Struct.new(:scope_modifier, :keys)
     include Visitable
-    include Walkable
 
     def children
       [scope_modifier] + keys
@@ -1032,7 +936,6 @@ module Riml
   class TryNode < Struct.new(:try_block, :catch_nodes, :finally_block)
     include Visitable
     include Indentable
-    include Walkable
 
     def children
       [try_block] + catch_nodes.to_a + [finally_block].compact
@@ -1041,7 +944,6 @@ module Riml
 
   class CatchNode < Struct.new(:regexp, :expressions)
     include Visitable
-    include Walkable
     include NotNestedUnder
 
     def children
@@ -1052,7 +954,6 @@ module Riml
 
   class ClassDefinitionNode < Struct.new(:scope_modifier, :name, :superclass_name, :expressions)
     include Visitable
-    include Walkable
 
     FUNCTIONS = lambda {|expr| DefNode === expr}
     DEFAULT_SCOPE_MODIFIER = 's:'
@@ -1126,7 +1027,6 @@ module Riml
 
   class SuperNode < Struct.new(:arguments, :with_parens)
     include Visitable
-    include Walkable
 
     def use_all_arguments?
       arguments.empty? && !with_parens
@@ -1139,7 +1039,6 @@ module Riml
 
   class ObjectInstantiationNode < Struct.new(:call_node)
     include Visitable
-    include Walkable
 
     def force_newline_if_child_call_node?
       false

data/lib/riml/walkable.rb

@@ -0,0 +1,97 @@
+module Riml
+  module Walkable
+    include Enumerable
+
+    def each(&block)
+      children.each(&block)
+    end
+    alias walk each
+
+    def previous
+      idx = index_by_member
+      if idx && parent.members[idx - 1]
+        attr = parent.members[idx - 1]
+        return send(attr)
+      else
+        idx = index_by_children
+        return unless idx
+        parent.children.fetch(idx - 1)
+      end
+    end
+
+    def child_previous_to(node)
+      node.previous
+    end
+
+    def insert_before(node, new_node)
+      idx = children.find_index(node)
+      return unless idx
+      children.insert(idx - 1, new_node)
+    end
+
+    def next
+      idx = index_by_member
+      if idx && parent.members[idx + 1]
+        attr = parent.members[idx + 1]
+        return parent.send(attr)
+      else
+        idx = index_by_children
+        return unless idx
+        parent.children.fetch(idx + 1)
+      end
+    end
+
+    def child_after(node)
+      node.next
+    end
+
+    def insert_after(node, new_node)
+      idx = children.find_index(node)
+      return unless idx
+      children.insert(idx + 1, new_node)
+    end
+
+    def index_by_member
+      attrs = parent.members
+      attrs.each_with_index do |attr, i|
+        if parent.send(attr) == self
+          return i
+        end
+      end
+      nil
+    end
+
+    def index_by_children
+      parent.children.find_index(self)
+    end
+
+    def remove
+      idx = index_by_member
+      if idx
+        attr = parent.members[idx]
+        parent.send("#{attr}=", nil)
+      else
+        idx = index_by_children
+        parent.children.slice!(idx) if idx
+      end
+    end
+
+    def replace_with(new_node)
+      idx = index_by_member
+      if idx
+        attr = parent.members[idx]
+        new_node.parent = parent
+        parent.send("#{attr}=", new_node)
+        new_node
+      else
+        idx = index_by_children
+        return unless idx
+        new_node.parent = parent
+        parent.children.insert(idx, new_node)
+        parent.children.slice!(idx + 1)
+        new_node
+      end
+    end
+
+  end
+end

data/version.rb

@@ -1,4 +1,4 @@
 module Riml
-  # release date: Jan. 12, 2014
-  VERSION = [0,3,9]
+  # release date: Feb 2, 2014
+  VERSION = [0,4,0]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riml
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Luke Gruber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -118,6 +118,7 @@ files:
 - lib/riml/path_cache.rb
 - lib/riml/repl.rb
 - lib/riml/rewritten_ast_cache.rb
+- lib/riml/walkable.rb
 - lib/riml/walker.rb
 - lib/riml/warning_buffer.rb
 - version.rb