riml 0.2.0 → 0.2.1

data/lib/repl.rb

@@ -59,6 +59,7 @@ module Riml
     rescue => e
       print_error(e)
       reset!
+      reload!
     end
 
     def current_indent
@@ -67,10 +68,13 @@ module Riml
     end
 
     def compile_unit!
-      puts Riml.compile(current_compilation_unit.join("\n"), parser, compiler), "\n"
+      viml = Riml.compile(current_compilation_unit.join("\n"), parser, compiler).chomp
+      escape_newlines_in_strings!(viml)
+      puts viml, "\n"
     rescue => e
       raise unless e.kind_of?(RimlError)
       print_error(e)
+      reload!
     ensure
       reset!
     end
@@ -88,6 +92,10 @@ module Riml
       puts "#{e.class}: #{e}"
     end
 
+    def escape_newlines_in_strings!(viml)
+      viml.gsub!(/("[^"]*?)\n+([^"]?")/, '\1\\n\2')
+    end
+
     def exit_repl
       exit
     end

data/lib/riml.rb

@@ -41,15 +41,16 @@ module Riml
 
   # expects `file_names` to be readable files
   def self.compile_files(*filenames)
-    threads = []
-    filenames.each do |fname|
-      threads << Thread.new do
-        f = File.open(fname)
-        # `compile` will close file handle
-        compile(f)
-      end
+    if filenames.size > 1
+      threaded_compile_files(*filenames)
+    elsif filenames.size == 1
+      fname = filenames.first
+      f = File.open(fname)
+      # `compile` will close file handle
+      compile(f)
+    else
+      raise ArgumentError, "need filenames to compile"
     end
-    threads.each {|t| t.join}
   end
 
   # checks syntax of `input` (lexes + parses) without going through ast rewriting or compilation
@@ -73,19 +74,31 @@ module Riml
     @source_path = path
   end
 
+  def self.warn(warning)
+    $stderr.puts "Warning: #{warning}"
+  end
+
   private
 
+  def self.threaded_compile_files(*filenames)
+    threads = []
+    filenames.each do |fname|
+      threads << Thread.new do
+        f = File.open(fname)
+        compile(f)
+      end
+    end
+    threads.each {|t| t.join}
+  end
+
   # This is for when another file is sourced within a file we're compiling.
-  # We have to share the same `ClassMap`, thus we have a queue for the compiler,
-  # and we process this queue after each source we compile. We pass the same
-  # parser instance to share Class state, as this state belongs to the
-  # AST_Rewriter's `ClassMap`.
   def self.process_compile_queue!(compiler)
-    return true if compiler.compile_queue.empty?
-
-    file_name = compiler.compile_queue.shift
-    compile(File.open(File.join(Riml.source_path, file_name)), compiler.parser)
-    process_compile_queue!(compiler)
+    while filename = compiler.compile_queue.shift
+      unless compiler.sourced_files_compiled.include?(filename)
+        compiler.sourced_files_compiled << filename
+        compile(File.open(File.join(Riml.source_path, filename)), compiler.parser, compiler)
+      end
+    end
   end
 
   FILE_HEADER = File.read(File.expand_path("../header.vim", __FILE__)) % VERSION.join('.')

data/version.rb

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

metadata

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