treetop 1.1.4 → 1.2.0

data/lib/treetop/runtime/node_cache.rb

@@ -12,7 +12,7 @@ module Treetop
       end
   
       def store(parse_result)
-        if parse_result.failure?
+        if parse_result.nil?
           parse_results[parse_result.index] = parse_result
         else
           parse_results[parse_result.interval.begin] = parse_result

data/lib/treetop/runtime/syntax_node.rb

@@ -1,53 +1,72 @@
 module Treetop
   module Runtime
-    class SyntaxNode < ParseResult
+    class SyntaxNode
       attr_reader :input, :interval
-      
-      def initialize(input, interval, elements = nil, nested_results = elements)
-        super(input, nested_results || [])
+
+      def initialize(input, interval, elements = nil)
+        @input = input
         @interval = interval
         @elements = elements
       end
-      
-      def success?
-        true
-      end
-    
-      def failure?
-        false
-      end
 
       def terminal?
         @elements.nil?
       end
-      
+
       def nonterminal?
         !terminal?
       end
-      
+
       def elements
-        @elements || [self]
+        @elements
       end
-      
+
       def text_value
         input[interval]
       end
-      
-      def update_nested_results(nested_results)
-        new_nested_failures = collect_nested_failures_at_maximum_index(nested_results)
-      
-        return if new_nested_failures.empty?
-        @nested_failures = new_nested_failures and return if nested_failures.empty?
-      
-        current_nested_failure_index = nested_failures.first.index
-        new_nested_failure_index = new_nested_failures.first.index
-      
-        if new_nested_failure_index > current_nested_failure_index
-          @nested_failures = new_nested_failures
-        elsif new_nested_failure_index == current_nested_failure_index
-          @nested_failures += new_nested_failures
-        end
+
+      def empty?
+	interval.first == interval.last && interval.exclude_end?
+      end
+
+      def extension_modules
+	local_extensions =
+	  class <<self
+	    included_modules-Object.included_modules
+	  end
+	if local_extensions.size > 0
+	  local_extensions
+	else
+	  []    # There weren't any; must be a literal node
+	end
+      end
+
+      def inspect(indent="")
+	em = extension_modules
+	interesting_methods = methods-[em.last ? em.last.methods : nil]-self.class.instance_methods
+	im = interesting_methods.size > 0 ? " (#{interesting_methods.join(",")})" : ""
+	tv = text_value
+	tv = "...#{tv[-20..-1]}" if tv.size > 20
+
+	indent +
+	self.class.to_s.sub(/.*:/,'') +
+	  em.map{|m| "+"+m.to_s.sub(/.*:/,'')}*"" +
+	  " offset=#{interval.first}" +
+	  ", #{tv.inspect}" +
+	  im +
+	  (elements && elements.size > 0 ?
+	    ":" +
+	      (@elements||[]).map{|e|
+		begin
+		  "\n"+e.inspect(indent+"  ")
+		rescue  # Defend against inspect not taking a parameter
+		  "\n"+indent+" "+e.inspect
+		end
+	      }.join("") :
+	    ""
+	  )
+
       end
     end
   end
-end
+end

data/lib/treetop/runtime/terminal_parse_failure.rb

@@ -1,33 +1,16 @@
 module Treetop
   module Runtime
-    class TerminalParseFailure < ParseFailure
-      attr_reader :expected_string
+    class TerminalParseFailure
+      attr_reader :index, :expected_string
 
-      def initialize(input, index, expected_string)
-        super(input, index)
-        @expected_string = expected_string      
+      def initialize(index, expected_string)
+        @index = index
+        @expected_string = expected_string
       end
 
-      def nested_failures
-        [self]
-      end
-      
       def to_s
-        "String matching #{expected_string} expected at line #{line}, column #{column} (index #{index})."
-      end
-    
-      def ==(other_failure)
-        eql?(other_failure)
-      end
-    
-      def eql?(other_failure)
-        return false unless other_failure.instance_of?(TerminalParseFailure)
-        expected_string.eql?(other_failure.expected_string) && index.eql?(other_failure.index)
-      end
-    
-      def hash
-        [index, expected_string].hash
+        "String matching #{expected_string} expected."
       end
     end
   end
-end
+end

data/lib/treetop/runtime/terminal_syntax_node.rb

@@ -6,7 +6,12 @@ module Treetop
         super(input, interval, [])
       end
 
