parslet 1.0.1 → 1.1.0

data/lib/parslet/source.rb

@@ -0,0 +1,112 @@
+
+require 'stringio'
+
+# Wraps the input IO to parslet. The interface defined by this class is 
+# smaller than what IO offers, but enhances it with a #column and #line 
+# method for the current position. 
+#
+class Parslet::Source
+  attr_reader :line_ends
+  
+  def initialize(io)
+    if io.respond_to? :to_str
+      io = StringIO.new(io)
+    end
+    
+    @io = io
+    warn "Line counting will be off if the IO is not rewound." unless @io.pos==0
+    
+    # Stores line endings as a simple position number. The first line always
+    # starts at 0; numbers beyond the biggest entry are on any line > size, 
+    # but probably make a scan to that position neccessary.
+    @line_ends = []
+    @line_ends.extend RangeSearch
+    @eof_reached_once = false
+  end
+  
+  def read(n)
+    start_pos = pos
+    @io.read(n).tap { |buf| scan_for_line_endings(start_pos, buf) }
+  end
+  
+  def eof?
+    @io.eof?
+  end
+  
+  def pos
+    @io.pos
+  end
+
+  # NOTE: If you seek beyond the point that you last read, you will get 
+  # undefined behaviour. This is by design. 
+  def pos=(new_pos)
+    @io.pos = new_pos
+  end
+  
+  def line_and_column(position=nil)
+    pos = (position || self.pos)
+    eol_idx = @line_ends.lbound(pos)
+    
+    if eol_idx
+      # eol_idx points to the offset that ends the current line.
+      # Let's try to find the offset that starts it: 
+      offset = eol_idx>0 && @line_ends[eol_idx-1] || 0
+      return [eol_idx+1, pos-offset+1]
+    else
+      # eol_idx is nil, that means that we're beyond the last line end that
+      # we know about. Pretend for now that we're just on the last line.
+      offset = @line_ends.last || 0
+      return [@line_ends.size+1, pos-offset+1]
+    end
+  end
+
+  # Mixin for arrays that implicitly give a number of ranges, where one range
+  # begins where the other one ends.
+  # 
+  #   Example: 
+  #
+  #     [10, 20, 30]
+  #     # would describe [0, 10], (10, 20], (20, 30]
+  #
+  module RangeSearch
+    # Scans the array for the first number that is > than bound. Returns the 
+    # index of that number. 
+    #
+    def lbound(bound)
+      return nil if empty?
+      return nil unless last > bound
+
+      left = 0
+      right = size - 1 
+    
+      n = 10
+      loop do
+        mid = left + (right - left) / 2
+        
+        if self[mid] > bound
+          right = mid
+        else
+          # assert: self[mid] <= bound
+          left = mid+1
+        end
+        
+        if right <= left
+          return right
+        end
+      end
+    end
+  end
+  
+private
+
+  def scan_for_line_endings(start_pos, buf)
+    # Scan the string for line endings; store the positions of all endings
+    # in @line_ends. 
+    cur = -1
+    while buf && cur = buf.index("\n", cur+1)
+      @line_ends << (start_pos + cur+1)
+    end 
+    
+    @eof_reached_once = true
+  end
+end

data/lib/parslet.rb

@@ -1,5 +1,3 @@
-require 'stringio'
-
 # A simple parser generator library. Typical usage would look like this: 
 #
 #   require 'parslet'
@@ -229,6 +227,7 @@ module Parslet
   autoload :Expression, 'parslet/expression'
 end
 
+require 'parslet/source'
 require 'parslet/error_tree'
 require 'parslet/atoms'
 require 'parslet/pattern'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Kaspar Schiess
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +01:00
+date: 2011-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,10 +27,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 1
-        - 2
-        - 3
-        version: 2.1.2.3
+        - 0
+        version: "2.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -59,6 +57,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sdoc
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: 
 email: kaspar.schiess@absurd.li
 executables: []
@@ -75,6 +86,7 @@ files:
 - README
 - lib/parslet/atoms/alternative.rb
 - lib/parslet/atoms/base.rb
+- lib/parslet/atoms/context.rb
 - lib/parslet/atoms/entity.rb
 - lib/parslet/atoms/lookahead.rb
 - lib/parslet/atoms/named.rb
@@ -82,8 +94,11 @@ files:
 - lib/parslet/atoms/repetition.rb
 - lib/parslet/atoms/sequence.rb
 - lib/parslet/atoms/str.rb
+- lib/parslet/atoms/visitor.rb
 - lib/parslet/atoms.rb
+- lib/parslet/convenience.rb
 - lib/parslet/error_tree.rb
+- lib/parslet/export.rb
 - lib/parslet/expression/treetop.rb
 - lib/parslet/expression.rb
 - lib/parslet/parser.rb
@@ -91,11 +106,13 @@ files:
 - lib/parslet/pattern/context.rb
 - lib/parslet/pattern.rb
 - lib/parslet/rig/rspec.rb
+- lib/parslet/source.rb
 - lib/parslet/transform.rb
 - lib/parslet.rb
 - example/documentation.rb
 - example/email_parser.rb
 - example/empty.rb
+- example/erb.rb
 - example/ip_address.rb
 - example/minilisp.rb
 - example/parens.rb