treetop 1.2.0 → 1.2.1

data/lib/treetop/runtime/interval_skip_list/node.rb

@@ -0,0 +1,164 @@
+class IntervalSkipList
+  class Node < HeadNode
+    attr_accessor :key
+    attr_reader :markers, :endpoint_of
+
+    def initialize(key, height, path)
+      super(height)
+      @key = key
+      @markers = []
+      @endpoint_of = []
+      update_forward_pointers(path)
+      promote_markers(path)
+    end
+
+    def all_forward_markers
+      markers.flatten
+    end
+
+    def delete(path)
+      0.upto(top_level) do |i|
+        path[i].forward[i] = forward[i]
+      end
+      demote_markers(path)
+    end
+
+    def propagate_length_change(length_change)
+      cur_node = self
+      while cur_node do
+        cur_node.key += length_change
+        cur_node = cur_node.forward[0]
+      end
+    end
+
+    protected
+
+    def update_forward_pointers(path)
+      0.upto(top_level) do |i|
+        forward[i] = path[i].forward[i]
+        path[i].forward[i] = self
+      end
+    end
+
+    def promote_markers(path)
+      promoted = []
+      new_promoted = []
+      0.upto(top_level) do |i|
+        incoming_markers = path[i].forward_markers[i]
+        markers.concat(incoming_markers)
+
+        incoming_markers.each do |marker|
+          if can_be_promoted_higher?(marker, i)
+            new_promoted.push(marker)
+            forward[i].delete_marker_from_path(marker, i, forward[i+1])
+          else
+            forward_markers[i].push(marker)
+          end
+        end
+
+        promoted.each do |marker|
+          if can_be_promoted_higher?(marker, i)
+            new_promoted.push(marker)
+            forward[i].delete_marker_from_path(marker, i, forward[i+1])
+          else
+            forward_markers[i].push(marker)
+          end
+        end
+
+        promoted = new_promoted
+        new_promoted = []
+      end
+    end
+
+
+    def can_be_promoted_higher?(marker, level)
+      level < top_level && forward[level + 1] && forward[level + 1].markers.include?(marker)
+    end
+
+    def delete_marker_from_path(marker, level, terminus)
+      cur_node = self
+      until cur_node == terminus
+        cur_node.forward_markers[level].delete(marker)
+        cur_node.markers.delete(marker)
+        cur_node = cur_node.forward[level]
+      end
+    end
+
+    def demote_markers(path)
+      demote_inbound_markers(path)
+      demote_outbound_markers(path)
+    end
+
+    def demote_inbound_markers(path)
+      demoted = []
+      new_demoted = []
+
+      top_level.downto(0) do |i|
+        incoming_markers = path[i].forward_markers[i].dup
+        incoming_markers.each do |marker|
+          unless forward_node_with_marker_at_or_above_level?(marker, i)
+            path[i].forward_markers[i].delete(marker)
+            new_demoted.push(marker)
+          end
+        end
+
+        demoted.each do |marker|
+          path[i + 1].place_marker_on_inbound_path(marker, i, path[i])
+
+          if forward[i].markers.include?(marker)
+            path[i].forward_markers[i].push(marker)
+          else
+            new_demoted.push(marker)
+          end
+        end
+
+        demoted = new_demoted
+        new_demoted = []
+      end
+    end
+
+    def demote_outbound_markers(path)
+      demoted = []
+      new_demoted = []
+
+      top_level.downto(0) do |i|
+        forward_markers[i].each do |marker|
+          new_demoted.push(marker) unless path[i].forward_markers[i].include?(marker)
+        end
+
+        demoted.each do |marker|
+          forward[i].place_marker_on_outbound_path(marker, i, forward[i + 1])
+          new_demoted.push(marker) unless path[i].forward_markers[i].include?(marker)
+        end
+
+        demoted = new_demoted
+        new_demoted = []
+      end
+    end
+
+    def forward_node_with_marker_at_or_above_level?(marker, level)
+      level.upto(top_level) do |i|
+        return true if forward[i].markers.include?(marker)
+      end
+      false
+    end
+
+    def place_marker_on_outbound_path(marker, level, terminus)
+      cur_node = self
+      until cur_node == terminus
+        cur_node.forward_markers[level].push(marker)
+        cur_node.markers.push(marker)
+        cur_node = cur_node.forward[level]
+      end
+    end
+
+    def place_marker_on_inbound_path(marker, level, terminus)
+      cur_node = self
+      until cur_node == terminus
+        cur_node.forward_markers[level].push(marker)
+        cur_node = cur_node.forward[level]
+        cur_node.markers.push(marker)
+      end
+    end
+  end
+end

data/lib/treetop/runtime/syntax_node.rb

@@ -1,12 +1,17 @@
 module Treetop
   module Runtime
     class SyntaxNode
-      attr_reader :input, :interval
+      attr_reader :input, :interval, :elements
+      attr_accessor :parent
 
       def initialize(input, interval, elements = nil)
         @input = input
         @interval = interval
-        @elements = elements
+        if @elements = elements
+          elements.each do |element|
+            element.parent = self
+          end
+        end
       end
 
       def terminal?
@@ -17,56 +22,51 @@ module Treetop
         !terminal?
       end
 
-      def elements
-        @elements
-      end
-
       def text_value
         input[interval]
       end
 
       def empty?
-	interval.first == interval.last && interval.exclude_end?
+	      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
+        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("") :
-	    ""
-	  )
+        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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2008-01-11 00:00:00 -08:00
+  version: 1.2.1
+date: 2008-02-01 00:00:00 -08:00
 summary: A Ruby-based text parsing and interpretation DSL
 require_paths: 
 - lib
