treetop 1.2.1 → 1.2.2

data/lib/treetop/compiler/metagrammar.treetop

@@ -317,7 +317,7 @@ module Treetop
       end
 
       rule character_class
-        '[' characters:(!']' ('\]'/.))+ ']' <CharacterClass> {
+	'[' characters:(!']' ('\\' . /!'\\' .))+ ']' <CharacterClass> {
           def characters
             super.text_value
           end

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

@@ -6,8 +6,9 @@ module Treetop
       end
       
       def single_quote(string)
-        "'#{string.gsub(/'$/, "\\'")}'"
+	# Double any backslashes, then backslash any single-quotes:
+	"'#{string.gsub(/\\/) { '\\\\' }.gsub(/'/) { "\\'"}}'"
       end
     end
   end
-end
+end

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(/#{escaped_text_value}/, index) == index" do
+        builder.if__ "input.index(Regexp.new(#{single_quote(text_value)}), index) == index" do
           assign_result "(#{node_class_name}).new(input, index...(index + 1))"
           extend_result_with_inline_module
           builder << "@index += 1"
@@ -14,10 +14,6 @@ module Treetop
           assign_result 'nil'
         end
       end
-
-      def escaped_text_value
-        text_value.gsub(/\/|#(@|\$)/) {|match| "\\#{match}"}
-      end
     end
   end
-end
+end

data/lib/treetop/runtime.rb

@@ -1,7 +1,5 @@
 dir = File.dirname(__FILE__)
 require "#{dir}/runtime/compiled_parser"
 require "#{dir}/runtime/syntax_node"
-require "#{dir}/runtime/node_cache"
-require "#{dir}/runtime/parse_cache"
 require "#{dir}/runtime/terminal_parse_failure"
 require "#{dir}/runtime/interval_skip_list"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2008-02-01 00:00:00 -08:00
+  version: 1.2.2
+date: 2008-02-29 00:00:00 -08:00
 summary: A Ruby-based text parsing and interpretation DSL
 require_paths: 
 - lib
@@ -69,8 +69,6 @@ files:
 - lib/treetop/runtime/compiled_parser.rb
 - lib/treetop/runtime/interval_skip_list
 - lib/treetop/runtime/interval_skip_list.rb
-- lib/treetop/runtime/node_cache.rb
-- lib/treetop/runtime/parse_cache.rb
 - lib/treetop/runtime/syntax_node.rb
 - lib/treetop/runtime/terminal_parse_failure.rb
 - lib/treetop/runtime/terminal_syntax_node.rb
@@ -130,7 +128,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 

data/lib/treetop/runtime/node_cache.rb

@@ -1,27 +0,0 @@
-module Treetop
-  module Runtime
-    class NodeCache
-      attr_reader :parse_results
-    
-      def initialize
-        @parse_results = {}
-      end
-  
-      def empty?
-        parse_results.empty?
-      end
-  
-      def store(parse_result)
-        if parse_result.nil?
-          parse_results[parse_result.index] = parse_result
-        else
-          parse_results[parse_result.interval.begin] = parse_result
-        end
-      end
-  
-      def [](start_index)
-        parse_results[start_index]
-      end
-    end
-  end
-end

data/lib/treetop/runtime/parse_cache.rb

@@ -1,19 +0,0 @@
-module Treetop
-  module Runtime
-    class ParseCache
-      attr_reader :node_caches
-    
-      def initialize
-        @node_caches = {}
-      end
-    
-      def [](parsing_expression)
-        node_caches[parsing_expression] ||= NodeCache.new
-      end
-    
-      def empty?
-        node_caches.empty?
-      end
-    end
-  end
-end