antlr3 1.7.5 → 1.8.0

data/test/functional/token-rewrite/via-parser.rb

@@ -5,7 +5,7 @@ require 'antlr3/test/functional'
 
 class TestRewritingWhileParsing < ANTLR3::Test::Functional
 
-  inline_grammar(<<-'END')
+  inline_grammar( <<-'END' )
     grammar TokenRewrites;
     options { language = Ruby; }
     
@@ -60,7 +60,7 @@ class TestRewritingWhileParsing < ANTLR3::Test::Functional
   END
 
   example 'using a TokenRewriteStream to rewrite input text while parsing' do
-    input = <<-END.fixed_indent(0)
+    input = <<-END.fixed_indent( 0 )
       method foo() {
         i = 3;
         k = i;
@@ -71,7 +71,7 @@ class TestRewritingWhileParsing < ANTLR3::Test::Functional
         j = i*2;
       }
     END
-    expected_output = <<-END.fixed_indent(0).strip!
+    expected_output = <<-END.fixed_indent( 0 ).strip!
       public class Wrapper {
       public void foo() {
       int k;
@@ -97,4 +97,3 @@ class TestRewritingWhileParsing < ANTLR3::Test::Functional
   end
 
 end
-

data/test/functional/tree-parser/basic.rb

@@ -6,7 +6,7 @@ require 'antlr3/test/functional'
 class TestTreeParser1 < ANTLR3::Test::Functional
   
   example "flat list" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar FlatList;
       options {
           language=Ruby;
@@ -17,7 +17,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       INT : '0'..'9'+;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar FlatListWalker;
       options {
           language=Ruby;
@@ -42,7 +42,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "simple tree" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar SimpleTree;
       options {
           language=Ruby;
@@ -53,7 +53,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       INT : '0'..'9'+;
       WS : (' '|'\\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar SimpleTreeWalker;
       options {
           language=Ruby;
@@ -78,7 +78,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "flat vs tree decision" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar FlatVsTreeDecision;
       options {
           language=Ruby;
@@ -91,7 +91,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       INT : '0'..'9'+;
       WS : (' '|'\\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar FlatVsTreeDecisionWalker;
       options {
           language=Ruby;
@@ -117,7 +117,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "flat vs tree decision2" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar FlatVsTreeDecision2;
       options {
           language=Ruby;
@@ -130,7 +130,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       INT : '0'..'9'+;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar FlatVsTreeDecision2Walker;
       options {
           language=Ruby;
@@ -155,7 +155,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "cyclic dfa lookahead" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar CyclicDFALookahead;
       options {
           language=Ruby;
@@ -168,7 +168,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       PERIOD : '.' ;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar CyclicDFALookaheadWalker;
       options {
           language=Ruby;
@@ -192,7 +192,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "nullable child list" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar NullableChildList;
       options {
           language=Ruby;
@@ -203,7 +203,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       INT : '0'..'9'+;
       WS : (' '|'\\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar NullableChildListWalker;
       options {
           language=Ruby;
@@ -227,7 +227,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "nullable child list2" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar NullableChildList2;
       options {
           language=Ruby;
@@ -239,7 +239,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       SEMI : ';' ;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar NullableChildList2Walker;
       options {
           language=Ruby;
@@ -263,7 +263,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "nullable child list3" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar NullableChildList3;
       options {
           language=Ruby;
@@ -275,7 +275,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       SEMI : ';' ;
       WS : (' '|'\\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar NullableChildList3Walker;
       options {
           language=Ruby;
@@ -300,7 +300,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "actions after root" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar ActionsAfterRoot;
       options {
           language=Ruby;
@@ -312,7 +312,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       SEMI : ';' ;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar ActionsAfterRootWalker;
       options {
           language=Ruby;
@@ -336,7 +336,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "wildcard lookahead" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar WildcardLookahead;
       options {language=Ruby; output=AST;}
       a : ID '+'^ INT;
@@ -346,7 +346,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       PERIOD : '.' ;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar WildcardLookaheadWalker;
       options {language=Ruby; tokenVocab=WildcardLookahead; ASTLabelType=CommonTree;}
       @members { include ANTLR3::Test::CaptureOutput }
@@ -366,7 +366,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "wildcard lookahead2" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar WildcardLookahead2;
       options {language=Ruby; output=AST;}
       a : ID '+'^ INT;
@@ -376,7 +376,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       PERIOD : '.' ;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar WildcardLookahead2Walker;
       options {language=Ruby; tokenVocab=WildcardLookahead2; ASTLabelType=CommonTree;}
       @members { include ANTLR3::Test::CaptureOutput }
@@ -397,7 +397,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "wildcard lookahead3" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar WildcardLookahead3;
       options {language=Ruby; output=AST;}
       a : ID '+'^ INT;
@@ -407,7 +407,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       PERIOD : '.' ;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar WildcardLookahead3Walker;
       options {language=Ruby; tokenVocab=WildcardLookahead3; ASTLabelType=CommonTree;}
       @members { include ANTLR3::Test::CaptureOutput }
@@ -428,7 +428,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
   end
   
   example "wildcard plus lookahead" do
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       grammar WildcardPlusLookahead;
       options {language=Ruby; output=AST;}
       a : ID '+'^ INT;
@@ -438,7 +438,7 @@ class TestTreeParser1 < ANTLR3::Test::Functional
       PERIOD : '.' ;
       WS : (' '|'\n') {$channel=HIDDEN;} ;
     END
-    compile_and_load inline_grammar(<<-'END')
+    compile_and_load inline_grammar( <<-'END' )
       tree grammar WildcardPlusLookaheadWalker;
       options {language=Ruby; tokenVocab=WildcardPlusLookahead; ASTLabelType=CommonTree;}
       @members { include ANTLR3::Test::CaptureOutput }
@@ -462,7 +462,7 @@ end
 
 
 class TestTreeParser2 < ANTLR3::Test::Functional
-  inline_grammar(<<-'END')
+  inline_grammar( <<-'END' )
     grammar GenericLanguage;
     options {
         language = Ruby;
@@ -578,7 +578,7 @@ class TestTreeParser2 < ANTLR3::Test::Functional
         ;
   END
 
-  inline_grammar(<<-'END')
+  inline_grammar( <<-'END' )
     tree grammar GenericLanguageWalker;
     options {
         language = Ruby;
@@ -664,7 +664,7 @@ class TestTreeParser2 < ANTLR3::Test::Functional
   compile_options :trace => true
   
   example "processing AST output from a parser with a tree parser" do
-    input_source = <<-END.fixed_indent(0)
+    input_source = <<-END.fixed_indent( 0 )
       char c;
       int x;
       
@@ -682,7 +682,7 @@ class TestTreeParser2 < ANTLR3::Test::Functional
     lexer = GenericLanguage::Lexer.new( input_source )
     parser = GenericLanguage::Parser.new( lexer )
     
-    expected_tree = <<-END.strip!.gsub!(/\s+/, ' ')
+    expected_tree = <<-END.strip!.gsub!( /\s+/, ' ' )
       (VAR_DEF char c)
       (VAR_DEF int x)
       (FUNC_DECL (FUNC_HDR void bar (ARG_DEF int x)))
@@ -747,4 +747,3 @@ class TestTreeParser2 < ANTLR3::Test::Functional
   end
   
 end
-

data/test/unit/test-streams.rb

@@ -79,23 +79,23 @@ class TestStringStream < Test::Unit::TestCase
     @stream.index.should == 0
     @stream.line.should == 1
     @stream.column.should == 0
-    @stream.peek(1).should == ?o
+    @stream.peek(1).should == ?o.ord
   end
   
   def test_look
     @stream.look(1).should == 'o'
     @stream.look(2).should == 'h'
     @stream.look(3).should == "\n"
-    @stream.peek(1).should == ?o
-    @stream.peek(2).should == ?h
-    @stream.peek(3).should == ?\n
+    @stream.peek(1).should == ?o.ord
+    @stream.peek(2).should == ?h.ord
+    @stream.peek(3).should == ?\n.ord
     
     6.times { @stream.consume }
     @stream.look(1).should == '!'
     @stream.look(2).should == "\n"
     @stream.look(3).should be_nil
-    @stream.peek(1).should == ?!
-    @stream.peek(2).should == ?\n
+    @stream.peek(1).should == ?!.ord
+    @stream.peek(2).should == ?\n.ord
     @stream.peek(3).should == EOF
   end
   
@@ -111,7 +111,7 @@ class TestStringStream < Test::Unit::TestCase
     @stream.index.should == 3
     @stream.line.should == 2
     @stream.column.should == 0
-    @stream.peek(1).should == ?h
+    @stream.peek(1).should == ?h.ord
   end
   
   def test_mark
@@ -165,7 +165,7 @@ class TestStringStream < Test::Unit::TestCase
     @stream.index.should == 4
     @stream.line.should == 2
     @stream.column.should == 1
-    @stream.peek(1).should == ?e
+    @stream.peek(1).should == ?e.ord
     
   end
 
@@ -194,7 +194,7 @@ class TestStringStream < Test::Unit::TestCase
     @stream.index().should == 5
     @stream.line.should == 2
     @stream.column.should == 2
-    @stream.peek(1).should == ?y    
+    @stream.peek(1).should == ?y.ord    
   end
 end
 
@@ -221,7 +221,7 @@ class TestFileStream < Test::Unit::TestCase
     @stream.column.should == 1
     @stream.mark_depth.should == 2
     @stream.look(1).should == 'a'
-    @stream.peek(1).should == ?a
+    @stream.peek(1).should == ?a.ord
   end
   
   def test_encoded

data/test/unit/test-template.rb

@@ -206,6 +206,7 @@ describe Template::Group, "dynamic template definition" do
 end
 
 describe Template::Group, "loading a template definition file" do
+  
   before :each do
     @group = Template::Group.load( SAMPLE_GROUP_FILE )
   end
@@ -246,5 +247,4 @@ describe Template::Group, "loading a template definition file" do
     | end
     END
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: antlr3
 version: !ruby/object:Gem::Version 
-  version: 1.7.5
+  version: 1.8.0
 platform: ruby
 authors: 
 - Kyle Yetter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-07-04 00:00:00 -04:00
 default_executable: 
 dependencies: []