tickly 0.0.6 → 0.0.7

data/.travis.yml

@@ -1,3 +1,5 @@
 rvm:
   - 1.8.7
-  - 1.9.3
+  - 1.9.2
+  - 1.9.3
+  - ruby-head

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "bychar", "~> 1.0.1"
+gem "bychar", "~> 1.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/lib/tickly/parser.rb

@@ -4,22 +4,6 @@ require 'bychar'
 module Tickly
   
   
-  # Since you parse char by char, you will likely call
-  # eof? on each iteration. Instead. allow it to raise and do not check.
-  # This takes the profile time down from 36 seconds to 30 seconds
-  # for a large file.
-  class EOFError < RuntimeError  #:nodoc: all
-  end
-  
-  class W < Bychar::Reader  #:nodoc: all
-    def read_one_byte
-      cache if @buf.eos?
-      raise EOFError if @buf.eos?
-        
-      @buf.getch
-    end
-  end
-  
   # Simplistic, incomplete and most likely incorrect TCL parser
   class Parser
     
@@ -30,7 +14,7 @@ module Tickly
     def parse(io_or_str)
       bare_io = io_or_str.respond_to?(:read) ? io_or_str : StringIO.new(io_or_str)
       # Wrap the IO in a Bychar buffer to read faster
-      reader = W.new(bare_io)
+      reader = Bychar::Reader.new(bare_io)
       sub_parse(reader)
     end
     
@@ -45,112 +29,87 @@ module Tickly
     TERMINATORS = ["\n", ";"]
     ESC = 92.chr # Backslash (\)
     
+    # Package the expressions, stack and buffer.
+    # We use a special flag to tell us whether we need multuple expressions
+    # or not, if not we just discard them
+    def wrap_up(expressions, stack, buf, stack_depth, multiple_expressions)
+      stack << buf if (buf.length > 0)
+      return stack unless multiple_expressions
+      
+      expressions << stack if stack.any?
+      expressions.each { |expr| expand_subexpr!(expr, stack_depth + 1) }
+      
+      return expressions
+    end
+    
     # Parse from a passed IO object either until an unescaped stop_char is reached
     # or until the IO is exhausted. The last argument is the class used to
     # compose the subexpression being parsed. The subparser is reentrant and not
     # destructive for the object containing it.
     def sub_parse(io, stop_char = nil, stack_depth = 0)
       # A standard stack is an expression that does not evaluate to a string
+      expressions = []
       stack = []
       buf = ''
       last_char_was_linebreak = false
+      multiple_expressions = false
       
       no_eof do
-        char = io.read_one_byte
-      
-        if buf[LAST_CHAR] != ESC
-          if char == stop_char # Bail out of a subexpr
-            stack << buf if (buf.length > 0)
-            # Chip away the tailing linebreak if it's there
-            chomp!(stack)
-            return stack
-          elsif char == " " || char == "\n" # Space
-            if buf.length > 0
-              stack << buf
-              buf = ''
-            end
-            if TERMINATORS.include?(char) # Introduce a stack separator! This is a new line
-              if stack.any? && !last_char_was_linebreak
-                last_char_was_linebreak = true
-                stack = handle_expr_terminator(stack, stack_depth)
-              end
-            end
-          elsif char == '[' # Opens a new string expression
-            stack << buf if (buf.length > 0)
-            last_char_was_linebreak = false
-            stack << [:b] + sub_parse(io, ']', stack_depth + 1)
-          elsif char == '{' # Opens a new literal expression  
-            stack << buf if (buf.length > 0)
-            last_char_was_linebreak = false
-            stack << [:c] + sub_parse(io, '}', stack_depth + 1)
-          elsif char == '"'
-            stack << buf if (buf.length > 0)
-            last_char_was_linebreak = false
-            stack << parse_str(io, '"')
-          elsif char == "'"
-            stack << buf if (buf.length > 0)
-            last_char_was_linebreak = false
-            stack << parse_str(io, "'")
+        char = io.read_one_byte!
+        
+        if char == stop_char # Bail out of a subexpr
+          # Handle any remaining subexpressions
+          return wrap_up(expressions, stack, buf, stack_depth, multiple_expressions)
+        elsif char == " " || char == "\n" # Space
+          if buf.length > 0
+            stack << buf
+            buf = ''
+          end
+          if TERMINATORS.include?(char) && stack.any? && !last_char_was_linebreak # Introduce a stack separator! This is a new line
+            stack << buf if buf.length > 0
+            expressions << stack
+            stack = []
+            last_char_was_linebreak = true
+            multiple_expressions = true
+            #puts "Next expression! #{expressions.inspect} #{stack.inspect} #{buf.inspect}"
           else
             last_char_was_linebreak = false
