antlr3 1.2.4 → 1.3.0

data/test/unit/test-trees.rb

@@ -26,7 +26,7 @@ class TestTreeNodeStream < Test::Unit::TestCase
     
     found.should == expecting
     
-    expecting = '101'
+    expecting = '<UNKNOWN: 101>'
     found = stream.inspect
     
     found.should == expecting
@@ -68,7 +68,7 @@ class TestTreeNodeStream < Test::Unit::TestCase
     found = nodes_only_string(stream)
     found.should == expecting
     
-    expecting = "101 2 102 2 103 3 104 3"
+    expecting = "<UNKNOWN: 101> <DOWN> <UNKNOWN: 102> <DOWN> <UNKNOWN: 103> <UP> <UNKNOWN: 104> <UP>"
     found = stream.inspect
     found.should == expecting
   end
@@ -91,7 +91,7 @@ class TestTreeNodeStream < Test::Unit::TestCase
     found = nodes_only_string(stream)
     found.should == expecting
     
-    expecting = "101 2 102 2 103 3 104 3 105"
+    expecting = "<UNKNOWN: 101> <DOWN> <UNKNOWN: 102> <DOWN> <UNKNOWN: 103> <UP> <UNKNOWN: 104> <UP> <UNKNOWN: 105>"
     found = stream.inspect
     found.should == expecting
   end
@@ -103,13 +103,13 @@ class TestTreeNodeStream < Test::Unit::TestCase
     root.add_child(CommonTree.new(CommonToken[102]))
     root.add_child(CommonTree.new(CommonToken[103]))
     
-    stream = CommonTreeNodeStream.new(root)
+    stream = CommonTreeNodeStream.new( root )
     
     expecting = '101 102 103'
     found = nodes_only_string(stream)
     found.should == expecting
     
-    expecting = '101 102 103'
+    expecting = '<UNKNOWN: 101> <UNKNOWN: 102> <UNKNOWN: 103>'
     found = stream.inspect
     found.should == expecting
   end
@@ -125,7 +125,7 @@ class TestTreeNodeStream < Test::Unit::TestCase
     found = nodes_only_string(stream)
     found.should == expecting
     
-    expecting = '101'
+    expecting = "<UNKNOWN: 101>"
     found = stream.inspect
     found.should == expecting
   end
@@ -139,7 +139,7 @@ class TestTreeNodeStream < Test::Unit::TestCase
     found = nodes_only_string(stream)
     found.should == expecting
     
-    expecting = '101 2 102 3'
+    expecting = '<UNKNOWN: 101> <DOWN> <UNKNOWN: 102> <UP>'
     found = stream.inspect
     found.should == expecting
   end
@@ -335,7 +335,9 @@ class TestCommonTreeNodeStream < Test::Unit::TestCase
     r0.add_child new_node( new_token 109 )
     
     stream = CommonTreeNodeStream.new(r0)
-    expecting = '101 2 102 2 103 3 104 2 105 3 106 2 107 3 108 109 3'
+    expecting = '<UNKNOWN: 101> <DOWN> <UNKNOWN: 102> <DOWN> <UNKNOWN: 103> <UP> <UNKNOWN: 104> ' +
+                '<DOWN> <UNKNOWN: 105> <UP> <UNKNOWN: 106> <DOWN> <UNKNOWN: 107> <UP> ' +
+                '<UNKNOWN: 108> <UNKNOWN: 109> <UP>'
     found = stream.inspect
     found.should == expecting
     
@@ -557,10 +559,10 @@ class TestCommonTree < Test::Unit::TestCase
     r0.add_child( new_node( new_token 104 ) )
     r0.add_child( new_node( new_token 105 ) )
     
-    dup = @adaptor.copy_tree(r0)
+    dup = @adaptor.copy_tree( r0 )
     assert_nil dup.parent
     dup.child_index.should == -1
-    dup.sanity_check_parent_and_child_indexes
+    dup.sanity_check
   end
   
   def test_become_root
@@ -572,7 +574,7 @@ class TestCommonTree < Test::Unit::TestCase
     old_root.add_child( new_node( new_token 103 ) )
     
     @adaptor.become_root(new_root, old_root)
