riml 0.3.2 → 0.3.3

data/lib/riml.rb

@@ -7,7 +7,7 @@ require 'lexer'
 require 'parser'
 require 'compiler'
 require 'warning_buffer'
-require 'backtrace_filter'
+require 'include_cache'
 
 module Riml
 
@@ -76,6 +76,7 @@ module Riml
   # expects `filenames` (String) arguments, to be readable files.
   # Optional options (Hash) as last argument.
   def self.compile_files(*filenames)
+    filenames = filenames.dup
     parser, compiler = Parser.new, Compiler.new
 
     if filenames.last.is_a?(Hash)
@@ -84,22 +85,24 @@ module Riml
       compiler.options = DEFAULT_COMPILE_FILES_OPTIONS.dup
     end
 
+    filenames.uniq!
+    # compile files using one thread per file, max 4 threads at once
     if filenames.size > 1
       threads = []
-      filenames.each_with_index do |fname, i|
-        if i.zero?
-          _parser, _compiler = parser, compiler
-        else
+      while filenames.any?
+        to_compile = filenames.shift(4)
+        to_compile.each do |fname|
           _parser, _compiler = Parser.new, Compiler.new
           _compiler.options = compiler.options
+          threads << Thread.new do
+            f = File.open(fname)
+            # `do_compile` will close file handle
+            do_compile(f, _parser, _compiler)
+          end
         end
-        threads << Thread.new do
-          f = File.open(fname)
-          # `do_compile` will close file handle
-          do_compile(f, _parser, _compiler)
-        end
+        threads.each(&:join)
+        threads.clear
       end
-      threads.each {|t| t.join}
     elsif filenames.size == 1
       fname = filenames.first
       f = File.open(fname)
@@ -108,9 +111,7 @@ module Riml
     else
       raise ArgumentError, "need filenames to compile"
     end
-  rescue Riml::ParseError => pe
-    BacktraceFilter.new(pe).filter!
-    raise
+    true
   ensure
     flush_warnings
   end
@@ -150,6 +151,12 @@ module Riml
     warning_buffer << warning
   end
 
+  def self.include_cache
+    @include_cache
+  end
+  # initialize non-lazily because ||= isn't thread-safe
+  @include_cache = IncludeCache.new
+
   class << self
     attr_accessor :warnings
   end
@@ -166,8 +173,10 @@ module Riml
   end
 
   def self.warning_buffer
-    @warning_buffer ||= WarningBuffer.new
+    @warning_buffer
   end
+  # initialize non-lazily because ||= isn't thread-safe
+  @warning_buffer = WarningBuffer.new
 
   def self.set_path(name, path)
     return instance_variable_set("@#{name}", nil) if path.nil?

data/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riml
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.1.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.1
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 description: ! "  Riml is a subset of VimL with some added features, and it compiles
   to plain\n  Vimscript. Some of the added features include classes, string interpolation,\n
   \ heredocs, default case-sensitive string comparison and default arguments in\n
@@ -75,9 +123,9 @@ files:
 - lib/nodes.rb
 - lib/errors.rb
 - lib/ast_rewriter.rb
+- lib/include_cache.rb
 - Rakefile
 - CONTRIBUTING
-- Gemfile.lock
 - bin/riml
 homepage: https://github.com/luke-gru/riml
 licenses:
@@ -98,6 +146,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1222691864216833334
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/Gemfile.lock

@@ -1,15 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    minitest (2.5.1)
-    racc (1.4.9)
-    rake (10.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.3)
-  minitest (~> 2.5.1)
-  racc
-  rake (~> 10.1.0)