treetop 1.2.6 → 1.3.0

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2007 Nathan Sobo.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/treetop/compiler/node_classes/character_class.rb

@@ -4,7 +4,7 @@ module Treetop
       def compile(address, builder, parent_expression = nil)
         super
         
-        builder.if__ "input.index(Regexp.new(#{single_quote(text_value)}), index) == index" do
+        builder.if__ "has_terminal?(#{grounded_regexp(text_value)}, true, index)" do
           assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
           extend_result_with_inline_module
           builder << "@index += 1"
@@ -14,6 +14,11 @@ module Treetop
           assign_result 'nil'
         end
       end
+
+      def grounded_regexp(string)
+        # Double any backslashes, then backslash any single-quotes:
+        "'\\G#{string.gsub(/\\/) { '\\\\' }.gsub(/'/) { "\\'"}}'"
+      end
     end
   end
 end

data/lib/treetop/compiler/node_classes/parsing_expression.rb

@@ -79,7 +79,7 @@ module Treetop
       end
     
       def reset_index
-        builder.assign 'self.index', start_index_var
+        builder.assign '@index', start_index_var
       end
       
       def epsilon_node

data/lib/treetop/compiler/node_classes/parsing_rule.rb

@@ -27,7 +27,7 @@ module Treetop
           builder.newline
           generate_cache_storage(builder, result_var)
           builder.newline          
-          builder << "return #{result_var}"
+          builder << result_var
         end
       end
       

data/lib/treetop/compiler/node_classes/terminal.rb

@@ -5,7 +5,7 @@ module Treetop
         super
         string_length = eval(text_value).length
         
-        builder.if__ "input.index(#{text_value}, index) == index" do
+        builder.if__ "has_terminal?(#{text_value}, false, index)" do
           assign_result "instantiate_node(#{node_class_name},input, index...(index + #{string_length}))"
           extend_result_with_inline_module
           builder << "@index += #{string_length}"

data/lib/treetop/compiler/ruby_builder.rb

@@ -103,7 +103,7 @@ module Treetop
         address_space.reset_addresses
       end
       
-      protected
+      private
       
       def indent
         " " * level

data/lib/treetop/runtime/compiled_parser.rb

@@ -54,6 +54,7 @@ module Treetop
         @input_length = input.length
         reset_index
         @node_cache = Hash.new {|hash, key| hash[key] = Hash.new}
+        @regexps = {}
         @terminal_failures = []
         @max_terminal_failure_index = 0
       end
@@ -81,6 +82,15 @@ module Treetop
         end
       end
     
+      def has_terminal?(terminal, regex, index)
+        if regex
+          rx = @regexps[terminal] ||= Regexp.new(terminal)
+          input.index(rx, index) == index
+        else
+          input[index, terminal.size] == terminal
+        end
+      end
+    
       def terminal_parse_failure(expected_string)
         return nil if index < max_terminal_failure_index
         if index > max_terminal_failure_index

data/lib/treetop/version.rb

@@ -1,8 +1,8 @@
 module Treetop #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 2
-    TINY  = 6
+    MINOR = 3
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors: 
 - Nathan Sobo
@@ -9,7 +9,7 @@ autorequire: treetop
 bindir: bin
 cert_chain: []
 
-date: 2009-06-14 00:00:00 +10:00
+date: 2009-07-22 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- LICENSE
 - README
 - Rakefile
 - lib/treetop/bootstrap_gen_1_metagrammar.rb