-    new_root.sanity_check_parent_and_child_indexes
+    new_root.sanity_check
   end
   
   def test_become_root2
@@ -583,7 +585,7 @@ class TestCommonTree < Test::Unit::TestCase
     old_root.add_child( new_node( new_token 103 ) )
     
     @adaptor.become_root(new_root, old_root)
-    new_root.sanity_check_parent_and_child_indexes
+    new_root.sanity_check
   end
   
   def test_become_root3
@@ -596,7 +598,7 @@ class TestCommonTree < Test::Unit::TestCase
     old_root.add_child( new_node( new_token 103 ) )
     
     @adaptor.become_root(new_root, old_root)
-    new_root.sanity_check_parent_and_child_indexes
+    new_root.sanity_check
   end
   
   def test_become_root5
@@ -608,7 +610,7 @@ class TestCommonTree < Test::Unit::TestCase
     old_root.add_child( new_node( new_token 103 ) )
     
     @adaptor.become_root(new_root, old_root)
-    new_root.sanity_check_parent_and_child_indexes
+    new_root.sanity_check
   end
   
   def test_become_root6
@@ -618,7 +620,7 @@ class TestCommonTree < Test::Unit::TestCase
     
     @adaptor.add_child( root_1, new_node( new_token 6 ) )
     @adaptor.add_child( root_0, root_1 )
-    root_0.sanity_check_parent_and_child_indexes
+    root_0.sanity_check
   end
   
   def test_replace_with_no_children
@@ -638,8 +640,8 @@ class TestCommonTree < Test::Unit::TestCase
     new_child = new_node( new_token 99, :text => 'c' )
     t.replace_children(0,0,new_child)
     
-    t.to_string_tree.should == '(a c)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a c)'
+    t.sanity_check
 
   end
   def test_replace_in_middle
@@ -650,8 +652,8 @@ class TestCommonTree < Test::Unit::TestCase
     
     new_child = new_node( new_token 99, :text => 'x' )
     t.replace_children(1, 1, new_child)
-    t.to_string_tree.should == '(a b x d)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a b x d)'
+    t.sanity_check
   end
   
   def test_replace_at_left
@@ -662,8 +664,8 @@ class TestCommonTree < Test::Unit::TestCase
     
     new_child = new_node( new_token 99, :text => 'x' )
     t.replace_children(0, 0, new_child)
-    t.to_string_tree.should == '(a x c d)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a x c d)'
+    t.sanity_check
   end
   
   def test_replace_at_left
@@ -674,8 +676,8 @@ class TestCommonTree < Test::Unit::TestCase
     
     new_child = new_node( new_token 99, :text => 'x' )
     t.replace_children(2, 2, new_child)
-    t.to_string_tree.should == '(a b c x)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a b c x)'
+    t.sanity_check
   end
   
   def test_replace_one_with_two_at_left
@@ -689,8 +691,8 @@ class TestCommonTree < Test::Unit::TestCase
     new_children.add_child new_node( new_token 99, :text => 'y' )
     
     t.replace_children(0, 0, new_children)
-    t.to_string_tree.should == '(a x y c d)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a x y c d)'
+    t.sanity_check
   end
   
   def test_replace_one_with_two_at_right
@@ -704,8 +706,8 @@ class TestCommonTree < Test::Unit::TestCase
     new_children.add_child new_node( new_token 99, :text => 'y' )
     
     t.replace_children(2, 2, new_children)
-    t.to_string_tree.should == '(a b c x y)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a b c x y)'
+    t.sanity_check
   end
   
   def test_replace_one_with_two_in_middle
@@ -719,8 +721,8 @@ class TestCommonTree < Test::Unit::TestCase
     new_children.add_child new_node( new_token 99, :text => 'y' )
     
     t.replace_children(1, 1, new_children)
-    t.to_string_tree.should == '(a b x y d)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a b x y d)'
+    t.sanity_check
   end
   
   def test_replace_two_with_one_at_left
@@ -732,8 +734,8 @@ class TestCommonTree < Test::Unit::TestCase
     new_child = new_node( new_token 99, :text => 'x' )
     
     t.replace_children(0, 1, new_child)
