riml 0.1.8 → 0.1.9

data/lib/repl.rb

@@ -1,24 +1,41 @@
-require 'readline'
+begin
+  require 'readline'
+rescue LoadError => e
+  $stderr.puts e, "Readline is required to run repl."
+  exit 1
+end
 require_relative 'riml'
 
 module Riml
   class Repl
     attr_reader :line
+    attr_reader :parser, :compiler
+    private :parser, :compiler
+
+    EXIT_ON = %w(quit exit q e)
+    COMPILE_ON = %w(compile c)
+    RELOAD_ON = %w(reload reload!)
 
     def initialize(vi_readline = false)
       @indent_amount = 0
       @line = nil
+      prepare_new_context
       Readline.vi_editing_mode if vi_readline
+      trap(:INT) { reset!; puts }
     end
 
     def run
       while @line = Readline.readline(current_indent, true)
         line.strip!
         next if line.empty?
-        exit_repl if line == 'quit' || line == 'q'
-        if line == 'c'
+        line_dc = line.downcase
+        exit_repl if EXIT_ON.include?(line_dc)
+        if COMPILE_ON.include?(line_dc)
           next if current_compilation_unit.empty?
           compile_unit!
+        elsif RELOAD_ON.include?(line_dc)
+          reload!
+          puts "reloaded"
         else
           current_compilation_unit << line
           check_indents
@@ -28,28 +45,49 @@ module Riml
 
     private
 
+    def prepare_new_context
+      @compiler = Compiler.new
+      @parser = Parser.new
+    end
+    alias reload! prepare_new_context
+
     def check_indents
-      @lexer = Lexer.new("#{line}\n")
-      @lexer.ignore_indentation_check = true
-      @lexer.tokenize
-      indent = @lexer.current_indent
-      @indent_amount += indent
+      lexer = Lexer.new(line)
+      lexer.ignore_indentation_check = true
+      lexer.tokenize
+      @indent_amount += lexer.current_indent
+    rescue => e
+      print_error(e)
+      reset!
     end
 
     def current_indent
-      " " * @indent_amount.abs
+      return '' if @indent_amount <= 0
+      ' ' * @indent_amount
     end
 
     def compile_unit!
-      @indent_amount = 0
-      puts Riml.compile(current_compilation_unit.join("\n"))
-      current_compilation_unit.clear
+      puts Riml.compile(current_compilation_unit.join("\n"), parser, compiler), "\n"
+    rescue => e
+      raise unless e.kind_of?(RimlError)
+      print_error(e)
+    ensure
+      reset!
     end
 
     def current_compilation_unit
       @current_compilation_unit ||= []
     end
 
+    def reset!
+      @indent_amount = 0
+      current_compilation_unit.clear
+    end
+
+    def print_error(e)
+      puts "#{e.class}: #{e}"
+    end
+
     def exit_repl
       exit
     end

data/lib/riml.rb

@@ -28,14 +28,15 @@ module Riml
       source = input.read
       nodes = parser.parse(source)
     else
-      raise ArgumentError, "input must be nodes, tokens or code, is #{input.class}"
+      raise ArgumentError, "input must be nodes, tokens, code or file, is #{input.class}"
     end
+    compiler.parser = parser
     output = compiler.compile(nodes)
     return output unless input.is_a?(File)
     write_file(output, input.path)
   ensure
     input.close if input.is_a?(File)
-    process_compile_queue!(parser, compiler)
+    process_compile_queue!(compiler)
   end
 
   # expects `file_names` to be readable files
@@ -79,15 +80,16 @@ module Riml
   # 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!(parser, compiler)
+  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)), parser)
-    process_compile_queue!(parser, compiler)
+    compile(File.open(File.join(Riml.source_path, file_name)), compiler.parser)
+    process_compile_queue!(compiler)
   end
 
   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)
     file_basename = File.basename(fname)

data/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riml
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &80512100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80512100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !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"
@@ -35,19 +40,20 @@ files:
 - LICENSE
 - version.rb
 - lib/parser.rb
-- lib/class_map.rb
-- lib/errors.rb
-- lib/repl.rb
 - lib/walker.rb
+- lib/class_map.rb
+- lib/included.vim
+- lib/constants.rb
+- lib/lexer.rb
+- lib/grammar.y
+- lib/compiler.rb
+- lib/environment.rb
 - lib/header.vim
-- lib/ast_rewriter.rb
+- lib/repl.rb
 - lib/riml.rb
-- lib/compiler.rb
 - lib/nodes.rb
-- lib/environment.rb
-- lib/grammar.y
-- lib/lexer.rb
-- lib/constants.rb
+- lib/errors.rb
+- lib/ast_rewriter.rb
 - Rakefile
 - CONTRIBUTING
 - Gemfile
@@ -74,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Relaxed VimL (Vimscript)