@@ -63,31 +63,44 @@ files:
 - lib/treetop/compiler/node_classes/repetition.rb
 - lib/treetop/compiler/node_classes/sequence.rb
 - lib/treetop/compiler/node_classes/terminal.rb
+- lib/treetop/compiler/node_classes/transient_prefix.rb
 - lib/treetop/compiler/node_classes/treetop_file.rb
 - lib/treetop/ruby_extensions/string.rb
 - 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
+- lib/treetop/runtime/interval_skip_list/head_node.rb
+- lib/treetop/runtime/interval_skip_list/interval_skip_list.rb
+- lib/treetop/runtime/interval_skip_list/node.rb
 - bin/tt
 - doc/contributing_and_planned_features.markdown
 - doc/grammar_composition.markdown
-- doc/images
 - doc/index.markdown
 - doc/pitfalls_and_advanced_techniques.markdown
-- doc/screen.css
 - doc/semantic_interpretation.markdown
-- doc/site.html
+- doc/site
 - doc/site.rb
+- doc/sitegen.rb
 - doc/syntactic_recognition.markdown
 - doc/using_in_ruby.markdown
-- doc/images/bottom_background.png
-- doc/images/middle_backgound.png
-- doc/images/middle_background.png
-- doc/images/paren_language_output.png
-- doc/images/top_background.png
+- doc/site/contribute.html
+- doc/site/images
+- doc/site/index.html
+- doc/site/pitfalls_and_advanced_techniques.html
+- doc/site/screen.css
+- doc/site/semantic_interpretation.html
+- doc/site/syntactic_recognition.html
+- doc/site/using_in_ruby.html
+- doc/site/images/bottom_background.png
+- doc/site/images/middle_background.png
+- doc/site/images/paren_language_output.png
+- doc/site/images/pivotal.gif
+- doc/site/images/top_background.png
 - examples/lambda_calculus
 - examples/lambda_calculus/arithmetic.rb
 - examples/lambda_calculus/arithmetic.treetop

data/doc/screen.css

@@ -1,52 +0,0 @@
-body {
-	margin: 0;
-	padding: 0;
-	background: #666666;
-	font-family: "Lucida Grande", Geneva, Arial, Verdana, sans-serif;
-	color: #333333;
-}
-
-div {
-	margin: 0;
-	background-position: center;
-	background-repeat: none;	
-}
-
-h1 {
-	font-size: 120%;
-	margin-top: 1.5em;
-	margin-bottom: .5em;
-}
-
-div#top {
-	background-image: url("images/top_background.png");
-	height: 200px;
-	width: 100%;
-}
-
-div#middle {
-	padding-top: 10px;
-	background-image: url("images/middle_background.png");
-	background-repeat: repeat-y;
-}
-
-div#bottom {
-	background-image: url("images/bottom_background.png");
-	height: 42px;
-	margin-bottom: 30px;
-}
-
-div#content {
-	width: 481px;
-	margin: 0 auto 0 auto;
-	padding: 0 60px 25px 60px;
-}
-
-p {
-	line-height: 150%;
-}
-
-p.intro_text {
-	color: #C45900;
-	font-size: 115%;
-}

data/doc/site.html

@@ -1,34 +0,0 @@
-<html><head><link type="text/css" href="./screen.css" rel="stylesheet"></link></head><body><div id="top"></div><div id="middle"><div id="content"><p class="intro_text">
-
-Treetop is a language for describing languages. Combining the elegance of Ruby with cutting-edge <em>parsing expression grammars</em>, it helps you analyze syntax with revolutionarily ease.   
-
-</p>
-
-<h1>Intuitive Grammar Specifications</h1>
-
-<p>Treetop's packrat parsers use <em>memoization</em> to make the backtracking possible in linear time. This cuts the gordian knot of grammar design. There's no need to look ahead and no need to lex. Worry about the structure of the language, not the idiosyncrasies of the parser.</p>
-
-<h1>Syntax-Oriented Programming</h1>
-
-<p>Rather than implementing semantic actions that construct parse trees, define methods on the trees that Treetop automatically constructs–and write this code directly inside the grammar.</p>
-
-<h1>Reusable, Composable Language Descriptions</h1>
-
-<p>Break grammars into modules and compose them via Ruby's mixin semantics. Or combine grammars written by others in novel ways. Or extend existing grammars with your own syntactic constructs by overriding rules with access to a <code>super</code> keyword. Compositionally means your investment of time into grammar writing is secure–you can always extend and reuse your code.</p>
-
-<h1>Acknowledgements</h1>
-
-<p>First, thank you to my employer Rob Mee of Pivotal Labs for funding a substantial portion of Treetop's development. He gets it.</p>
-
-<p>I'd also like to thank:</p>
-
-<ul>
-<li>Damon McCormick for several hours of pair programming.</li>
-<li>Nick Kallen for lots of well-considered feedback and a few afternoons of programming.</li>
-<li>Brian Takita for a night of pair programming.</li>
-<li>Eliot Miranda for urging me rewrite as a compiler right away rather than putting it off.</li>
-<li>Ryan Davis and Eric Hodel for hurting my code.</li>
-<li>Dav Yaginuma for kicking me into action on my idea.</li>
-<li>Bryan Ford for his seminal work on Packrat Parsers.</li>
-<li>The editors of Lambda the Ultimate, where I discovered parsing expression grammars.</li>
-</ul></div></div><div id="bottom"></div></body></html>