treetop 1.4.3 → 1.4.4

data/Rakefile

@@ -18,6 +18,15 @@ Rake::GemPackageTask.new($gemspec) do |pkg|
   pkg.need_tar = true
 end
 
+task :spec => :regenerate_metagrammar
+task :regenerate_metagrammar => 'lib/treetop/compiler/metagrammar.treetop' do |t|
+  unless $bootstrapped_gen_1_metagrammar
+    load File.join(File.dirname(__FILE__), 'lib', 'treetop', 'bootstrap_gen_1_metagrammar.rb')
+  end
+  
+  Treetop::Compiler::GrammarCompiler.new.compile(METAGRAMMAR_PATH)
+end
+
 task :version do
   puts RUBY_VERSION
 end

data/bin/tt

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'optparse'
 require 'rubygems'
-require 'treetop'
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'treetop'

data/lib/treetop/runtime/syntax_node.rb

@@ -3,9 +3,6 @@ module Treetop
     class SyntaxNode
       attr_reader :input, :interval
       attr_accessor :parent
-      attr_reader :dot_id
-
-      @@dot_id_counter = 0
 
       def initialize(input, interval, elements = nil)
         @input = input
@@ -26,9 +23,6 @@ module Treetop
           last_element = element
         end
 
-        @dot_id = @@dot_id_counter
-        @@dot_id_counter += 1
-
         @comprehensive_elements
       end
 
@@ -90,8 +84,14 @@ module Treetop
           )
       end
 
+      @@dot_id_counter = 0
+
+      def dot_id
+        @dot_id ||= @@dot_id_counter += 1
+      end
+
       def write_dot(io)
-        io.puts "node#{dot_id} [label=\"#{text_value}\"];"
+        io.puts "node#{dot_id} [label=\"'#{text_value}'\"];"
         if nonterminal? then
           elements.each do
             |x|

data/lib/treetop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors: 
 - Nathan Sobo
@@ -9,7 +9,7 @@ autorequire: treetop
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +11:00
+date: 2010-02-20 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.5
+        version: 0.3.0
     version: 
 description: 
 email: nathansobo@gmail.com