-      
+      def inspect(indent="")
+	indent+
+	  self.class.to_s.sub(/.*:/,'') +
+	  " offset=#{interval.first}" +
+	  " #{text_value.inspect}"
+      end
     end
   end
-end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
-date: 2007-12-02 00:00:00 -08:00
+  version: 1.2.0
+date: 2008-01-11 00:00:00 -08:00
 summary: A Ruby-based text parsing and interpretation DSL
 require_paths: 
 - lib
@@ -42,8 +42,6 @@ files:
 - lib/treetop/runtime.rb
 - lib/treetop/compiler/grammar_compiler.rb
 - lib/treetop/compiler/lexical_address_space.rb
-- lib/treetop/compiler/load_grammar.rb
-- lib/treetop/compiler/metagrammar.
 - lib/treetop/compiler/metagrammar.rb
 - lib/treetop/compiler/metagrammar.treetop
 - lib/treetop/compiler/node_classes
@@ -70,8 +68,6 @@ files:
 - lib/treetop/runtime/compiled_parser.rb
 - lib/treetop/runtime/node_cache.rb
 - lib/treetop/runtime/parse_cache.rb
-- lib/treetop/runtime/parse_failure.rb
-- lib/treetop/runtime/parse_result.rb
 - lib/treetop/runtime/syntax_node.rb
 - lib/treetop/runtime/terminal_parse_failure.rb
 - lib/treetop/runtime/terminal_syntax_node.rb
@@ -93,7 +89,7 @@ files:
 - doc/images/paren_language_output.png
 - doc/images/top_background.png
 - examples/lambda_calculus
-- examples/TALK
+- examples/lambda_calculus/arithmetic.rb
 - examples/lambda_calculus/arithmetic.treetop
 - examples/lambda_calculus/arithmetic_node_classes.rb
 - examples/lambda_calculus/arithmetic_test.rb
@@ -125,3 +121,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: polyglot
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 

data/examples/TALK

@@ -1,33 +0,0 @@
-Before talk?
-------------
-- non node-instantiating expressions extend their results with inline modules
-- allow load_grammar and require statements at the top of treetop files
-- deal with facets versioning issue
-
-
-
-Function application... the left-recursion problem
---------------------------------------------------
-f g x
-
-rule expression
-  application / function / variable
-end
-
-rule application
-  expression space expression
-end
-
-Function application... how can we avoid left recursion?
---------------------------------------------------------
-rule expression
-  application / function / variable
-end
-
-rule application
-  operator space expression
-end
-
-rule operator
-  function / variable
-end

data/lib/treetop/compiler/load_grammar.rb

@@ -1,7 +0,0 @@
-class Object
-  def load_grammar(path)
-    adjusted_path = path =~ /\.treetop\Z/ ? path : path + '.treetop'
-    compiler = Treetop::Compiler::GrammarCompiler.new
-    Object.class_eval(compiler.ruby_source(adjusted_path))
-  end
-end

data/lib/treetop/runtime/parse_failure.rb

@@ -1,32 +0,0 @@
-module Treetop
-  module Runtime
-    class ParseFailure < ParseResult
-      attr_reader :index
-    
-      def initialize(input, index, nested_results = [])
-        super(input, nested_results)
-        @index = index
-      end
-      
-      def line
-        input.line_of(index)
-      end
-      
-      def column
-        input.column_of(index)
-      end
-    
-      def success?
-        false
-      end
-    
-      def failure?
-        true
-      end
-    
-      def interval      
-        @interval ||= (index...index)
-      end    
-    end
-  end
-end

data/lib/treetop/runtime/parse_result.rb

@@ -1,30 +0,0 @@
-module Treetop
-  module Runtime
-    class ParseResult
-      attr_reader :input, :nested_failures
-    
-      def initialize(input, nested_results = [])
-        @input = input
-        @nested_failures = collect_nested_failures_at_maximum_index(nested_results)
-      end
-    
-      def collect_nested_failures_at_maximum_index(results)
-        maximum_index = 0
-        nested_failures = []
-    
-        results.each do |result|
-          next if result.nested_failures.empty?
-          index_of_nested_failures = result.nested_failures.first.index
-          if index_of_nested_failures > maximum_index
-            maximum_index = index_of_nested_failures
-            nested_failures = result.nested_failures
-          elsif index_of_nested_failures == maximum_index
-            nested_failures += result.nested_failures
-          end
-        end
-      
-        return nested_failures.uniq
-      end
-    end
-  end
-end