riml 0.3.8 → 0.3.9

data/lib/riml/repl.rb

@@ -4,6 +4,8 @@ rescue LoadError => e
   $stderr.puts e, "Readline is required to run repl."
   exit 1
 end
+
+require 'ostruct'
 require File.expand_path('../../riml', __FILE__)
 
 module Riml
@@ -13,12 +15,15 @@ module Riml
     private :parser, :compiler
 
     COMPILE_ON = %w(compile c)
-    RELOAD_ON = %w(reload r)
     EXIT_ON = %w(quit q)
+    EVAL_RIML_ON = %w(eval\ <<riml)
+    END_EVAL_RIML_ON = %w(riml)
 
     HELP_MSG = <<msg
 compile riml line(s):             #{COMPILE_ON.join(', ')}
-clear previous class definitions: #{RELOAD_ON.join(', ')}
+eval riml code:                   eval \<\<riml
+                                    code goes here!
+                                  riml
 exit repl:                        #{EXIT_ON.join(', ')}
 msg
 
@@ -26,24 +31,38 @@ msg
       @indent_amount = 0
       @line = nil
       @compiler_options = DEFAULT_COMPILE_OPTIONS.merge(compile_options)
+      @in_eval_heredoc = false
+      Riml.config = OpenStruct.new if Riml.config.nil?
+      Riml.config.repl = true
       prepare_new_context
       Readline.vi_editing_mode if vi_readline
-      trap(:INT) { reset!; puts }
     end
 
     def run
+      trap(:INT) { reset!; puts }
       puts HELP_MSG, "\n"
       while @line = Readline.readline(current_indent, true)
         line.strip!
         next if line.empty?
         line_dc = line.downcase
-        if COMPILE_ON.include?(line_dc)
+        if @in_eval_heredoc && END_EVAL_RIML_ON.include?(line_dc)
+          begin
+            riml = compile_unit! # raises errors
+            output = eval_riml(riml)
+            puts riml
+            output = "Blank vim output! Try echoing something." if output.strip.empty?
+            puts "\n", "#=>", output
+          rescue => e
+            handle_compile_error(e)
+          end
+          reset!
+        elsif !@in_eval_heredoc && EVAL_RIML_ON.include?(line_dc)
+          reset!
+          @in_eval_heredoc = true
+        elsif !@in_eval_heredoc && COMPILE_ON.include?(line_dc)
           next if current_compilation_unit.empty?
-          compile_unit!
-        elsif RELOAD_ON.include?(line_dc)
-          reload!
-          puts "reloaded"
-        elsif EXIT_ON.include?(line_dc)
+          compile_and_print_unit
+        elsif !@in_eval_heredoc && EXIT_ON.include?(line_dc)
           exit_repl
         else
           current_compilation_unit << line
@@ -77,14 +96,43 @@ msg
       ' ' * @indent_amount
     end
 
-    def compile_unit!
-      viml = Riml.do_compile(current_compilation_unit.join("\n"), parser, compiler).chomp
+    # handles and swallows errors
+    def compile_and_print_unit
+      viml = compile_unit!
       puts viml, "\n"
+    rescue => e
+      handle_compile_error(e)
+    ensure
+      reset!
+    end
+
+    # raises errors
+    def compile_unit!
+      Riml.do_compile(current_compilation_unit.join("\n"), parser, compiler).chomp
+    end
+
+    # TODO: Start only 1 vim process and use pipes to save time when using
+    # `eval <<riml` multiple times in the same repl session.
+    def eval_riml(riml)
+      require 'tempfile' unless defined?(Tempfile)
+      infile, outfile = Tempfile.new('riml_in'), Tempfile.new('vim_output')
+      riml = Riml::GET_SID_FUNCTION_SRC + "\n#{riml}"
+      infile.write("redir! > #{outfile.path}\n#{riml}\nredir END\nq!")
+      infile.close
+      system(%Q(vim -c "source #{infile.path}"))
+      raw = outfile.read.sub(/\A\n/, '')
+      # Since we don't show the generated SID function, we have to modify the
+      # error line numbers to account for it.
+      raw.gsub(/line\s+(\d+):/) do
+        "line #{$1.to_i - (Riml::GET_SID_FUNCTION_SRC.each_line.to_a.size + 2)}:"
+      end
     rescue => e
       print_error(e)
       reload!
+      nil
     ensure
-      reset!
+      infile.close
+      outfile.close
     end
 
     def current_compilation_unit
@@ -93,11 +141,21 @@ msg
 
     def reset!
       @indent_amount = 0
+      @in_eval_heredoc = false
       current_compilation_unit.clear
     end
 
+    def handle_compile_error(e)
+      print_error(e)
+      reload!
+    end
+
     def print_error(e)
-      puts e.verbose_message
+      if e.respond_to?(:verbose_message)
+        puts e.verbose_message
+      else
+        puts e.message
+      end
     end
 
     def exit_repl

data/lib/riml/walker.rb

@@ -10,9 +10,12 @@ module Riml
       to_visit = [node]
       lvl = 0
       while to_visit.length > 0
-        cur_node = to_visit.shift
+        # use pop and unshift instead of shift and push for performance
+        # reasons. This is a hotspot, and `shift` was found to be a big issue
+        # using ruby-prof on ruby <= 1.9.3 (not an issue on 2.0.0+)
+        cur_node = to_visit.pop
         cur_node.children.each do |child|
-          to_visit << child
+          to_visit.unshift(child)
         end if lvl < max_recursion_lvl && cur_node.respond_to?(:children)
         method.call(cur_node)
         lvl += 1

data/version.rb

@@ -1,4 +1,4 @@
 module Riml
-  # release date: Dec 4, 2013
-  VERSION = [0,3,8]
+  # release date: Jan. 12, 2014
+  VERSION = [0,3,9]
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: riml
 version: !ruby/object:Gem::Version
-  version: 0.3.8
-  prerelease: 
+  version: 0.3.9
 platform: ruby
 authors:
 - Luke Gruber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.4.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.4.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -101,63 +90,59 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
+- CONTRIBUTING
 - LICENSE
-- version.rb
+- README.md
+- Rakefile
+- bin/riml
 - lib/riml.rb
-- lib/riml/parser.rb
+- lib/riml/ast_rewriter.rb
+- lib/riml/backtrace_filter.rb
+- lib/riml/class_dependency_graph.rb
+- lib/riml/class_map.rb
+- lib/riml/compiler.rb
+- lib/riml/constants.rb
+- lib/riml/environment.rb
+- lib/riml/errors.rb
 - lib/riml/file_rollback.rb
 - lib/riml/get_sid_function.vim
-- lib/riml/walker.rb
-- lib/riml/rewritten_ast_cache.rb
-- lib/riml/warning_buffer.rb
-- lib/riml/class_map.rb
-- lib/riml/class_dependency_graph.rb
+- lib/riml/grammar.y
+- lib/riml/header.vim
+- lib/riml/imported_class.rb
+- lib/riml/include_cache.rb
 - lib/riml/included.vim
-- lib/riml/constants.rb
+- lib/riml/lexer.rb
+- lib/riml/nodes.rb
 - lib/riml/parser.output
-- lib/riml/backtrace_filter.rb
+- lib/riml/parser.rb
 - lib/riml/path_cache.rb
-- lib/riml/lexer.rb
-- lib/riml/grammar.y
-- lib/riml/compiler.rb
-- lib/riml/environment.rb
-- lib/riml/imported_class.rb
-- lib/riml/header.vim
 - lib/riml/repl.rb
-- lib/riml/nodes.rb
-- lib/riml/errors.rb
-- lib/riml/ast_rewriter.rb
-- lib/riml/include_cache.rb
-- Rakefile
-- CONTRIBUTING
-- bin/riml
+- lib/riml/rewritten_ast_cache.rb
+- lib/riml/walker.rb
+- lib/riml/warning_buffer.rb
+- version.rb
 homepage: https://github.com/luke-gru/riml
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4386632180611596538
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
-summary: Riml is a language that compiles into Vim script
+specification_version: 4
+summary: Riml is a language that compiles into VimL
 test_files: []