-    t.to_string_tree.should == '(a x d)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a x d)'
+    t.sanity_check
   end
   
   def test_replace_two_with_one_at_right
@@ -745,8 +747,8 @@ class TestCommonTree < Test::Unit::TestCase
     new_child = new_node( new_token 99, :text => 'x' )
     
     t.replace_children(1, 2, new_child)
-    t.to_string_tree.should == '(a b x)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a b x)'
+    t.sanity_check
   end
   
   def test_replace_all_with_one
@@ -758,8 +760,8 @@ class TestCommonTree < Test::Unit::TestCase
     new_child = new_node( new_token 99, :text => 'x' )
     
     t.replace_children(0, 2, new_child)
-    t.to_string_tree.should == '(a x)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a x)'
+    t.sanity_check
   end
   
   def test_replace_all_with_two
@@ -773,8 +775,8 @@ class TestCommonTree < Test::Unit::TestCase
     new_children.add_child new_node( new_token 99, :text => 'y' )
     
     t.replace_children(0, 1, new_children)
-    t.to_string_tree.should == '(a x y d)'
-    t.sanity_check_parent_and_child_indexes
+    t.inspect.should == '(a x y d)'
+    t.sanity_check
   end
   
   def new_token(type, opts = {})
@@ -792,9 +794,12 @@ class TestTreeContext < Test::Unit::TestCase
     <invalid> <EOR> <DOWN> <UP> VEC ASSIGN PRINT
     PLUS MULT DOT ID INT WS '[' ',' ']'
   )
+  Tokens = TokenScheme.build( TOKEN_NAMES )
+  
   def setup
-    # before-each-test code
+    @wizard = Wizard.new( :token_scheme => Tokens )
   end
+  
   def teardown
     # after-each-test code
   end
@@ -802,53 +807,37 @@ class TestTreeContext < Test::Unit::TestCase
   # vvvvvvvv tests vvvvvvvvv
   
   def test_simple_parent