-            buf << char
           end
+        elsif char == '[' # Opens a new string expression
+          stack << buf if (buf.length > 0)
+          stack << [:b] + sub_parse(io, ']', stack_depth + 1)
+        elsif char == '{' # Opens a new literal expression  
+          stack << buf if (buf.length > 0)
+          stack << [:c] + sub_parse(io, '}', stack_depth + 1)
+        elsif char == '"'
+          stack << buf if (buf.length > 0)
+          stack << parse_str(io, '"')
+        elsif char == "'"
+          stack << buf if (buf.length > 0)
+          stack << parse_str(io, "'")
         else
-          last_char_was_linebreak = false
           buf << char
         end
       end
-    
-      # Ramass any remaining buffer contents
-      stack << buf if (buf.length > 0)
-      
-      # Handle any remaining subexpressions
-      if stack.include?(nil)
-        stack = handle_expr_terminator(stack, stack_depth)
-      end
-      # Chip awiy the trailing null
-      chomp!(stack)
       
-      return stack
+      return wrap_up(expressions, stack, buf, stack_depth, multiple_expressions)
     end
     
     def chomp!(stack)
       stack.delete_at(-1) if stack.any? && stack[-1].nil?
     end
     
-    def handle_expr_terminator(stack, stack_depth)
-      # Figure out whether there was a previous expr terminator
-      previous_i = stack.index(nil)
-      # If there were none, just get this over with. Wrap the stack contents
-      # into a subexpression and carry on.
-      unless previous_i
-        subexpr = stack
-        expand_subexpr!(subexpr, stack_depth + 1)
-        return [subexpr] + [nil]
-      end
-      
-      # Now, if there was one, we are the next subexpr in line that just terminated.
-      # What we need to do is pick out all the elements from that terminator onwards
-      # and wrap them.
-      subexpr = stack[previous_i+1..-1]
-      
-      # Use expand_subexpr! to trim away any fat that we don't need
-      expand_subexpr!(subexpr, stack_depth + 1)
-      
-      return stack[0...previous_i] + [subexpr] + [nil]
-    end
-    
     def no_eof(&blk)
       begin
         loop(&blk)
-      rescue EOFError
+      rescue Bychar::EOFError
       end
     end
     
     def parse_str(io, stop_char)
       buf = ''
       no_eof do
-        c = io.read_one_byte
+        c = io.read_one_byte!
         if c == stop_char && buf[LAST_CHAR] != ESC
           return buf
         elsif buf[LAST_CHAR] == ESC # Eat out the escape char

data/lib/tickly.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + "/tickly/evaluator"
 require 'forwardable'
 
 module Tickly
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
   
   # Provides the methods for quickly emitting the expression arrays,
   # is used in tests

data/tickly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tickly"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
@@ -54,14 +54,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bychar>, ["~> 1.0.1"])
+      s.add_runtime_dependency(%q<bychar>, ["~> 1.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<ruby-prof>, [">= 0"])
     else
-      s.add_dependency(%q<bychar>, ["~> 1.0.1"])
+      s.add_dependency(%q<bychar>, ["~> 1.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-prof>, [">= 0"])
     end
   else
-    s.add_dependency(%q<bychar>, ["~> 1.0.1"])
+    s.add_dependency(%q<bychar>, ["~> 1.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tickly
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2375266437877240498
+      hash: 1707085798664396026
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: