riml 0.1.9 → 0.2.0

data/lib/ast_rewriter.rb

@@ -7,15 +7,19 @@ module Riml
     include Riml::Constants
 
     attr_accessor :ast
-    attr_reader   :classes
+    attr_reader   :classes, :rewritten_include_files
 
     def initialize(ast = nil, classes = nil)
       @ast = ast
       @classes = classes || ClassMap.new
+      @rewritten_include_files = {}
     end
 
-
-    def rewrite
+    def rewrite(file = nil)
+      if rewritten_ast = rewritten_include_files[file]
+        return rewritten_ast
+      end
+      rewrite_included_files!
       establish_parents(ast)
       rewriters = [
         StrictEqualsComparisonOperator.new(ast, classes),
@@ -49,6 +53,21 @@ module Riml
       replace node if match?(node)
     end
 
+    def rewrite_included_files!
+      old_ast = ast
+      ast.children.each do |node|
+        next unless RimlCommandNode === node && node.name == 'riml_include'
+        node.each_existing_file! do |file|
+          full_path = File.join(Riml.source_path, file)
+          riml_src = File.read(full_path)
+          rewritten_ast = Parser.new.parse(riml_src, self)
+          rewritten_include_files[file] = rewritten_ast
+        end
+      end
+    ensure
+      self.ast = old_ast
+    end
+
     def repeatable?
       true
     end

data/lib/compiler.rb

@@ -491,11 +491,11 @@ module Riml
       def compile(node)
         if node.name == 'riml_source'
           node.name = 'source'
-          each_existing_file!(node) do |file|
+          node.each_existing_file! do |file|
             root_node(node).current_compiler.compile_queue << file
           end
         elsif node.name == 'riml_include'
-          each_existing_file!(node) do |file|
+          node.each_existing_file! do |file|
             full_path = File.join(Riml.source_path, file)
             riml_src = File.read(full_path)
             node.compiled_output << root_node(node).current_compiler.compile_include(riml_src, file)
@@ -509,20 +509,6 @@ module Riml
         node.compiled_output
       end
 
-      def each_existing_file!(node)
-        files = []
-        node.arguments.map(&:value).each do |file|
-          if File.exists?(File.join(Riml.source_path, file))
-            files << file
-          else
-            raise Riml::FileNotFound, "#{file.inspect} could not be found in " \
-              "source path (#{Riml.source_path.inspect})"
-          end
-        end
-        # all files exist
-        files.each {|f| yield f} if block_given?
-      end
-
       def root_node(node)
         node = node.parent until node.parent.nil?
         node
@@ -660,7 +646,7 @@ module Riml
     end
 
     def compile_include(source, from_file = nil)
-      root_node = parser.parse(source)
+      root_node = parser.parse(source, parser.ast_rewriter, from_file)
       output = compile(root_node)
       return output unless from_file
       (Riml::INCLUDE_COMMENT_FMT % from_file) + output

data/lib/grammar.y

@@ -489,7 +489,7 @@ end
   attr_accessor :ast_rewriter
 
   # parses tokens or code into output nodes
-  def parse(object, ast_rewriter = AST_Rewriter.new)
+  def parse(object, ast_rewriter = AST_Rewriter.new, include_file = nil)
     if tokens?(object)
       @tokens = object
     elsif code?(object)
@@ -506,7 +506,7 @@ end
     @ast_rewriter ||= ast_rewriter
     return ast unless @ast_rewriter
     @ast_rewriter.ast = ast
-    @ast_rewriter.rewrite
+    @ast_rewriter.rewrite(include_file)
   end
 
   # get the next token from either the list of tokens provided, or

data/lib/included.vim

@@ -1,2 +1 @@
-
 " included: '%s'

data/lib/nodes.rb

@@ -305,7 +305,21 @@ end
 #   call Method()
 #   call s:Method(argument1, argument2)
 class ExplicitCallNode < CallNode; end
-class RimlCommandNode  < CallNode; end
+class RimlCommandNode  < CallNode
+  def each_existing_file!
+    files = []
+    arguments.map(&:value).each do |file|
+      if File.exists?(File.join(Riml.source_path, file))
+        files << file
+      else
+        raise Riml::FileNotFound, "#{file.inspect} could not be found in " \
+          "source path (#{Riml.source_path.inspect})"
+      end
+    end
+    # all files exist
+    files.each {|f| yield f} if block_given?
+  end
+end
 
 class OperatorNode < Struct.new(:operator, :operands)
   include Visitable

data/lib/parser.rb

@@ -19,7 +19,7 @@ module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 487)
   attr_accessor :ast_rewriter
 
   # parses tokens or code into output nodes
-  def parse(object, ast_rewriter = AST_Rewriter.new)
+  def parse(object, ast_rewriter = AST_Rewriter.new, include_file = nil)
     if tokens?(object)
       @tokens = object
     elsif code?(object)
@@ -36,7 +36,7 @@ module_eval(<<'...end grammar.y/module_eval...', 'grammar.y', 487)
     @ast_rewriter ||= ast_rewriter
     return ast unless @ast_rewriter
     @ast_rewriter.ast = ast
-    @ast_rewriter.rewrite
+    @ast_rewriter.rewrite(include_file)
   end
 
   # get the next token from either the list of tokens provided, or
@@ -2473,7 +2473,7 @@ module_eval(<<'.,.,', 'grammar.y', 380)
 
 module_eval(<<'.,.,', 'grammar.y', 381)
   def _reduce_179(val, _values, result)
-     result = ReturnNode.new(nil)    
+     result = ReturnNode.new(nil) 
     result
   end
 .,.,

data/version.rb

@@ -1,4 +1,4 @@
 module Riml
   # last changed: Mar. 2, 2013
-  VERSION = [0,1,9]
+  VERSION = [0,2,0]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riml
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc