riml 0.3.4 → 0.3.5

data/bin/riml

@@ -8,21 +8,20 @@ module Riml
   require 'riml'
 
   require 'optparse'
-  require 'ostruct'
 
   class Options
     def self.parse(argv)
       argv << '--help' if argv.size.zero?
 
       # defaults
-      options = OpenStruct.new
-      options.compile_files = []
-      options.check_syntax_files = []
-      options.repl = false
-      options.vi_readline = false
-      options.allow_undefined_global_classes = DEFAULT_PARSE_OPTIONS[:allow_undefined_global_classes]
-      options.readable = DEFAULT_COMPILE_OPTIONS[:readable]
-      options.output_dir = DEFAULT_COMPILE_FILES_OPTIONS[:output_dir]
+      options = {}
+      options[:compile_files] = []
+      options[:check_syntax_files] = []
+      options[:repl] = false
+      options[:vi_readline] = false
+      options[:allow_undefined_global_classes] = DEFAULT_PARSE_OPTIONS[:allow_undefined_global_classes]
+      options[:readable] = DEFAULT_COMPILE_OPTIONS[:readable]
+      options[:output_dir] = DEFAULT_COMPILE_FILES_OPTIONS[:output_dir]
 
       OptionParser.new do |opts|
         opts.banner = "Usage: riml [options] [file1][,file2]..."
@@ -30,15 +29,15 @@ module Riml
         opts.separator "Specific options:"
 
         opts.on("-c", "--compile FILES", Array, "Compiles riml file(s) to VimL.") do |filenames|
-          append_filenames_to_list_if_valid(options.compile_files, *filenames)
+          append_filenames_to_list_if_valid(options[:compile_files], *filenames)
         end
 
         opts.on("-s", "--stdio", "Takes riml from stdin and outputs VimL to stdout.") do
-          options.stdio = true
+          options[:stdio] = true
         end
 
         opts.on("-k", "--check FILES", Array, "Checks syntax of file(s). Because Riml is (mostly) compatible with VimL, this can also be used to check VimL syntax.") do |filenames|
-          append_filenames_to_list_if_valid(options.check_syntax_files, *filenames)
+          append_filenames_to_list_if_valid(options[:check_syntax_files], *filenames)
         end
 
         opts.on("-S", "--source-path PATH", "Colon-separated path riml uses to find files for `riml_source`. Defaults to pwd.") do |path|
@@ -58,23 +57,23 @@ module Riml
         end
 
         opts.on("-a", "--allow-undef-global-classes", "Continue compilation when encountering undefined global class(es).") do
-          options.allow_undefined_global_classes = true
+          options[:allow_undefined_global_classes] = true
         end
 
         opts.on("-o", "--output-dir DIR", "Output all .vim files in specified directory.") do |dir|
-          options.output_dir = dir
+          options[:output_dir] = dir
         end
 
         opts.on("-d", "--condensed", "Omit readability improvements such as blank lines.") do
-          options.readable = false
+          options[:readable] = false
         end
 
         opts.on("-i", "--interactive", "Start an interactive riml session (REPL).") do
-          options.repl = true
+          options[:repl] = true
         end
 
         opts.on("--vi", "Use vi readline settings during interactive session.") do
-          options.vi_readline = options.repl =  true
+          options[:vi_readline] = options[:repl] =  true
         end
 
         opts.on_tail("-v", "--version", "Show riml version.") do
@@ -113,25 +112,26 @@ module Riml
       def start
         options = Options.parse(ARGV)
         compile_options = {
-          :readable => options.readable,
-          :allow_undefined_global_classes => options.allow_undefined_global_classes
+          :readable => options[:readable],
+          :allow_undefined_global_classes => options[:allow_undefined_global_classes]
         }
         compile_files_options = compile_options.merge(
-          :output_dir => options.output_dir
+          :output_dir => options[:output_dir]
         )
-        if options.stdio
+        if options[:stdio]
           puts Riml.compile($stdin.read, compile_options)
-        elsif options.compile_files.any?
-          Riml.compile_files(*options.compile_files, compile_files_options)
-        elsif options.check_syntax_files.any?
-          files = options.check_syntax_files.uniq
+        elsif options[:compile_files].any?
+          FileRollback.trap(:INT, :QUIT, :KILL) { print("\n"); exit 1 }
+          Riml.compile_files(*options[:compile_files], compile_files_options)
+        elsif options[:check_syntax_files].any?
+          files = options[:check_syntax_files].uniq
           Riml.check_syntax_files(*files)
           size = files.size
           # "ok (1 file)" OR "ok (2 files)"
           puts "ok (#{size} file#{'s' if size > 1})"
-        elsif options.repl
+        elsif options[:repl]
           require 'riml/repl'
-          Riml::Repl.new(options.vi_readline, compile_options).run
+          Riml::Repl.new(options[:vi_readline], compile_options).run
         else
           ARGV.replace ['--help']
           start

data/lib/riml.rb

@@ -10,6 +10,7 @@ require 'riml/warning_buffer'
 require 'riml/include_cache'
 require 'riml/path_cache'
 require 'riml/rewritten_ast_cache'
+require 'riml/file_rollback'
 
 module Riml
 
@@ -106,26 +107,28 @@ module Riml
     # compile files using one thread per file, max 4 threads at once
     if filenames.size > 1
       threads = []
-      while filenames.any?
-        to_compile = filenames.shift(4)
-        to_compile.each do |fname|
-          _parser, _compiler = Parser.new, Compiler.new
-          _compiler.options = compiler.options.dup
-          _parser.options = parser.options.dup
-          threads << Thread.new do
-            f = File.open(fname)
-            # `do_compile` will close file handle
-            do_compile(f, _parser, _compiler)
+      with_file_rollback do
+        while filenames.any?
+          to_compile = filenames.shift(4)
+          to_compile.each do |fname|
+            _parser, _compiler = Parser.new, Compiler.new
+            _compiler.options = compiler.options.dup
+            _parser.options = parser.options.dup
+            threads << Thread.new do
+              f = File.open(fname)
+              # `do_compile` will close file handle
+              do_compile(f, _parser, _compiler)
+            end
           end
+          threads.each(&:join)
+          threads.clear
         end
-        threads.each(&:join)
-        threads.clear
       end
     elsif filenames.size == 1
       fname = filenames.first
       f = File.open(fname)
       # `do_compile` will close file handle
-      do_compile(f, parser, compiler)
+      with_file_rollback { do_compile(f, parser, compiler) }
     else
       raise ArgumentError, "need filenames to compile"
     end
@@ -184,6 +187,21 @@ module Riml
   end
   @rewritten_ast_cache = RewrittenASTCache.new
 
+  def self.clear_caches
+    @include_cache.clear
+    @path_cache.clear
+    @rewritten_ast_cache.clear
+  end
+
+  # if error is thrown, all files that were created will be rolled back
+  # to their previous state. If the file existed previously, it will be
+  # the same as it was. If the file didn't exist, it will be removed if
+  # it was created.
+  def self.with_file_rollback(&block)
+    FileRollback.guard(&block)
+  end
+
+  # turn warnings on/off
   class << self
     attr_accessor :warnings
   end
@@ -276,6 +294,7 @@ module Riml
     if output[-2..-1] == "\n\n"
       output.chomp!
     end
+    FileRollback.creating_file(full_path)
     File.open(full_path, 'w') do |f|
       f.write FILE_HEADER + output
     end

data/lib/riml/ast_rewriter.rb

@@ -28,7 +28,7 @@ module Riml
     def rewrite(filename = nil, included = false)
       if filename && (rewritten_ast = Riml.rewritten_ast_cache[filename])
         rewrite_included_and_sourced_files!(filename)
-        rewritten_ast
+        return rewritten_ast
       end
       if @options && @options[:allow_undefined_global_classes] && !@classes.has_global_import?
         @classes.globbed_imports.unshift(ImportedClass.new('*'))
@@ -70,7 +70,7 @@ module Riml
     end
 
     def rewrite_on_match(node = ast)
-      Walker.walk_node(node, method(:do_rewrite_on_match), lambda { |_| recursive? })
+      Walker.walk_node(node, method(:do_rewrite_on_match), max_recursion_lvl)
     end
 
     def do_rewrite_on_match(node)
@@ -85,8 +85,7 @@ module Riml
     # node in order to compile it on the spot.
     def rewrite_included_and_sourced_files!(filename)
       old_ast = ast
-      ast.children.each do |node|
-        next unless RimlFileCommandNode === node
+      ast.children.grep(RimlFileCommandNode).each do |node|
         action = node.name == 'riml_include' ? 'include' : 'source'
 
         node.each_existing_file! do |file, fullpath|
