parslet 1.2.3 → 1.3.0

data/lib/parslet/source/line_cache.rb

@@ -60,6 +60,12 @@ class Parslet::Source
   #     # would describe [0, 10], (10, 20], (20, 30]
   #
   module RangeSearch # :nodoc: 
+    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.
+      left + ((right - left) / 2).floor
+    end  
+    
     # Scans the array for the first number that is > than bound. Returns the 
     # index of that number. 
     #
@@ -71,7 +77,7 @@ class Parslet::Source
       right = size - 1 
 
       loop do
-        mid = left + (right - left) / 2
+        mid = find_mid(left, right)
 
         if self[mid] > bound
           right = mid

data/lib/parslet/transform/context.rb

@@ -11,14 +11,22 @@ require 'blankslate'
 #   end
 #
 class Parslet::Transform::Context < BlankSlate # :nodoc:
-  def initialize(bindings)
-    @bindings = bindings
+  reveal :methods
+  reveal :respond_to?
+  reveal :inspect
+  reveal :to_s
+  reveal :instance_variable_set
+  
+  def meta_def(name, &body)
+    metaclass = class <<self; self; end
+
+    metaclass.send(:define_method, name, &body)
   end
   
-  def method_missing(sym, *args, &block)
-    super unless args.empty?
-    super unless @bindings.has_key?(sym.to_sym)
-    
-    @bindings[sym]
+  def initialize(bindings)
+    bindings.each do |key, value|
+      meta_def(key.to_sym) { value }
+      instance_variable_set("@#{key}", value)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parslet
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate
-  requirement: &70142555622900 !ruby/object:Gem::Requirement
+  requirement: &70331801365680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142555622900
+  version_requirements: *70331801365680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70142555622120 !ruby/object:Gem::Requirement
+  requirement: &70331801365040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142555622120
+  version_requirements: *70331801365040
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70142555621000 !ruby/object:Gem::Requirement
+  requirement: &70331802115280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142555621000
+  version_requirements: *70331802115280
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70142555620020 !ruby/object:Gem::Requirement
+  requirement: &70331802114800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142555620020
+  version_requirements: *70331802114800
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70142555618980 !ruby/object:Gem::Requirement
+  requirement: &70331802114300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,40 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142555618980
+  version_requirements: *70331802114300
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70331802113400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70331802113400
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70331802112700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70331802112700
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: &70331802112180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70331802112180
 description: 
 email: kaspar.schiess@absurd.li
 executables: []
@@ -73,13 +106,13 @@ extensions: []
 extra_rdoc_files:
 - README
 files:
-- Gemfile
 - HISTORY.txt
 - LICENSE
 - Rakefile
 - README
 - lib/parslet/atoms/alternative.rb
 - lib/parslet/atoms/base.rb
+- lib/parslet/atoms/can_flatten.rb
 - lib/parslet/atoms/context.rb
 - lib/parslet/atoms/dsl.rb
 - lib/parslet/atoms/entity.rb
@@ -89,9 +122,13 @@ files:
 - lib/parslet/atoms/repetition.rb
 - lib/parslet/atoms/sequence.rb
 - lib/parslet/atoms/str.rb
-- lib/parslet/atoms/transform.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/export.rb
@@ -114,9 +151,11 @@ files:
 - 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/output/boolean_algebra.out
 - example/output/comments.out
@@ -126,9 +165,11 @@ files:
 - example/output/empty.err
 - example/output/erb.out
 - example/output/ignore.out
+- example/output/ignore_whitespace.out
 - example/output/ip_address.out
 - example/output/json.out
 - example/output/local.out
+- example/output/mathn.out
 - example/output/minilisp.out
 - example/output/parens.out
 - example/output/readme.out
@@ -160,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4497395910031021567
+      hash: 3769329244908936169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Parser construction library with great error reporting in Ruby.

data/Gemfile

@@ -1,16 +0,0 @@
-source "http://rubygems.org"
-
-gem 'rake'
-gem 'blankslate', '~> 2'
-
-group :development do
-  gem 'rspec'
-  gem 'flexmock'
-
-  gem 'rdoc'
-  gem 'sdoc'
-  
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'growl'
-end

data/lib/parslet/atoms/transform.rb

@@ -1,75 +0,0 @@
-
-require 'parslet/atoms/visitor'
-
-# A helper class that allows transforming one grammar into another. You can
-# use this class as a base class: 
-#
-# Example: 
-#   class MyTransform < Parslet::Atoms::Transform
-#     def visit_str(str)
-#       # mangle string here
-#       super(str)
-#     end
-#   end
-#
-# Note that all the methods in a Transform must return parser atoms. The
-# quickest way to do so is to call super with your own arguments. This will
-# just create the same kind of atom that was just visited. 
-#
-# In essence, this base class performs what is called an 'identity transform'
-# with one small caveat: It returns a brand new grammar composed of brand new
-# parser atoms. This is like a deep clone of your grammar. 
-#
-# But nothing stops you from doing something that is far from a deep clone. 
-# You can totally transform the language your grammar accepts. Or maybe
-# turn all repetitions into non-greedy ones? Go wild. 
-#
-class Parslet::Atoms::Transform
-  # Applies a transformation to a grammar and returns a new grammar that 
-  # is the result of the transform.
-  #
-  # Example: 
-  #   Parslet::Atoms::Transform.new.apply(my_grammar) # => deep clone of my_grammar
-  #
-  def apply(grammar)
-    grammar.accept(self)
-  end
-  
-  def visit_str(str)
-    Parslet.str(str)
-  end
-  
-  def visit_sequence(parslets)
-    parslets[1..-1].inject(parslets[0]) { |a,p| a >> p.accept(self) }
-  end
-  
-  def visit_re(match)
-    Parslet.match(match)
-  end
-  
-  def visit_alternative(parslets)
-    parslets[1..-1].inject(parslets[0]) { |a,p| a | p.accept(self) }
-  end
-  
-  def visit_lookahead(positive, parslet)
-    Parslet::Atoms::Lookahead.new(positive, parslet.accept(self))
-  end
-  
-  def visit_entity(name, block)
-    # NOTE: This is kinda tricky. We return a new entity that keeps a reference
-    # to the transformer around. Once somebody accesses the parslet in that
-    # entity, the original block will produce the original parslet, and then
-    # we transform that then and there. Its lazy and futuristic!
-    transformer = self
-    transformed_block = proc { block.call.accept(transformer) }
-    Parslet::Atoms::Entity.new(name, &transformed_block)
-  end
-  
-  def visit_named(name, parslet)
-    parslet.accept(self).as(name)
-  end
-  
-  def visit_repetition(min, max, parslet)
-    parslet.accept(self).repeat(min, max)
-  end
-end