parslet 1.1.0 → 1.1.1

data/Gemfile

@@ -10,5 +10,6 @@ group :development do
   gem 'sdoc'
   
   gem 'guard'
+  gem 'guard-rspec'
   gem 'growl'
 end

data/HISTORY.txt

@@ -1,3 +1,9 @@
+= 1.1.1 / 4Feb2011
+
+  ! FIX: Line counting was broken by performance optimisations. 
+  
+  + Squeezed out another few drops of performance. 
+
 = 1.1.0 / 2Feb2011
   
   + Uses return (fail/success), cached line counts, memoizing of parse results 

data/example/comments.rb

@@ -0,0 +1,37 @@
+# A small example on how to parse common types of comments. The example
+# started out with parser code from Stephen Waits. 
+
+$:.unshift '../lib'
+
+require 'pp'
+require 'parslet'
+require 'parslet/convenience'
+
+class ALanguage < Parslet::Parser
+  root(:expressions)
+  
+  rule(:expressions) { (line >> eol).repeat(1) | line }
+  rule(:line) { space? >> an_expression.as(:exp).repeat }
+  rule(:an_expression) { str('a').as(:a) >> space? }
+  
+  rule(:eol) { space? >> match["\n\r"].repeat(1) >> space? }
+  
+  rule(:space?) { space.repeat }
+  rule(:space) { multiline_comment.as(:multi) | line_comment.as(:line) | str(' ') }
+
+  rule(:line_comment) { str('//') >> (match["\n\r"].absnt? >> any).repeat }
+  rule(:multiline_comment) { str('/*') >> (str('*/').absnt? >> any).repeat >> str('*/') }
+end
+
+code = %q(
+  a
+  // line comment
+  a a a // line comment
+  a /* inline comment */ a 
+  /* multiline
+  comment */
+)
+
+pp ALanguage.new.parse_with_debug(code)
+
+

data/example/minilisp.rb

@@ -84,7 +84,6 @@ result = parser.parse_with_debug %Q{
       (display "something")
       (display 1)
       (display 3.08))))
-  (test)
 }
 
 # Transform the result

data/lib/parslet/atoms/base.rb

@@ -33,7 +33,7 @@ class Parslet::Atoms::Base
     # Stack trace will be off, but the error tree should explain the reason
     # it failed.
     if value.error?
-      raise Parslet::ParseFailed, value.message
+      parse_failed(value.message)
     end
     
     # assert: value is a success answer
@@ -85,7 +85,8 @@ class Parslet::Atoms::Base
   # behaviour. 
   #
   def try(source, context)
-    raise NotImplementedError, "Atoms::Base doesn't have behaviour, please implement #try(io)."
+    raise NotImplementedError, \
+      "Atoms::Base doesn't have behaviour, please implement #try(source, context)."
   end
 
   # Construct a new atom that repeats the current atom min times at least and

data/lib/parslet/source.rb

@@ -21,7 +21,6 @@ class Parslet::Source
     # but probably make a scan to that position neccessary.
     @line_ends = []
     @line_ends.extend RangeSearch
-    @eof_reached_once = false
   end
   
   def read(n)
@@ -100,13 +99,22 @@ class Parslet::Source
 private
 
   def scan_for_line_endings(start_pos, buf)
+    return unless buf
+    return unless buf.index("\n")
+    cur = -1
+    
+    # If we have already read part or all of buf, we already know about
+    # line ends in that portion. remove it and correct cur (search index)
+    if @last_line_end && start_pos < @last_line_end
+      # Let's not search the range from start_pos to last_line_end again.
+      cur = @last_line_end - start_pos -1
+    end
+    
     # 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)
+      @last_line_end = (start_pos + cur+1)
+      @line_ends << @last_line_end
     end 
-    
-    @eof_reached_once = true
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Kaspar Schiess
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,7 @@ files:
 - lib/parslet/source.rb
 - lib/parslet/transform.rb
 - lib/parslet.rb
+- example/comments.rb
 - example/documentation.rb
 - example/email_parser.rb
 - example/empty.rb