@@ -117,21 +116,20 @@ module Riml
     end
 
     def watch_for_class_pickup
-      before_class_names = classes.class_names
+      before_class_names = @classes.class_names
       ast = yield
-      after_class_names = classes.class_names
+      after_class_names = @classes.class_names
       diff_class_names = after_class_names - before_class_names
       class_diff = diff_class_names.inject({}) do |hash, class_name|
-        hash[class_name] = classes[class_name]
+        hash[class_name] = @classes[class_name]
         hash
       end
       # no classes were picked up, it could be that the cache was hit. Let's
       # register the cached classes for this ast, if there are any
       if class_diff.empty?
         real_diff = Riml.rewritten_ast_cache.fetch_classes_registered(ast)
-        return if real_diff.empty?
         real_diff.each do |k,v|
-          classes[k] = v unless classes.safe_fetch(k)
+          @classes[k] = v unless @classes.safe_fetch(k)
         end
       # new classes were picked up, let's save them with this ast as the key
       else
@@ -139,8 +137,9 @@ module Riml
       end
     end
 
-    def recursive?
-      true
+    # recurse until no more children
+    def max_recursion_lvl
+      -1
     end
 
     # Add SID function if this is the main file and it has defined classes, or
@@ -166,11 +165,21 @@ module Riml
       fchild = ast.nodes.first
       return false if DefNode === fchild && fchild.name == 'SID' && fchild.scope_modifier == 's:'
       fn = DefNode.new('!', nil, 's:', 'SID', [], nil, Nodes.new([
-          ReturnNode.new(CallNode.new(nil, 'matchstr', [
+          IfNode.new(
+            CallNode.new(nil, 'exists', [StringNode.new('s:SID_VALUE', :s)]),
+            Nodes.new([
+              ReturnNode.new(GetVariableNode.new('s:', 'SID_VALUE'))
+            ])
+          ),
+          AssignNode.new(
+            '=',
+            GetVariableNode.new('s:', 'SID_VALUE'),
+            CallNode.new(nil, 'matchstr', [
             CallNode.new(nil, 'expand', [StringNode.new('<sfile>', :s)]),
             StringNode.new('<SNR>\zs\d\+\ze_SID$', :s)
           ]
-          ))
+          )),
+          ReturnNode.new(GetVariableNode.new('s:', 'SID_VALUE'))
         ])
       )
       fn.parent = ast.nodes
@@ -196,6 +205,10 @@ module Riml
         end
         node.remove
       end
+
+      def max_recursion_lvl
+        1
+      end
     end
 
     class RegisterDefinedClasses < AST_Rewriter
@@ -208,6 +221,10 @@ module Riml
         n.instance_variable_set("@registered_state", true)
         classes[node.full_name] = n
       end
+
+      def max_recursion_lvl
+        1
+      end
     end
 
     class StrictEqualsComparisonOperator < AST_Rewriter
@@ -257,8 +274,8 @@ module Riml
       def replace(node)
         classes[node.full_name] = node
 
-        RegisterPrivateFunctions.new(node, classes).rewrite_on_match
-        DefNodeToPrivateFunction.new(node, classes).rewrite_on_match
+        RegisterPrivateFunctions.new(node.expressions, classes).rewrite_on_match
+        DefNodeToPrivateFunction.new(node.expressions, classes).rewrite_on_match
         InsertInitializeMethod.new(node, classes).rewrite_on_match
         constructor = node.constructor
         constructor.name = node.constructor_name
@@ -266,7 +283,7 @@ module Riml
         constructor.scope_modifier = node.scope_modifier
         # set up dictionary variable at top of function
         dict_name = node.constructor_obj_name
-        constructor.expressions.unshift(
+        constructor.expressions.nodes.unshift(
           AssignNode.new('=', GetVariableNode.new(nil, dict_name), DictionaryNode.new({}))
         )
 
@@ -277,19 +294,27 @@ module Riml
         PrivateFunctionCallToPassObjExplicitly.new(node, classes).rewrite_on_match
         SplatsToExecuteInCallingContext.new(node, classes).rewrite_on_match
 
-        constructor.expressions.push(
+        constructor.expressions.nodes.push(
           ReturnNode.new(GetVariableNode.new(nil, dict_name))
         )
         reestablish_parents(constructor)
       end
 
+      def max_recursion_lvl
+        1
+      end
+
       class RegisterPrivateFunctions < AST_Rewriter
         def match?(node)
           node.instance_of?(DefNode) && node.name != 'initialize'
         end
 
         def replace(node)
-          ast.private_function_names << node.name
+          ast.parent.private_function_names << node.name
+        end
+
+        def max_recursion_lvl
+          1
         end
       end
 
@@ -468,7 +493,7 @@ module Riml
         end
 
         def replace(node)
-          class_node = ast
+          class_node = ast.parent
           class_name = class_node.name
           node.scope_modifier = 's:'
           node.original_name = node.name
@@ -481,6 +506,10 @@ module Riml
           self_to_obj_argument.rewrite_on_match
           reestablish_parents(node)
         end
+
+        def max_recursion_lvl
+          1
+        end
       end
 
       class PrivateFunctionCallToPassObjExplicitly < AST_Rewriter
@@ -517,7 +546,7 @@ module Riml
         def replace(node)
           def_node = node.to_def_node
           class_expressions = ast.expressions
-          class_expressions.insert_after(class_expressions.last, def_node)
+          class_expressions.insert_after(class_expressions.nodes.last, def_node)
           def_node.parent = class_expressions
           # to remove it
           node.parent = class_expressions
@@ -559,6 +588,10 @@ module Riml
           constructor.expressions << extension
           extension.parent = constructor.expressions
         end
+
+        def max_recursion_lvl
+          2
+        end
       end
 
       class SelfToDictName < AST_Rewriter
@@ -599,7 +632,7 @@ module Riml
               '!', nil, nil, "initialize", [], nil, Nodes.new([])
             )
           end
-          class_node.expressions.unshift(def_node)
+          class_node.expressions.nodes.unshift(def_node)
           reestablish_parents(class_node)
         end
 
@@ -611,8 +644,8 @@ module Riml
           classes.superclass(ast.full_name).imported?
         end
 
-        def recursive?
-          false
+        def max_recursion_lvl
+          1
         end
       end
 
@@ -668,8 +701,8 @@ module Riml
           end
         end
 
-        def recursive?
-          false
+        def max_recursion_lvl
+          1
         end
       end
 
@@ -824,7 +857,7 @@ module Riml
           def_node.parameters.delete_if(&DefNode::DEFAULT_PARAMS)
           def_node.parameters << SPLAT_LITERAL unless def_node.splat
         end
-        def_node.expressions.insert(insert_idx, if_expression)
+        def_node.expressions.nodes.insert(insert_idx, if_expression)
         reestablish_parents(def_node)
       end
 
@@ -841,6 +874,10 @@ module Riml
           ])
         )
       end
+
+      def max_recursion_lvl
+        3
+      end
     end
 
     class DeserializeVarAssignment < AST_Rewriter
@@ -883,6 +920,10 @@ module Riml
         new_node.keywords = keywords
         node.replace_with(new_node)
       end
+
+      def max_recursion_lvl
+        1
+      end
     end
 
   end

data/lib/riml/compiler.rb

@@ -79,8 +79,7 @@ module Riml
           end
         end
         node.compiled_output << "\n" unless node.compiled_output[-1] == "\n"
-        node.force_newline = true
-        node.compiled_output << "endif"
+        node.compiled_output << "endif\n"
       end
     end
 
@@ -113,8 +112,7 @@ module Riml
         node.body.compiled_output.each_line do |line|
           node.compiled_output << node.indent + line
         end
-        node.force_newline = true
-        node.compiled_output << "endwhile"
+        node.compiled_output << "endwhile\n"
       end
     end
 
@@ -479,7 +477,7 @@ module Riml
         body = ""
         unless node.expressions.compiled_output.empty?
           node.expressions.compiled_output.each_line do |line|
-            body << node.indent + line
+            body << node.indent << line
           end
         end
         node.compiled_output = declaration << body << "endfunction\n"
@@ -565,14 +563,14 @@ module Riml
         node.compiled_output << ")" unless node.builtin_command?
         unless node.descendant_of_control_structure? ||
                node.descendant_of_call_node? ||
-               node.descendant_of_object_instantiation_node? ||
+               node.descendant_of_dict_get_dot_node? ||
+               node.descendant_of_dictionary_node? ||
                node.descendant_of_list_node? ||
                node.descendant_of_list_or_dict_get_node? ||
                node.descendant_of_operator_node? ||
                node.descendant_of_wrap_in_parens_node? ||
                node.descendant_of_sublist_node? ||
-               node.descendant_of_dict_get_dot_node? ||
-               node.descendant_of_dictionary_node? ||
+               node.descendant_of_object_instantiation_node? ||
                node.descendant_of_curly_brace_part?
           node.force_newline = true
         end
@@ -646,7 +644,7 @@ module Riml
         node.expressions.accept(NodesVisitor.new :propagate_up_tree => false)
         body = node.expressions.compiled_output
         body.each_line do |line|
-          node.compiled_output << node.indent + line
+          node.compiled_output << node.indent << line
         end
         node.compiled_output << "endfor\n"
       end
@@ -659,7 +657,7 @@ module Riml
         node.compiled_output = "try\n"
         try.accept(visitor_for_node(try, :propagate_up_tree => false))
         try.compiled_output.each_line do |line|
-          node.compiled_output << node.indent + line
+          node.compiled_output << node.indent << line
         end
 
         catches.each do |c|
@@ -667,9 +665,9 @@ module Riml
           c.compiled_output.each_line do |line|
             outdent = line =~ /\A\s*catch/
             if outdent && c.non_nested?
-              node.compiled_output << node.outdent + line
+              node.compiled_output << node.outdent << line
             else
-              node.compiled_output << node.indent + line
+              node.compiled_output << node.indent << line
             end
           end
         end if catches
@@ -678,7 +676,7 @@ module Riml
           node.compiled_output << "finally\n"
           finally.accept(visitor_for_node(finally, :propagate_up_tree => false))
           finally.compiled_output.each_line do |line|
-            node.compiled_output << node.indent + line
+            node.compiled_output << node.indent << line
           end
         end
         node.compiled_output << "endtry\n"
@@ -787,7 +785,7 @@ module Riml
         root_node = parser.parse(source, parser.ast_rewriter, file_basepath, true)
         included_files_compiled << file_basepath
         output = compile(root_node)
-        (Riml::INCLUDE_COMMENT_FMT % file_basepath) + output
+        (Riml::INCLUDE_COMMENT_FMT % file_basepath) << output
       end
     end
 

data/lib/riml/file_rollback.rb

@@ -0,0 +1,75 @@
+require 'set'
+
+module Riml
+  class FileRollback
+    @files_created = Set.new
+    # { 'main.vim' => nil, 'existed.vim' => "\nsource code..." }
+    @previous_file_states = {}
+    @guarding = 0
+    @m = Mutex.new
+
+    # NOTE: Used only in main thread.
+    # Only call this method in one thread at a time. It's okay if
+    # `&block` launches threads, and they compile files though.
+    def self.guard(&block)
+      @guarding += 1
+      block.call
+    rescue
+      rollback!
+      raise
+    ensure
+      @guarding -= 1
+      if @guarding == 0
+        clear
+      end
+    end
+
+    def self.trap(*signals, &block)
+      signals.each do |sig|
+        Signal.trap(sig) do
+          rollback! if @guarding > 0
+          block.call if block
+        end
+      end
+    end
+
+    def self.creating_file(full_path)
+      @m.synchronize do
+        return unless @guarding > 0
+        previous_state = File.file?(full_path) ? File.read(full_path) : nil
+        @previous_file_states[full_path] ||= previous_state
+        @files_created << full_path
+      end
+    end
+
+    def self.clear
+      @m.synchronize do
+        @files_created = Set.new
+        @previous_file_states.clear
+      end
+    end
+
+    def self.rollback!
+      @m.synchronize do
+        @files_created.each do |path|
+          rollback_file!(path)
+        end
+      end
+    end
+
+    private
+
+    def self.rollback_file!(file_path)
+      if !@previous_file_states.key?(file_path)
+        return false
+      end
+      prev_state = @previous_file_states[file_path]
+      if prev_state.nil?
+        File.delete(file_path) if File.exists?(file_path)
+      else
+        File.open(file_path, 'w') { |f| f.write(prev_state) }
+      end
+      prev_state
+    end
+  end
+end

data/lib/riml/get_sid_function.vim

@@ -1,3 +1,7 @@
 function! s:SID()
