parslet 1.3.0 → 1.4.0

data/lib/parslet/source/line_cache.rb

@@ -3,7 +3,7 @@
 class Parslet::Source
   # A cache for line start positions. 
   #
-  class LineCache # :nodoc: 
+  class LineCache 
     def initialize
       # 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, 
@@ -59,7 +59,7 @@ class Parslet::Source
   #     [10, 20, 30]
   #     # would describe [0, 10], (10, 20], (20, 30]
   #
-  module RangeSearch # :nodoc: 
+  module RangeSearch 
     def find_mid(left, right)
       # NOTE: Jonathan Hinkle reported that when mathn is required, just
       # dividing and relying on the integer truncation is not enough.

data/lib/parslet/transform.rb

@@ -131,12 +131,12 @@ class Parslet::Transform
     
     # Allows accessing the class' rules
     #
-    def rules # :nodoc: 
+    def rules 
       @__transform_rules || []
     end
   end
   
-  def initialize(&block) # :nodoc: 
+  def initialize(&block) 
     @rules = []
     
     if block
@@ -183,7 +183,6 @@ class Parslet::Transform
   # arity 1 variant of the block. Alternatively, you can inject a context object
   # and call methods on it (think :ctx => self).
   #
-  # Example:
   #   # the local variable a is simulated
   #   t.call_on_match(:a => :b) { a } 
   #   # no change of environment here
@@ -203,11 +202,13 @@ class Parslet::Transform
   # Allow easy access to all rules, the ones defined in the instance and the 
   # ones predefined in a subclass definition. 
   #
-  def rules # :nodoc: 
+  def rules 
     self.class.rules + @rules
   end
   
-  def transform_elt(elt, context) # :nodoc: 
+  # @api private 
+  #
+  def transform_elt(elt, context) 
     rules.each do |pattern, block|
       if bindings=pattern.match(elt, context)
         # Produces transformed value
@@ -218,13 +219,18 @@ class Parslet::Transform
     # No rule matched - element is not transformed
     return elt
   end
-  def recurse_hash(hsh, ctx) # :nodoc: 
+
+  # @api private 
+  #
+  def recurse_hash(hsh, ctx) 
     hsh.inject({}) do |new_hsh, (k,v)|
       new_hsh[k] = apply(v, ctx)
       new_hsh
     end
   end
-  def recurse_array(ary, ctx) # :nodoc: 
+  # @api private 
+  #
+  def recurse_array(ary, ctx) 
     ary.map { |elt| apply(elt, ctx) }
   end
 end

data/lib/parslet/transform/context.rb

@@ -10,7 +10,7 @@ require 'blankslate'
 #     a # => :b
 #   end
 #
-class Parslet::Transform::Context < BlankSlate # :nodoc:
+class Parslet::Transform::Context < BlankSlate
   reveal :methods
   reveal :respond_to?
   reveal :inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parslet
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &70331801365680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70331801365680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70331801365040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331801365040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70331802115280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331802115280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70331802114800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331802114800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70331802114300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331802114300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70331802113400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331802113400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70331802112700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331802112700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70331802112180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331802112180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: kaspar.schiess@absurd.li
 executables: []
@@ -124,13 +164,11 @@ files:
 - lib/parslet/atoms/str.rb
 - lib/parslet/atoms/visitor.rb
 - lib/parslet/atoms.rb
-- lib/parslet/bytecode/compiler.rb
-- lib/parslet/bytecode/instructions.rb
-- lib/parslet/bytecode/vm.rb
-- lib/parslet/bytecode.rb
 - lib/parslet/cause.rb
 - lib/parslet/convenience.rb
-- lib/parslet/error_tree.rb
+- lib/parslet/error_reporter/deepest.rb
+- lib/parslet/error_reporter/tree.rb
+- lib/parslet/error_reporter.rb
 - lib/parslet/export.rb
 - lib/parslet/expression/treetop.rb
 - lib/parslet/expression.rb
@@ -146,19 +184,22 @@ files:
 - lib/parslet.rb
 - example/boolean_algebra.rb
 - example/comments.rb
+- example/deepest_errors.rb
 - example/documentation.rb
 - example/email_parser.rb
 - example/empty.rb
 - example/erb.rb
 - example/ignore.rb
-- example/ignore_whitespace.rb
 - example/ip_address.rb
 - example/json.rb
 - example/local.rb
 - example/mathn.rb
 - example/minilisp.rb
+- example/modularity.rb
+- example/nested_errors.rb
 - example/output/boolean_algebra.out
 - example/output/comments.out
+- example/output/deepest_errors.out
 - example/output/documentation.err
 - example/output/documentation.out
 - example/output/email_parser.out
@@ -171,6 +212,8 @@ files:
 - example/output/local.out
 - example/output/mathn.out
 - example/output/minilisp.out
+- example/output/modularity.out
+- example/output/nested_errors.out
 - example/output/parens.out
 - example/output/readme.out
 - example/output/seasons.out
@@ -201,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3769329244908936169
+      hash: 1524575203779308108
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Parser construction library with great error reporting in Ruby.

data/example/ignore_whitespace.rb

