riml 0.2.5 → 0.2.6

data/lib/riml.rb

@@ -33,10 +33,18 @@ module Riml
     else
       raise ArgumentError, "input must be nodes, tokens, code or file, is #{input.class}"
     end
-    compiler.parser = parser
+
+    if compiler.parser == parser
+      compiling_cmdline_file = false
+    else
+      compiler.parser = parser
+      compiling_cmdline_file = true
+    end
+
     output = compiler.compile(nodes)
+
     if input.is_a?(File)
-      write_file(output, input.path)
+      write_file(output, input.path, compiling_cmdline_file)
     else
       output
     end
@@ -164,16 +172,22 @@ module Riml
   FILE_HEADER = File.read(File.expand_path("../header.vim", __FILE__)) % VERSION.join('.')
   INCLUDE_COMMENT_FMT = File.read(File.expand_path("../included.vim", __FILE__))
 
-  def self.write_file(output, fname)
-    # absolute path, output into same directory as file
-    dir = if fname[0] == File::SEPARATOR
-      Pathname.new(fname).parent.to_s
-    # relative path, output into current working directory
-    else
+  def self.write_file(output, fname, cmdline_file = true)
+    # writing out a file that's compiled from cmdline, output into CWD
+    output_dir = if cmdline_file
       Dir.getwd
+    # writing out a riml_source'd file
+    else
+      # absolute path
+      if fname[0] == File::SEPARATOR
+        Pathname.new(fname).parent.to_s
+      # relative path
+      else
+        File.join(Dir.getwd, Pathname.new(fname).parent.to_s)
+      end
     end
     basename_without_riml_ext = File.basename(fname).sub(/\.riml\Z/i, '')
-    full_path = File.join(dir, "#{basename_without_riml_ext}.vim")
+    full_path = File.join(output_dir, "#{basename_without_riml_ext}.vim")
     File.open(full_path, 'w') do |f|
       f.write FILE_HEADER + output
     end

data/version.rb

@@ -1,4 +1,4 @@
 module Riml
-  # last changed: Apr. 28, 2013
-  VERSION = [0,2,5]
+  # last changed: May. 12, 2013
+  VERSION = [0,2,6]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riml
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -27,9 +27,10 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "  Riml is a superset of VimL that includes some nice features:\n  classes,
-  string interpolation, heredocs, default case-sensitive string\n  comparison and
-  other things most programmers take for granted.\n"
+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
+  \ functions. Give it a try!\n"
 email: luke.gru@gmail.com
 executables:
 - riml
@@ -45,6 +46,7 @@ files:
 - lib/class_map.rb
 - lib/included.vim
 - lib/constants.rb
+- lib/parser.output
 - lib/lexer.rb
 - lib/grammar.y
 - lib/compiler.rb
@@ -84,5 +86,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Relaxed VimL (Vimscript)
+summary: Riml is a language that compiles into Vimscript
 test_files: []