-  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
+  if exists('s:SID_VALUE')
+    return s:SID_VALUE
+  endif
+  let s:SID_VALUE = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
+  return s:SID_VALUE
 endfunction

data/lib/riml/grammar.y

@@ -567,8 +567,14 @@ end
     @options ||= {}
   end
 
+  @@ast_cache = {}
+
   # parses tokens or code into output nodes
   def parse(object, ast_rewriter = Riml::AST_Rewriter.new, filename = nil, included = false)
+    #if @@ast_cache[filename]
+      #return @@ast_cache[filename]
+    #end
+
     if tokens?(object)
       @tokens = object
     elsif code?(object)
@@ -588,11 +594,17 @@ end
       raise Riml::ParseError, error_msg
     end
 
+
     @ast_rewriter ||= ast_rewriter
-    return ast unless @ast_rewriter
+    unless @ast_rewriter
+      #@@ast_cache[filename] = ast if filename
+      return ast
+    end
     @ast_rewriter.ast = ast
     @ast_rewriter.options ||= options
     @ast_rewriter.rewrite(filename, included)
+    #@@ast_cache[filename] = @ast_rewriter.ast if filename
+    #@ast_rewriter.ast
   end
 
   # get the next token from either the list of tokens provided, or

data/lib/riml/lexer.rb

@@ -11,9 +11,9 @@ module Riml
     ANCHORED_INTERPOLATION_REGEX = /\A#{INTERPOLATION_REGEX}/m
     INTERPOLATION_SPLIT_REGEX = /(\#\{.*?\})/m
 
-    attr_reader :tokens, :prev_token, :lineno, :chunk,
-      :current_indent, :invalid_keyword, :filename,
-      :parser_info
+    attr_reader :tokens, :prev_token, :chunk, :current_indent,
+      :invalid_keyword, :filename, :parser_info
+    attr_accessor :lineno
     # for REPL
     attr_accessor :ignore_indentation_check
 
@@ -139,7 +139,7 @@ module Riml
 
           @token_buf << [token_name.intern, identifier]
 
-        elsif BUILTIN_COMMANDS.include?(identifier) && !chunk[/\A#{Regexp.escape(identifier)}\(/]
+        elsif BUILTIN_COMMANDS.include?(identifier) && peek(identifier.size) != '('
           @token_buf << [:BUILTIN_COMMAND, identifier]
         elsif RIML_FILE_COMMANDS.include? identifier
           @token_buf << [:RIML_FILE_COMMAND, identifier]
@@ -330,7 +330,9 @@ module Riml
     end
 
     def tokenize_without_moving_pos(code)
-      Lexer.new(code).tokenize
+      Lexer.new(code, filename, false).tap do |l|
+        l.lineno = lineno
+      end.tokenize
     end
 
     def statement_modifier?
@@ -350,5 +352,9 @@ module Riml
     def more_code_to_tokenize?
       @i < @code.size
     end
+
+    def peek(n = 1)
+      @chunk[n]
+    end
   end
 end

data/lib/riml/nodes.rb

@@ -29,23 +29,25 @@ module Riml
       "#{filename}:#{parser_info[:lineno]}"
     end
 
-    # catches "descendant_of_#{some_class}?" methods
-    # def descendant_of_call_node?
-    #   CallNode === self.parent_node
-    # end
-    DESCENDANT_OF_REGEX = /\Adescendant_of_(.*?)\?/
-    def method_missing(method, *args, &blk)
-      if method =~ DESCENDANT_OF_REGEX
-        parent_node_name = $1.split('_').map(&:capitalize).join
+    %w(
+    control_structure
+    call_node
+    object_instantiation_node
+    list_node
+    list_or_dict_get_node
+    operator_node
+    wrap_in_parens_node
+    sublist_node
+    dict_get_dot_node
+    dictionary_node
+    curly_brace_part
+    ).each do |node_name|
+      define_method "descendant_of_#{node_name}?" do
+        parent_node_name = node_name.split('_').map(&:capitalize).join
         parent_node = Riml.const_get parent_node_name
         parent_node === self.parent_node
-      else
-        super
       end
     end
-    def respond_to?(method, include_private = false)
-      super || method =~ DESCENDANT_OF_REGEX
-    end
   end
 
   module Walkable
@@ -189,19 +191,6 @@ module Riml
       self
     end
 
-    # forward missing methods to `nodes` array
-    def method_missing(method, *args, &block)
-      if nodes.respond_to?(method)
-        nodes.send(method, *args, &block)
-      else
-        super
-      end
-    end
-
-    def respond_to?(method, include_private = false)
-      super || nodes.respond_to?(method, include_private)
-    end
-
     def children
       nodes
     end
@@ -759,14 +748,6 @@ module Riml
       end
       children.concat(default_param_nodes)
     end
-
-    def method_missing(method, *args, &blk)
-      if children.respond_to?(method)
-        children.send(method, *args, &blk)
-      else
-        super
-      end
-    end
   end
 
   class DefaultParamNode < Struct.new(:parameter, :expression)
@@ -792,13 +773,6 @@ module Riml
 
     alias function? function
 
-    def initialize_copy(source)
-      super
-      self.for_node_variable_names = for_node_variable_names.dup
-      self.argument_variable_names = argument_variable_names.dup
-      self.function = source.function
-    end
-
     def merge(other)
       dup.merge! other
     end

data/lib/riml/parser.rb

@@ -24,8 +24,14 @@ module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 560)
     @options ||= {}
   end
 
+  @@ast_cache = {}
+
   # parses tokens or code into output nodes
   def parse(object, ast_rewriter = Riml::AST_Rewriter.new, filename = nil, included = false)
+    #if @@ast_cache[filename]
+      #return @@ast_cache[filename]
+    #end
+
     if tokens?(object)
       @tokens = object
     elsif code?(object)
@@ -45,11 +51,17 @@ module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 560)
       raise Riml::ParseError, error_msg
     end
 