-    tree = "(nil (ASSIGN ID[x] INT[3]) (PRINT (MULT ID[x] (VEC INT[1] INT[2] INT[3]))))"
-    adaptor = CommonTreeAdaptor.new
-    wiz = Wizard.new(adaptor, TOKEN_NAMES)
-    t = wiz.create(tree)
-    
-    labels = {}
-    
-    valid = wiz.parse(t,
-      "(nil (ASSIGN ID[x] INT[3]) (PRINT (MULT ID (VEC INT %x:INT INT))))",
-      labels
+    tree = @wizard.create(
+      "(nil (ASSIGN ID[x] INT[3]) (PRINT (MULT ID[x] (VEC INT[1] INT[2] INT[3]))))"
+    )
+    labels = @wizard.match( tree,
+      "(nil (ASSIGN ID[x] INT[3]) (PRINT (MULT ID (VEC INT %x:INT INT))))"
     )
-    assert(valid)
-    node = labels['x']
     
-    TreeParser.in_context?(adaptor, TOKEN_NAMES, node, "VEC").should be_true
+    assert_kind_of( Hash, labels )
+    @wizard.in_context?( labels.fetch( 'x' ), 'VEC' ).should be_true
   end
   
   def test_no_parent
-    tree = '(PRINT (MULT ID[x] (VEC INT[1] INT[2] INT[3])))'
-    adaptor = CommonTreeAdaptor.new
-    wiz = Wizard.new(adaptor, TOKEN_NAMES)
-    t = wiz.create(tree)
-    
-    labels = {}
-    valid = wiz.parse(t,
-      "(%x:PRINT (MULT ID (VEC INT INT INT)))",
-      labels
+    tree = @wizard.create(
+      '(PRINT (MULT ID[x] (VEC INT[1] INT[2] INT[3])))'
     )
-    assert(valid)
-    node = labels['x']
-    assert_equal false,
-      TreeParser.in_context?(adaptor, TOKEN_NAMES, node, "VEC")
+    
+    labels = @wizard.match( tree, "(%x:PRINT (MULT ID (VEC INT INT INT)))" )
+    assert_kind_of( Hash, labels )
+    @wizard.in_context?( labels.fetch( 'x' ), 'VEC' ).should be_false
   end
   
   def test_parent_with_wildcard
-    tree = "(nil (ASSIGN ID[x] INT[3]) (PRINT (MULT ID[x] (VEC INT[1] INT[2] INT[3]))))"
-    adaptor = CommonTreeAdaptor.new
-    wiz = Wizard.new(adaptor, TOKEN_NAMES)
-    t = wiz.create(tree)
-    
-    labels = {}
-    assert wiz.parse(t,
-      "(nil (ASSIGN ID[x] INT[3]) (PRINT (MULT ID (VEC INT %x:INT INT))))",
-      labels)
-    node = labels['x']
-    
-    assert_equal true,
-      TreeParser.in_context?(adaptor, TOKEN_NAMES, node, 'VEC ...')
+    tree = @wizard.create(
+      "(nil (ASSIGN ID[x] INT[3]) (PRINT (MULT ID[x] (VEC INT[1] INT[2] INT[3]))))"
+    )
+    
+    labels = @wizard.match( tree,
+      "(nil (ASSIGN ID[x] INT[3]) (PRINT (MULT ID (VEC INT %x:INT INT))))"
+    )
+    assert_kind_of( Hash, labels )
+    node = labels.fetch( 'x' )
+    @wizard.in_context?( node, 'VEC ...' ).should be_true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: antlr3
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors: 
 - Kyle Yetter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-25 00:00:00 -05:00
+date: 2010-01-02 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -72,18 +72,17 @@ files:
 - lib/antlr3/version.rb
 - lib/antlr3/error.rb
 - lib/antlr3/tree.rb
-- lib/antlr3/test/diff.rb
 - lib/antlr3/test/functional.rb
 - lib/antlr3/test/call-stack.rb
 - lib/antlr3/test/grammar.rb
 - lib/antlr3/test/core-extensions.rb
-- lib/antlr3/test/config.rb
 - lib/antlr3/dfa.rb
 - lib/antlr3/profile.rb
 - lib/antlr3/tree/visitor.rb
 - lib/antlr3/tree/debug.rb
 - lib/antlr3/tree/wizard.rb
 - lib/antlr3/token.rb
+- lib/antlr3/task.rb
 - lib/antlr3/constants.rb
 - lib/antlr3/util.rb
 - lib/antlr3.rb
@@ -131,7 +130,7 @@ files:
 - templates/Dbg.stg
 - templates/ASTParser.stg
 - templates/ASTTreeParser.stg
-- samples/Cpp.g
+- samples/CPP.g
 - samples/ANTLRv3Grammar.g
 - README.txt
 - ANTLR-LICENSE.txt

data/lib/antlr3/test/config.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/ruby
-# encoding: utf-8
-
-=begin      ::about::
-author:     Kyle Yetter <kcy5b@yahoo.com>
-created on: October 11, 2009
-=end
-
-module ANTLR3
-module Test
-
-require 'rbconfig'
-path_sep = RbConfig::CONFIG['PATH_SEPARATOR']
-
-
-
-exec_path = ENV['PATH'].split(path_sep)
-
-
-
-
-end
-end

data/lib/antlr3/test/diff.rb

@@ -1,165 +0,0 @@
-#!/usr/bin/ruby
-# encoding: utf-8
-
-module ANTLR3
-module Test
-module Diff
-  module_function
-  
-  # trim common head and tail elements of the two lists
-  def width
-    screen_width - 20
-  end
-  
-  def column_width
-    width / 2 - 1
-  end
-  
-  def segment(list_a, list_b)
-    # trim leading common elements
-    common_head = 0
-    list_a.zip(list_b) do |a, b|
-      a == b ? (common_head += 1) : break
-    end
-    head = list_a[0...common_head]
-    list_a = list_a[common_head..-1].reverse!
-    list_b = list_b[common_head..-1].reverse!
-    
-    
-    common_tail = 0
-    list_a.zip(list_b) { |a,b| a == b ? (common_tail += 1) : break }
-    tail = list_a[0...common_tail].reverse!
-    list_a = list_a[common_tail..-1].reverse!
-    list_b = list_b[common_tail..-1].reverse!
-    
-    return [head, tail, list_a, list_b]
-  end
-
-  def max(a,b)
-    case a <=> b
-    when -1 then b
-    else a
-    end
-  end
-  
-  def colorize(text, color)
-    lines = text.split("\n")
-    escape = 
-      case color
-      when :white then "\e[37m"
-      when :magenta then "\e[35m"
-      when :yellow then "\e[33m"
-      when :green then "\e[32m"
-      when :black then "\e[30m"
-      when :red then "\e[31m"
-      when :cyan then "\e[36m"
-      when :blue then "\e[34m"
-      end
-    lines.map! { |ln| escape + ln << "\e[\0m" }.join("\n")
-  end
-  
-  def display_shared(item)
-    colorize(pair(item, item), :green)
-  end
-  def display_addition(item)
-    colorize(pair(nil, item), :magenta)
-  end
-  def display_subtraction(item)
-    colorize(pair(item, nil), :red)
-  end
-  def wrapped_inspect(list)
-    width = column_width
-    list = list.map { |i| i.inspect }
-    list[-1] << ' ]'
-    
-    lines, line, joint = [], '[ ', ''
-    
-    add_line = proc do |l|
-      lines << l.ljust(width)
-      '  '
-    end
-    
-    for item in list
-      line << joint
-      leftover = width - line.length
-      if item.length > leftover
-        i = item.rindex(/\s+/, leftover - 1) || leftover
-        if 
-          line = add_line[line << item[0, i]]
-          item = item[i..-1]
-        else
-          
-        end
-      end
-      line << item
-      
-      d = item.length + 2
-      if line.length + d > width
-        line << ','
-        lines << line
-        line, joint = '  ', ''
-      else
-        joint = ", "
-      end
-    end
-    lines << line
-    
-    lines.join("\n")
-  end
-
-  def pair(x, y)
-    x = x ? wrapped_inspect(x).split("\n") : []
-    y = y ? wrapped_inspect(y).split("\n") : []
-    line_count = max(x.length, y.length)
-    x.pad!(line_count, '')
-    y.pad!(line_count, '')
-    
-    x.zip(y).map! { |pair| pair.map! { |i| i.ljust(column_width) }.join(' ') }.join("\n")
-  end
-
-  def compute_lcs(list_a, list_b)
-    m, n = list_a.length, list_b.length
-    lcs_matrix = Array.new(m + 1) do |row|
-      Array.new(n + 1, 0)
-    end
-    m.times do |i| n.times do |j|
-      if list_a[i] == list_b[j] then lcs_matrix[i+1][j+1] = lcs_matrix[i][j] + 1
-      else lcs_matrix[i+1][j+1] = max(lcs_matrix[i+1][j], lcs_matrix[i][j+1])
-      end
-    end end
-    return lcs_matrix
-  end
-
-  def partial_diff(out, a, b, lcs, i = a.length, j = b.length)
-    if i > 0 and j > 0 and a[i-1] == b[j-1]
-      partial_diff(out, a, b, lcs, i-1, j-1)
-      out << display_shared(a[i-1])
-    else
-      if j > 0 and i.zero? || lcs[i][j-1] >= lcs[i-1][j]
-        partial_diff(out,a,b,lcs,i,j-1)
-        out << display_addition(b[j-1])
-      elsif i > 0 and j.zero? || lcs[i][j-1] < lcs[i-1][j]
-        partial_diff(out, a,b,lcs,i-1,j)
-        out << display_subtraction(a[i-1])
-      end
-    end
-    return out
-  end
-  
-  def diff(a, b, options = {})
-    head, tail, a, b = segment(a, b)
-    lcs = compute_lcs(a,b)
-    out = []
-    out << %w(Expected Got).map! { |w| w.ljust(column_width) }.join(' ')
-    head.each do |item|
-      out << display_shared(item)
-    end
-    partial_diff(out, a, b, lcs)
-    tail.each do |item|
-      out << display_shared(item)
-    end
-    out.join("\n")
-  end
-end
-end
-end