@@ -1,66 +0,0 @@
-# An example on how to ignore whitespace. Use the composition, luke.
-
-$:.unshift File.dirname(__FILE__) + "/../lib"
-
-require 'pp'
-require 'parslet'
-require 'parslet/convenience'
-
-class AParser < Parslet::Parser
-  root :as
-  
-  rule(:as) { a.repeat }
-  rule(:a) { str('a').as(:a) }
-end
-
-class WsIgnoreSource
-  def initialize(string)
-    @io = StringIO.new(string)
-    @early_eof = nil
-  end
-  
-  def pos
-    @io.pos
-  end
-  
-  def pos=(n)
-    @io.pos = n
-  end
-  
-  def gets(buf, n)
-    return nil if eof?
-    
-    return read(n).tap {
-      @early_eof = pos unless can_read?
-    }
-  end
-  
-  def eof?
-    @io.eof? ||                         # the underlying source is EOF
-    @early_eof && pos >= @early_eof     # we have no non-ws chars left
-  end
-  
-  private
-  
-  # Reads n chars from @io.
-  def read(n)
-    b = ''
-    while b.size < n && !@io.eof?
-      c = @io.gets(nil, 1)
-      b << c unless c == ' '
-    end
-    b
-  end
-  
-  # True if there are any chars left in @io.
-  def can_read?
-    old_pos = @io.pos
-    read(1).size == 1
-  rescue => ex
-    return false
-  ensure
-    @io.pos = old_pos
-  end
-end
-
-pp AParser.new.parse_with_debug(WsIgnoreSource.new('a   a a a    '))

data/lib/parslet/bytecode.rb

@@ -1,6 +0,0 @@
-module Parslet::Bytecode
-end
-
-require 'parslet/bytecode/instructions'
-require 'parslet/bytecode/compiler'
-require 'parslet/bytecode/vm'

data/lib/parslet/bytecode/compiler.rb

@@ -1,138 +0,0 @@
-require 'parslet/atoms/visitor'
-
-module Parslet::Bytecode
-  class Compiler
-    def initialize
-      @buffer = []
-      @blocks = Hash.new
-    end
-    
-    class Address
-      attr_reader :address
-      def initialize(address=nil)
-        @address = address
-      end
-      def resolve(vm)
-        @address = vm.buffer_pointer
-      end
-      def inspect
-        "@#{@address}"
-      end
-      def to_s
-        "@#{address}"
-      end
-    end
-    class Block
-      def initialize(name, block, compiler)
-        @name = name
-        @block = block
-        @compiler = compiler
-      end
-      def address
-        return @address if @address
-        
-        # Actual compilation: 
-        
-        # TODO raise not implemented if the block returns nil (see Entity)
-        @address = @compiler.current_address
-        atom.accept(@compiler)
-        @compiler.add Return.new
-        
-        return @address
-      end
-      def atom
-        @atom ||= @block.call
-      end
-    end
-    
-    def compile(atom)
-      atom.accept(self)
-      add Stop.new
-      @buffer
-    end
-    def add(instruction)
-      @buffer << instruction
-    end
-    
-    def fwd_address
-      Address.new
-    end
-    def current_address
-      Address.new(buffer_pointer)    
-    end
-    def buffer_pointer
-      @buffer.size
-    end
-    
-    def visit_str(str)
-      add Match.new(str)
-    end
-    def visit_re(match)
-      add Re.new(match, 1)
-    end
-    def visit_sequence(parslets)
-      emit_block do
-        sequence = Parslet::Atoms::Sequence.new(*parslets)
-        error_msg = "Failed to match sequence (#{sequence.inspect})"
-      
-        end_adr = fwd_address
-        parslets.each_with_index do |atom, idx|
-          atom.accept(self)
-          add CheckSequence.new(idx, end_adr, error_msg)
-        end
-            
-        add PackSequence.new(parslets.size)
-
-        end_adr.resolve(self)
-      end
-    end
-    def visit_alternative(alternatives)
-      emit_block do
-        adr_end = fwd_address
-      
-        add EnterFrame.new
-        add PushPos.new
-        alternatives.each_with_index do |alternative, idx|
-          alternative.accept(self)
-          add BranchOnSuccess.new(adr_end, idx)
-        end
-        add Fail.new(["Expected one of ", alternatives.inspect], alternatives.size)
-      
-        adr_end.resolve(self)
-      end
-    end
-    def visit_repetition(tag, min, max, parslet)
-      add SetupRepeat.new(tag)
-      start = current_address
-      parslet.accept(self)
-      add Repeat.new(min, max, start, parslet)
-    end
-    def visit_named(name, parslet)
-      parslet.accept(self)
-      add Box.new(name)
-    end
-    def visit_lookahead(positive, parslet)
-      add PushPos.new
-      parslet.accept(self)
-      add CheckAndReset.new(positive, parslet)
-    end
-    def visit_entity(name, block)
-      @blocks[name] ||= Block.new(name, block, self)
-      add CallBlock.new(@blocks[name])
-    end
-    def visit_parser(root)
-      root.accept(self)
-    end
-
-    def emit_block
-      end_adr = fwd_address
-      cache_adr = current_address
-      add CheckCache.new(end_adr)
-
-      yield
-
-      add StoreResult.new(cache_adr)
-      end_adr.resolve(self)
-    end
-  end
-end