+
     @ast_rewriter ||= ast_rewriter
-    return ast unless @ast_rewriter
+    unless @ast_rewriter
+      #@@ast_cache[filename] = ast if filename
+      return ast
+    end
     @ast_rewriter.ast = ast
     @ast_rewriter.options ||= options
     @ast_rewriter.rewrite(filename, included)
+    #@@ast_cache[filename] = @ast_rewriter.ast if filename
+    #@ast_rewriter.ast
   end
 
   # get the next token from either the list of tokens provided, or

data/lib/riml/path_cache.rb

@@ -29,9 +29,9 @@ module Riml
       end
     end
 
-    def file(path, filename)
+    def file(path, basename)
       return nil unless @cache[path]
-      @cache[path][filename]
+      @cache[path][basename]
     end
 
     private

data/lib/riml/rewritten_ast_cache.rb

@@ -21,11 +21,11 @@ module Riml
     end
 
     def save_classes_registered(ast, class_diff)
-      @ast_classes_registered_cache[ast] = class_diff
+      @ast_classes_registered_cache[ast.object_id] = class_diff
     end
 
     def fetch_classes_registered(ast)
-      @ast_classes_registered_cache[ast] || {}
+      @ast_classes_registered_cache[ast.object_id] || {}
     end
   end
 end

data/lib/riml/walker.rb

@@ -1,14 +1,21 @@
 module Riml
   class Walker
-    def self.walk_node(node, method, walk_children = lambda {|n| true })
+    MAX_RECURSION_LVL_ACTUAL = 1_000_000
+
+    def self.walk_node(node, method, max_recursion_lvl = -1)
+      if max_recursion_lvl == -1
+        max_recursion_lvl = MAX_RECURSION_LVL_ACTUAL
+      end
       # breadth-first walk
       to_visit = [node]
+      lvl = 0
       while to_visit.length > 0
         cur_node = to_visit.shift
         cur_node.children.each do |child|
           to_visit << child
-        end if cur_node.respond_to?(:children) && walk_children.call(cur_node)
+        end if lvl < max_recursion_lvl && cur_node.respond_to?(:children)
         method.call(cur_node)
+        lvl += 1
       end
     end
   end

data/version.rb

@@ -1,4 +1,4 @@
 module Riml
-  # last changed: Oct. 14, 2013
-  VERSION = [0,3,4]
+  # last changed: Oct. 20, 2013
+  VERSION = [0,3,5]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riml
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -106,6 +106,7 @@ files:
 - version.rb
 - lib/riml.rb
 - lib/riml/parser.rb
+- lib/riml/file_rollback.rb
 - lib/riml/get_sid_function.vim
 - lib/riml/walker.rb
 - lib/riml/rewritten_ast_cache.rb
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1673750557717787658
+      hash: 3731001160727385716
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25