antlr3 1.8.2 → 1.8.5

data/History.txt

@@ -1,3 +1,21 @@
+=== 1.8.5 / 10-21-10
+
+* 1 Bug Fix
+  - fixed ANTLR3::InteractiveStringStream to work with Ruby 1.9. The lexer main script
+    should function in interactive mode for Ruby 1.9 now.
+
+=== 1.8.4 / 10-08-10
+
+* 1 Bug Fix
+  - removed directory dependency from tasks created by ANTLR3::Task, which caused
+    compilation to be performed twice in some situations
+
+=== 1.8.3 / 10-08-10
+
+* 2 Bug Fixes
+  - fixed typo in TokenRewriteStream#cast_range
+  - added work-around code to handle the lack of support for StopIteration in Rubinius
+
 === 1.8.2 / 10-02-10
 
 * Bug Fix: removed references to Parser#token_stream

data/lib/antlr3/error.rb

@@ -36,6 +36,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # - ported from the ANTLR3 Python Runtime library by
 #   Kyle Yetter (kcy5b@yahoo.com)
 module ANTLR3
+
+# for compatibility with rubinius, which does not implement StopIteration yet
+unless defined?( StopIteration )
+  StopIteration = Class.new( StandardError )
+end
+
 module Error
 
 =begin rdoc ANTLR3::Error::BacktrackingFailed

data/lib/antlr3/main.rb

@@ -382,6 +382,7 @@ class ParserMain < Main
       @port = options.fetch( :port, ANTLR3::Debug::DEFAULT_PORT )
       @log  = options.fetch( :log, @error )
     end
+    @profile = ( @parser_class.profile? rescue false )
   end
   
   def setup_options( opt )
@@ -456,6 +457,7 @@ class ParserMain < Main
     # token_stream = CommonTokenStream.new( lexer )
     parser = @parser_class.new( lexer, parser_options )
     result = parser.send( @parser_rule ) and present( result )
+    @profile and puts( parser.generate_report )
   end
   
   def present( return_value )

data/lib/antlr3/profile.rb

@@ -44,6 +44,15 @@ switch.
 module ParserEvents
   include ANTLR3::Debug::ParserEvents
   
+  def self.included( klass )
+    super
+    if klass.is_a?( ::Class )
+      def klass.profile?
+        true
+      end
+    end
+  end
+  
   def initialize( stream, options = {} )
     options[ :debug_listener ] ||= Profiler.new( self )
     super( stream, options )
@@ -319,7 +328,7 @@ class Profiler
     @profile.hidden_characters_matched = hidden_tokens.inject( 0 ) do |count, token|
       count + token.text.length rescue count
     end
-    @profile.characters_matched = ( @last_token || input.tokens.last ).stop + 1
+    @profile.characters_matched = ( @last_token || input.tokens.last ).stop + 1 rescue 0
     write_report
   end
   

data/lib/antlr3/recognizers.rb

@@ -307,6 +307,10 @@ class Recognizer
       return false
     end
     
+    def profile?
+      return false
+    end
+    
     def Scope( *declarations, &body )
       Scope.new( *declarations, &body )
     end

data/lib/antlr3/streams/interactive.rb

@@ -11,17 +11,82 @@ uses Readline (if available) or standard IO#gets to fetch data on demand.
 =end
 
 class InteractiveStringStream < StringStream
-  def initialize( options = {}, &block )
-    @data = ''
-    @position = @column = @mark_depth = 0
-    @line = 1
-    @markers = []
-    mark
-    @initialized = @eof = false
-    @readline = block or raise( ArgumentError, "no line-reading block was provided" )
-    @name = options.fetch( :name, '(interactive)' )
+  
+  if RUBY_VERSION =~ /^1\.9/
+    
+    # creates a new StringStream object where +data+ is the string data to stream.
+    # accepts the following options in a symbol-to-value hash:
+    #
+    # [:file or :name] the (file) name to associate with the stream; default: <tt>'(string)'</tt>
+    # [:line] the initial line number; default: +1+
+    # [:column] the initial column number; default: +0+
+    # 
+    def initialize( options = {}, &block )      # for 1.9
+      @string = ''
+      @data   = []
+      @position = options.fetch :position, 0
+      @line     = options.fetch :line, 1
+      @column   = options.fetch :column, 0
+      @markers  = []
+      mark
+      @initialized = @eof = false
+      @readline = block or raise( ArgumentError, "no line-reading block was provided" )
+      @name ||= options[ :file ] || options[ :name ] || '(interactive)'
+    end
+    
+    def readline
+      @initialized = true
+      unless @eof
+        if line = @readline.call
+          line = line.to_s.encode( Encoding::UTF_8 )
+          @string << line
+          @data.concat( line.codepoints.to_a )
+          return true
+        else
+          @eof = true
+          return false
+        end
+      end
+    end
+    
+  else
+    
+    # creates a new StringStream object where +data+ is the string data to stream.
+    # accepts the following options in a symbol-to-value hash:
+    #
+    # [:file or :name] the (file) name to associate with the stream; default: <tt>'(string)'</tt>
+    # [:line] the initial line number; default: +1+
+    # [:column] the initial column number; default: +0+
+    # 
+    def initialize( options = {}, &block )
+      @string = @data = ''
+      @position = options.fetch :position, 0
+      @line     = options.fetch :line, 1
+      @column   = options.fetch :column, 0
+      @markers = []
+      mark
+      @initialized = @eof = false
+      @readline = block or raise( ArgumentError, "no line-reading block was provided" )
+      @name ||= options[ :file ] || options[ :name ] || '(interactive)'
+    end
+    
+    def readline
+      @initialized = true
+      unless @eof
+        if line = @readline.call
+          @data << line.to_s
+          return true
+        else
+          @eof = true
+          return false
+        end
+      end
+    end
+    
   end
   
+  private :readline
+  
   def consume
     @position < @data.size and return( super )
     unless @eof
@@ -50,28 +115,15 @@ class InteractiveStringStream < StringStream
   
   def substring( start, stop )
     fill_through( stop )
-    @data[ start..stop ]
+    @string[ start .. stop ]
   end
   
 private
   
   def fill_through( position )
     @eof and return
-    if position < 0 then fill_out
-    else readline until ( @data.size > position or @eof )
-    end
-  end
-  
-  def readline
-    @initialized = true
-    unless @eof
-      if line = @readline.call
-        @data << line.to_s
-        return true
-      else
-        @eof = true
-        return false
-      end
+    if @position < 0 then fill_out
+    else readline until ( @data.size > @position or @eof )
     end
   end
   

data/lib/antlr3/streams/rewrite.rb

@@ -323,7 +323,7 @@ and do not add any text to the rewrite buffer
         
         if loc.is_a?( Range )
           first, last = loc.first.to_i, loc.last.to_i
-          loc.exlude_end? and last -= 1
+          loc.exclude_end? and last -= 1
           return cast_range( args.unshift( first, last ), extra )
         else
           loc = loc.to_i

data/lib/antlr3/task.rb

@@ -158,11 +158,10 @@ class GrammarSet
   end
   
   def define_tasks
-    directory( @output_directory )
     file( @antlr_jar )
     
     for grammar in @grammars
-      deps = [ @output_directory, @antlr_jar ]
+      deps = [ @antlr_jar ]
       if  vocab = grammar.token_vocab and
           tfile = find_tokens_file( vocab, grammar )
         file( tfile )
@@ -200,6 +199,8 @@ class GrammarSet
   end
   
   def compile( grammar )
+    dir = output_directory
+    test( ?d, dir ) or FileUtils.mkpath( dir )
     sh( build_command( grammar ) )
   end
   
@@ -376,7 +377,7 @@ class GrammarFile
       depends = shared_depends + depends
       
       target_files.each do | target |
-        file( target => depends ) do
+        file( target => ( depends - [ target ] ) ) do   # prevents recursive .tokens file dependencies
           @group.compile( self )
         end
       end

data/lib/antlr3/token.rb

@@ -316,6 +316,14 @@ module TokenSource
     return token
   end
   
+  def each
+    block_given? or return enum_for( :each )
+    while token = next_token and token.type != EOF
+      yield( token )
+    end
+    return self
+  end
+
   def to_stream( options = {} )
     if block_given?
       CommonTokenStream.new( self, options ) { | t, stream | yield( t, stream ) }
@@ -323,13 +331,6 @@ module TokenSource
       CommonTokenStream.new( self, options )
     end
   end
-  
-  def each
-    block_given? or return enum_for( :each )
-    loop { yield( self.next ) }
-  rescue StopIteration
-    return self
-  end
 end
 
 

data/lib/antlr3/tree.rb

@@ -219,6 +219,7 @@ throughout the AST library:
 =end
 
 module Tree
+  
   #attr_accessor :parent
   attr_accessor :start_index
   attr_accessor :stop_index

data/lib/antlr3/version.rb

@@ -20,7 +20,7 @@ module ANTLR3
   # 
   MAJOR_VERSION = 1
   MINOR_VERSION = 8
-  PATCH_VERSION = 2
+  PATCH_VERSION = 5
   VERSION = [ MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION ]
   VERSION_STRING = VERSION.join( '.' ).freeze
   

data/samples/JavaScript.g

@@ -1,108 +1,64 @@
-/**
-[The "BSD licence"]
-Copyright (c) 2010 Kyle Yetter
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-**/
-
 grammar JavaScript;
 
-options
-{
+options {
   language  = Ruby;
-	output    = AST;
+  output    = AST;
 }
 
 tokens {
-	ABSTRACT='abstract';  GET='get';                POST_DECR;
-	AMP='&';              GOTO='goto';              POST_INCR;
-	AMP_ASGN='&=';        GREATER='>';              PRIVATE='private';
-	AND='&&';             HAT='^';                  PROGRAM;
-	AREF;                 HAT_ASGN='^=';            PROTECTED='protected';
-	ARGUMENTS;            IF='if';                  PUBLIC='public';
-	ARRAY;                IMPLEMENTS='implements';  QMARK='?';
-	AS='as';              IMPORT='import';          RBRACE='}';
-	ASGN='=';             IN='in';                  RBRACK=']';
-	BLOCK;                INCR='++';                REGEX;
-	BOOLEAN='boolean';    INSTANCEOF='instanceof';  RETURN='return';
-	BREAK='break';        INT='int';                RPAREN=')';
-	BYTE='byte';          INTERFACE='interface';    RSHIFT3='>>>';
-	CALL;                 IS='is';                  RSHIFT3_ASGN='>>>=';
-	CASE='case';          LABEL;                    RSHIFT='>>';
-	CATCH='catch';        LBRACE='{';               RSHIFT_ASGN='>>=';
-	CHAR='char';          LBRACK='[';               SEMI=';'; //]
-	CLASS='class';        LEQ='<=';                 SET='set';
-	COLON=':';            LESS='<';                 SHORT='short';
-	COMMA=',';            LET='let';                SLASH;
-	COMMENT;              LINE_COMMENT;             SLASH_ASGN;
-	CONST='const';        LITERAL;                  STAR='*';
-	CONTINUE='continue';  LONG='long';              STAR_ASGN='*=';
-	DEBUGGER='debugger';  LPAREN='(';               STATIC='static';
-	DECR='--';            LSHIFT='<<';              SUPER='super';
-	DEFAULT='default';    LSHIFT_ASGN='<<=';        SWITCH='switch';
-	DELETE='delete';      MINUS='-';                SYNCHRONIZED='synchronized';
-	DO='do';              MINUS_ASGN='-=';          THIS='this';
-	DOT='.';              MOD='%';                  THROW='throw';
-	DOUBLE='double';      MOD_ASGN='%=';            THROWS='throws';
-	EACH='each';          NAMESPACE='namespace';    TILDE='~';
-	ELSE='else';          NATIVE='native';          TRANSIENT='transient';
-	ENUM='enum';          NEQ='!=';                 TRUE='true';
-	EQ='==';              NEQQ='!==';               TRY='try';
-	EQQ='===';            NEW='new';                TYPEOF='typeof';
-	EXPORT='export';      NOT='!';                  UNDEFINED='undefined';
-	EXTENDS='extends';    NULL='null';              USE='use';
-	FALSE='false';        OBJECT;                   VAR='var';
-	FINAL='final';        OR='||';                  VOID='void';
-	FINALLY='finally';    PACKAGE='package';        VOLATILE='volatile';
-	FLOAT='float';        PARAMS;                   WHILE='while';
-	FOR='for';            PIPE='|';                 WITH='with';
-	FOR_IN;               PIPE_ASGN='|=';           YIELD='yield';
-	FUNCTION='function';  PLUS='+';
-	GEQ='>=';             PLUS_ASGN='+=';
+  AMP='&';              HAT='^';                  PROGRAM;
+  AMP_ASGN='&=';        HAT_ASGN='^=';            QMARK='?';
+  AND='&&';             IF='if';                  RBRACE='}';
+  AREF;                 IN='in';                  RBRACK=']';
+  ARGUMENTS;            INCR='++';                REGEX;
+  ARRAY;                INSTANCEOF='instanceof';  RETURN='return';
+  ARROW='->';           ITER;                     RPAREN=')';
+  ASGN='=';             LABEL;                    RSHIFT='>>';
+  BLOCK;                LBRACE='{';               RSHIFT3='>>>';
+  BL_END='end';         LBRACK='[';               RSHIFT3_ASGN='>>>=';
+  BREAK='break';        LEQ='<=';                 RSHIFT_ASGN='>>=';
+  CALL;                 LESS='<';                 SEMI=';';
+  CASE='case';          LET='let';                SET='set';
+  CATCH='catch';        LINE_COMMENT;             SLASH;
+  COLON=':';            LITERAL;                  SLASH_ASGN;
+  COMMA=',';            LPAREN='(';               SPLAT;
+  COMMENT;              LSHIFT='<<';              STAR='*';
+  CONTINUE='continue';  LSHIFT_ASGN='<<=';        STAR_ASGN='*=';
+  DECR='--';            MINUS='-';                SWITCH='switch';
+  DEFAULT='default';    MINUS_ASGN='-=';          THIS='this';
+  DELETE='delete';      MOD='%';                  THROW='throw';
+  DO='do';              MOD_ASGN='%=';            TILDE='~';
+  DOT='.';              NEQ='!=';                 TRUE='true';
+  DO_UNTIL;             NEQQ='!==';               TRY='try';
+  DO_WHILE;             NEW='new';                TYPEOF='typeof';
+  EACH='each';          NOT='!';                  UMINUS;
+  ELSE='else';          NULL='null';              UNDEFINED='undefined';
+  EQ='==';              OBJECT;                   UNLESS='unless';
+  EQQ='===';            OR='||';                  UNTIL='until';
+  FALSE='false';        OR_ASGN='||=';            UPLUS;
+  FINALLY='finally';    PARAMS;                   VAR='var';
+  FOR='for';            PIPE='|';                 VOID='void';
+  FOR_IN;               PIPE_ASGN='|=';           WHILE='while';
+  FUNCTION='function';  PLUS='+';                 WITH='with';
+  GEQ='>=';             PLUS_ASGN='+=';           WORDS;
+  GET='get';            POST_DECR;                YAML;
+  GREATER='>';          POST_INCR;                YIELD='yield';
+  CONST='const';
 }
 
-scope InFor {
-  active;
-}
+scope InFor { active; }
 
 @parser::members {
   
   def auto_semicolon?( error )
-    if ANTLR3::Error::NoViableAlternative === error
-      ( input.position - 1 ).downto( 0 ) do | i |
-        token = input[ i ] or break
-        token.hidden? or break
-        token.type == NEWLINE and return true
-      end
+    if NoViableAlternative === error
+      return( @auto_semicolon = error ) unless same_line?
     end
     return false
   end
   
   def recover( error = $! )
-    auto_semicolon?( error ) and return
+    @auto_semicolon == error and return( @auto_semicolon = nil )
     super
   end
   
@@ -111,35 +67,72 @@ scope InFor {
     super
   end
   
+  def newline?( from = 1 )
+    to = from == -1 ? 1 : from + 1
+    start = @input.future?( from )
+    stop = @input.future?( to )
+    
+    start.upto( stop ) do | i |
+      @input.at( i ).type == NEWLINE and return( true )
+    end
+    
+    return( false )
+  end
+  
+  def same_line?
+    stop  = @input.future? || @input.length
+    start = @input.past?   || 0
+    
+    start.upto( stop ) do | i |
+      @input.at( i ).type == NEWLINE and return( false )
+    end
+    
+    return( true )
+  end
+  
+  def prepend_tree( root, child )
+    child = @adaptor.rule_post_processing( child )
+    root.unshift( child )
+    root.start_index > child.start_index and root.start_index = child.start_index
+    root.stop_index  < child.stop_index  and root.stop_index  = child.stop_index
+    return @adaptor.rule_post_processing( root )
+  end
 }
 
 @lexer::members {
-  attr_accessor :regex_possible
+  attr_accessor :value_expected
   
-  NO_REGEX_FOLLOWS = Set[
+  NO_VALUE_FOLLOWS = Set[
     ID, REGEX, STRING, NUMBER, THIS,
-    TRUE, FALSE, NULL,
-    RPAREN, RBRACK, RBRACE, UNDEFINED
+    TRUE, FALSE, NULL, UNDEFINED,
+    RPAREN, RBRACK, RBRACE,
+    IVAR, DOC, YAML, WORDS
   ]
   
   def next_token
     token = super
     unless token.hidden?
-      @regex_possible =
-        NO_REGEX_FOLLOWS.include?( token.type ) ? false : true
-      @last_type = token.type
+      @value_expected =
+        NO_VALUE_FOLLOWS.include?( token.type ) ? false : true
     end
     return( token )
   end
 }
 
 @lexer::init {
-  @regex_possible = true
-  @last_type = nil
+  @value_expected = true
+  @token_buffer = []
+  @buffer_depth = 0
 }
 
+
+/********************************************************************************
+ ****************************  Top-Level Structure  *****************************
+ ********************************************************************************/
+
 program
-  :  source_elements 
+  : source_elements -> source_elements
+  |                 -> ^( UNDEFINED )
   ;
   
 source_elements
@@ -152,24 +145,36 @@ block
   ;
 
 statement_block
-  : '{'  ( statement_list  )? '}' -> ^( BLOCK statement_list? )
+  : '{'  statement_list? '}' -> ^( BLOCK statement_list? )
   ;
   
 statement_list
-  : statement (  statement )* -> statement+
+  : statement+ -> statement+
+  ;
+
+clause
+  : '(' expression_list ')' -> expression_list
   ;
 
+/********************************************************************************
+ ********************************  Statements  **********************************
+ ********************************************************************************/
+
 statement
   : variable_statement
+  | const_statement
   | empty_statement
+  | ( 'function' )=> function
   | ( ID  ':' )=> labelled_statement
   | ( 'let' )=> let_statement
-	| expression_statement
+  | expression_statement
   | if_statement
-  | iteration_statement
+  | while_statement
+  | do_while_statement
+  | for_loop
   | continue_statement
   | break_statement
-	| yield_statement
+  | yield_statement
   | return_statement
   | with_statement
   | switch_statement
@@ -177,92 +182,163 @@ statement
   | try_statement
   ;
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Simple Statements
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+empty_statement
+  : ';' ->
+  ;
+
+expression_statement
+  : expression_list statement_end!
+  ;
+
+labelled_statement
+  : ID  ':'  block -> ^( LABEL ID block )
+  ;
+
+statement_end
+  : ';'
+  | ( '}' )=>
+  | EOF
+  ;
+
+blank
+  : -> ^( UNDEFINED )
+  ;
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Block-ish Statements
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+try_statement
+  : 'try'
+    ( statement_block -> statement_block )
+    ( f=finally_clause     -> { prepend_tree( $f.tree, $tree ) }
+    | ( catch_clause       -> { prepend_tree( $catch_clause.tree, $tree ) } )
+      (  f2=finally_clause -> { prepend_tree( $f2.tree, $tree ) } )?
+    )
+  ;
+
+catch_clause
+  : 'catch'  '('  ID  ')'  statement_block
+    -> ^( 'catch' ID statement_block )
+  ;
+
+finally_clause
+  : 'finally' statement_block
+    -> ^( 'finally' statement_block )
+  ;
+
+with_statement
+  : 'with' clause block -> ^( 'with' clause block )
+  ;
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Variable Declarations
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
 variable_statement
-  : 'var'  variable_declaration_list statement_end    -> ^( 'var' variable_declaration_list )
+  : 'var'^ variable_declaration_list statement_end!
   ;
-  
+
+const_statement
+  : 'const'^ variable_declaration_list statement_end!
+  ;
+
+let_statement
+  : 'let'^ '('! variable_declaration_list ')'! block
+  ;
+
 variable_declaration_list
-  : variable_declaration (  ','  variable_declaration )*
-    -> variable_declaration+
+  : variable_declaration ( ','! variable_declaration )*
   ;
-  
+
 variable_declaration
   : declaration_target ( '='^  expression )?
   ;
 
 declaration_target
   : '[' declaration_target ( ',' declaration_target )* ']' -> ^( ARRAY declaration_target+ )
-	| '{' declaration_key ( ',' declaration_key )* '}'       -> ^( OBJECT declaration_key+ )
-	| variable_name -> variable_name
-	;
-	
+  | '{' declaration_key ( ',' declaration_key )* '}'       -> ^( OBJECT declaration_key+ )
+  | variable_name -> variable_name
+  ;
+  
 declaration_key
   : property_name ':'^ declaration_target
-	;
-  
-empty_statement
-  : ';' ->
   ;
-  
-expression_statement
-  : expression_list statement_end!  ;
-  
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Branching Statements
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
 if_statement
-  : 'if'  '('  expression_list  ')' 
-    when_true=block
-    (  'else'  when_false=block )?
-    -> ^( 'if' expression_list $when_true $when_false? )
+  : 'if'^ clause block ( 'else'! block )?
   ;
 
-let_statement
-  : 'let' '(' variable_declaration_list ')' block
-	  -> ^( 'let' variable_declaration_list block )
-	;
-
-iteration_statement
-  : do_while_statement
-  | while_statement
-	| ( 'for' 'each' '(' )=> for_each_in_statement
-  | ( 'for'  '('  for_in_statement_initialiser_part  'in' )=> for_in_statement
-  | for_statement
+switch_statement
+  : 'switch'  '('  expression_list  ')' 
+    '{'
+    ( case_clause )*
+    ( default_clause (  case_clause )* )? 
+    '}'
+    -> ^( 'switch' expression_list case_clause* default_clause? )
   ;
   
-do_while_statement
-  : 'do'  block  'while'  '(' expression_list ')' statement_end    -> ^( 'do' expression_list block )
+case_clause
+  : 'case'^  expression_list  ':'!  statement_list?
   ;
   
+default_clause
+  : 'default'^  ':'!  statement_list?
+  ;
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// While Loops
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+do_while_statement
+  : 'do' block 'while' clause statement_end
+    -> ^( 'do' clause block )
+  ;
+
 while_statement
-  : 'while'  '('  expression_list  ')'  block
-    -> ^( 'while' expression_list block )
+  : 'while'^ clause block
   ;
-  
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// For Loops
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+for_loop
+  : { @input.peek( 2 ) == EACH }?=> for_each_in_statement
+  | ( 'for'  '('  ~( ')' | ';' | 'in' )*  'in' )=> for_in_statement
+  | for_statement
+  ;
+
 for_statement
-  : 'for' 
-    '('
-    (  for_statement_initialiser_part )?  ';'
-    (  cond=expression_list )?  ';'
-    (  step=expression_list )? 
-    ')' 
+  : 'for'^
+    '('!
+    ( for_statement_initialiser_part | blank ) ';'!
+    ( expression_list | blank )  ';'!
+    ( expression_list | blank )
+    ')'!
     block
-    -> ^( 'for' for_statement_initialiser_part? $cond? $step? block )
   ;
   
 for_statement_initialiser_part
   scope InFor;
-  @before {
-    $InFor::active = true
-  }
-  @after {
-    $InFor::active = false
-  }
+  @before { $InFor::active = true  }
+  @after  { $InFor::active = false }
   : expression_list
   | 'var'^  variable_declaration_list
   ;
 
 for_each_in_statement
   : 'for' 'each' '('  for_in_statement_initialiser_part  'in'  expression  ')'  block
-	  -> ^( 'each' for_in_statement_initialiser_part expression block )
-	;
+    -> ^( 'each' for_in_statement_initialiser_part expression block )
+  ;
   
 for_in_statement
   : f='for'  '('  for_in_statement_initialiser_part  'in'  expression  ')'  block
@@ -271,80 +347,34 @@ for_in_statement
   
 for_in_statement_initialiser_part
   scope InFor;
-  @before {
-    $InFor::active = true
-  }
-  @after {
-    $InFor::active = false
-  }
+  @before { $InFor::active = true  }
+  @after  { $InFor::active = false }
   : 'var'^  variable_declaration
   | member
   ;
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Flow Control
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
 continue_statement
-  : 'continue'^ ID? statement_end!
+  : 'continue'^ ( { same_line? }?=> ID )? statement_end!
   ;
 
 break_statement
-  : 'break'^ ID? statement_end!
+  : 'break'^ ( { same_line? }?=> ID )? statement_end!
   ;
 
 return_statement
-  : 'return'^ expression_list? statement_end!
+  : 'return'^ ( { same_line? }?=> expression_list )? statement_end!
   ;
 
 yield_statement
-  : 'yield'^ expression_list? statement_end!
-	;
-
-
-with_statement
-  : 'with'  '('  expression_list  ')'  block
-    -> ^( 'with' expression_list block )
-  ;
-
-labelled_statement
-  : ID  ':'  block
-    -> ^( LABEL ID block )
-  ;
-  
-switch_statement
-  : 'switch'  '('  expression_list  ')' 
-    '{'
-    (  case_clause )*
-    (  default_clause (  case_clause )* )? 
-    '}'
-    -> ^( 'switch' expression_list case_clause* default_clause? )
-  ;
-  
-case_clause
-  : 'case'^  expression_list  ':'!  statement_list?
-  ;
-  
-default_clause
-  : 'default'^  ':'!  statement_list?
+  : 'yield'^ ( { same_line? }?=> expression_list )? statement_end!
   ;
   
 throw_statement
-  : 'throw'^ expression_list statement_end!
-  ;
-
-try_statement
-  : 'try'  ( statement_block -> statement_block ) 
-    ( f=finally_clause -> { $f.tree.unshift( $tree ) }
-    | ( catch_clause -> { $catch_clause.tree.unshift( $tree ) } )
-      (  f2=finally_clause -> { $f2.tree.unshift( $tree ) } )?
-    )
-  ;
-       
-catch_clause
-  : 'catch'  '('  ID  ')'  statement_block
-    -> ^( 'catch' ID statement_block )
-  ;
-  
-finally_clause
-  : 'finally' statement_block
-    -> ^( 'finally' statement_block )
+  : 'throw'^ ( { same_line? }?=> expression_list )? statement_end!
   ;
 
 /********************************************************************************
@@ -356,10 +386,10 @@ expression_list
   ;
 
 expression
-  : ( member  assignment_op )=> member  assignment_op^  expression
+  : ( member assignment_op )=> member assignment_op^ expression
   | conditional
   ;
-  
+
 assignment_op
   : '='
   | '*='
@@ -384,11 +414,11 @@ logical_or
   ;
 
 logical_and
-  : bit_or (  '&&'^  bit_or )*
+  : bit_or  ( '&&'^  bit_or )*
   ;
 
 bit_or
-  : bit_xor (  '|'^  bit_xor )*
+  : bit_xor ( '|'^  bit_xor )*
   ;
 
 bit_xor
@@ -433,30 +463,36 @@ mult
   ;
 
 unary
-  : 'delete'^  unary
-  | 'void'^  unary
-  | 'typeof'^  unary
-  | '++'^  unary
-  | '--'^  unary
-  | '+'^  unary
-  | '-'^  unary
-  | '~'^  unary
-  | '!'^  unary
-  | postfix
+  : 'delete' unary   -> ^( 'delete' unary )
+  | 'void'   unary   -> ^( 'void' unary )
+  | 'typeof' unary   -> ^( 'typeof' unary )
+  | '++'     unary   -> ^( '++' unary )
+  | '--'     unary   -> ^( '--' unary )
+  | '+'      unary   -> ^( UPLUS[ '+' ] unary )
+  | '-'      unary   -> ^( UMINUS[ '-' ] unary )
+  | '~'      unary   -> ^( '~' unary )
+  | '!'      unary   -> ^( '!' unary )
+  | postfix          -> postfix
   ;
 
 postfix
   : member
-    ( '++' -> ^( POST_INCR[ '++' ] member )
-    | '--' -> ^( POST_DECR[ '--' ] member )
-    |      -> member
+    ( { same_line? }?=>
+      ( '++' -> ^( POST_INCR[ '++' ] member )
+      | '--' -> ^( POST_DECR[ '--' ] member )
+      )
+    |        -> member
     )
   ;
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Atomic Expressions
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
 member
-  : ( receiver  -> receiver )
-    ( accessor  -> { $accessor.tree.unshift( $tree ) }
-    | arguments -> ^( CALL $member arguments )
+  : ( receiver    -> receiver )
+    ( accessor    -> { prepend_tree( $accessor.tree, $tree ) }
+    | arguments   -> ^( CALL $member arguments )
     )*
   ;
   
@@ -466,30 +502,48 @@ accessor
   ;
 
 receiver
-  : primary
-  | function
+  : primary  -> primary
+  | function -> function
   | ( 'new' new_target arguments? )=>
       'new' new_target arguments? -> ^( 'new' new_target arguments? )
   ;
 
 new_target
   : ( receiver -> receiver )
-    ( accessor -> { $accessor.tree.unshift( $tree )  } )*
+    ( accessor -> { prepend_tree( $accessor.tree, $tree )  } )*
   ;
 
 arguments
-  : '('  ')' -> ^( ARGUMENTS )
-  | '('  expression  ( ',' expression  )* ')'
-    -> ^( ARGUMENTS expression+ )
+  : '('  ( expression  ( ',' expression  )* )? ')' -> ^( ARGUMENTS expression* )
+  ;
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Functions / Blocks
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
+function
+  : 'function'^ variable_name? function_parameters statement_block
+  ;
+  
+function_parameters
+  : '(' parameters? ')' -> ^( PARAMS parameters? )
+  ;
+
+parameters
+  : variable_name (  ','  variable_name )* -> variable_name+
   ;
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Literals
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
 primary
   : 'this'^
-  | variable_name^
   | 'null'^
   | 'true'^
   | 'false'^
   | 'undefined'^
+  | variable_name^
   | NUMBER^
   | STRING^
   | REGEX^
@@ -498,31 +552,16 @@ primary
   | '('!  expression_list  ')'!
   ;
 
-function
-	: 'function'^  ( ID  )? formal_parameter_list  block
-	;
-  
-formal_parameter_list
-  : '(' (  ID (  ','  ID )* )?  ')'
-    -> ^( PARAMS ID* )
-  ;
-
-literal
-  : 'null'^  | 'true'^  | 'false'^  | NUMBER^  | STRING^  | REGEX^
-  ;
-
-
 array_literal
-  : '['  ']'  -> ^( ARRAY )
-  | '[' expression ( ',' expression?  )* ']' -> ^( ARRAY expression+ )
+  : '[' ']' -> ^( ARRAY )
+  | '[' list_item ( ',' list_item )* ']' -> ^( ARRAY list_item* )
   ;
   
-list_element
-  : ( ',' )=> -> ^( UNDEFINED )
+list_item
+  : ( ',' )=>  -> ^( UNDEFINED )
   | expression -> expression
   ;
   
-
 object_literal
   : '{'  '}' -> ^( OBJECT )
   | '{'  property_definition (  ','  property_definition )* '}'
@@ -530,173 +569,75 @@ object_literal
   ;
 
 property_definition
-  : 'get'^ ID formal_parameter_list block
-	| 'set'^ ID formal_parameter_list block
-	| property_name  ':'^   expression
+  : 'get'^ ID function_parameters block
+  | 'set'^ ID function_parameters block
+  | property_name ':'^ expression
   ;
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+// Names and Words
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
+
 property_name
   : ID
-	| reserved { $reserved.tree.token.type = ID }
-	| STRING
+  | STRING
   | NUMBER
-  ;
-
-statement_end
-  : ';'
-  | ( '}' )=>
-  | EOF
+  | reserved { $reserved.tree.token.type = ID }
   ;
 
 variable_name
   : ID
-	| t=pseudokeyword { $t.tree.token.type = ID }
-	;
+  | t=pseudokeyword { $t.tree.token.type = ID }
+  ;
 
 pseudokeyword
-  : 'abstract'
-  | 'as'
-  | 'boolean'
-  | 'byte'
-  | 'char'
-  | 'class'
-  | 'debugger'
-  | 'double'
-	| 'each'
-  | 'enum'
-  | 'export'
-  | 'extends'
-  | 'final'
-  | 'float'
-	| 'get'
-	| 'set'
-  | 'goto'
-  | 'implements'
-  | 'import'
-  | 'int'
-  | 'interface'
-  | 'is'
-  | 'long'
-  | 'namespace'
-  | 'native'
-  | 'package'
-  | 'private'
-  | 'protected'
-  | 'public'
-  | 'short'
-  | 'static'
-  | 'super'
-  | 'synchronized'
-  | 'throws'
-  | 'transient'
-  | 'use'
-  | 'volatile'
+  : 'each'
+  | 'get'
+  | 'set'
   ;
 
 reserved
-  : 'abstract'
-  | 'as'
-  | 'boolean'
-  | 'break'
-  | 'byte'
-  | 'case'
-  | 'catch'
-  | 'char'
-  | 'class'
-  | 'const'
-  | 'continue'
-  | 'debugger'
-  | 'default'
-  | 'delete'
-  | 'do'
-  | 'double'
-  | 'each'
-  | 'else'
-  | 'enum'
-  | 'export'
-  | 'extends'
-  | 'false'
-  | 'final'
-  | 'finally'
-  | 'float'
-  | 'for'
-  | 'function'
-  | 'get'
-  | 'goto'
-  | 'if'
-  | 'implements'
-  | 'import'
-  | 'in'
-  | 'instanceof'
-  | 'int'
-  | 'interface'
-  | 'is'
-  | 'let'
-  | 'long'
-  | 'namespace'
-  | 'native'
-  | 'new'
-  | 'null'
-  | 'package'
-  | 'private'
-  | 'protected'
-  | 'public'
-  | 'return'
-  | 'set'
-  | 'short'
-  | 'static'
-  | 'super'
-  | 'switch'
-  | 'synchronized'
-  | 'this'
-  | 'throw'
-  | 'throws'
-  | 'transient'
-  | 'true'
-  | 'try'
-  | 'typeof'
-  | 'undefined'
-  | 'use'
-  | 'var'
-  | 'void'
-  | 'volatile'
-  | 'while'
-  | 'with'
-  | 'yield'
+  : 'break'    | 'do'      | 'function'   | 'new'    | 'throw'     | 'until'
+  | 'case'     | 'each'    | 'get'        | 'null'   | 'true'      | 'var'  
+  | 'catch'    | 'else'    | 'if'         | 'return' | 'try'       | 'void' 
+  | 'continue' | 'false'   | 'in'         | 'set'    | 'typeof'    | 'while'
+  | 'default'  | 'finally' | 'instanceof' | 'switch' | 'undefined' | 'with' 
+  | 'delete'   | 'for'     | 'let'        | 'this'   | 'unless'    | 'yield'
   ;
-  
+
 /********************************************************************************
  ***********************************  Lexer  ************************************
  ********************************************************************************/
 
 SLASH
-  : '//' ~( '\n' | '\r' | '\u2028' | '\u2029' )* { skip }
-  | '/*' .* '*/' { skip }
-  | { @regex_possible  }?=> '/' ( ~( '/' | '*' | '\\' | '\r' | '\n' ) | '\\' . ) ( ~( '/' | '\\' | '\n' | '\r' ) | '\\' . )* '/' ( 'a'..'z' )* { $type = REGEX }
-  | { !@regex_possible }?=> '/' ( '=' { $type = SLASH_ASGN } | { $type = SLASH } )
+  : '//' ~( '\n' | '\r' )* { $type = LINE_COMMENT; $channel = HIDDEN }
+  | '/*' .* '*/' { $type = COMMENT; $channel = HIDDEN }
+  | { @value_expected  }?=> '/' ( ~( '/' | '*' | '\\' | '\r' | '\n' ) | '\\' . ) ( ~( '/' | '\\' | '\n' | '\r' ) | '\\' . )* '/' ( 'a'..'z' )* { $type = REGEX }
+  | { !@value_expected }?=> '/' ( '=' { $type = SLASH_ASGN } | { $type = SLASH } )
   ;
 
 STRING
-	: '"'  ( ~( '"'  | '\\' | '\n' | '\r' ) | '\\' . )* '"'
-	| '\'' ( ~( '\'' | '\\' | '\n' | '\r' ) | '\\' . )* '\''
-	;
+  : '\'' ( ~( '\'' | '\\' ) | '\\' . )* '\''
+  | '"'  ( ~( '"'  | '\\' ) | '\\' . )* '"'
+  ;
 
 NUMBER
-	: ('0'..'9')+ '.' ('0'..'9')* ( ('e' | 'E') ('+' | '-')? ('0'..'9')+ )?
-	| '.'? ('0'..'9')+ ( ('e' | 'E') ('+' | '-')? ('0'..'9')+ )?
-	| '0' ('x' | 'X') ( '0'..'9' | 'a'..'f' | 'A'..'F' )+
-	;
+  : ('0'..'9')+ '.' ('0'..'9')* ( ('e' | 'E') ('+' | '-')? ('0'..'9')+ )?
+  | '.'? ('0'..'9')+ ( ('e' | 'E') ('+' | '-')? ('0'..'9')+ )?
+  | '0' ('x' | 'X') ( '0'..'9' | 'a'..'f' | 'A'..'F' )+
+  ;
 
 NEWLINE
-  : ( '\n' | '\r' )+
-    { $channel = HIDDEN }
-	;
+  : ( '\n' | '\r' )+ { $channel = HIDDEN }
+  ;
 
 ID
-	: ( '$' | '_' | 'a'..'z' | 'A'..'Z' )
+  : ( '$' | '_' | 'a'..'z' | 'A'..'Z' )
     ( 'a'..'z' | 'A'..'Z' | '0'..'9' | '_' | '$' )*
-	;
+  ;
 
 WS // Tab, vertical tab, form feed, space, non-breaking space and any other unicode "space separator".
-	: ( '\t' | '\f' | ' ' | '\u00A0' )+	{ $channel = HIDDEN }
-	;
+  : ( '\t' | '\f' | ' ' | '\u00A0' )+  { $channel = HIDDEN }
+  ;
+
+

data/templates/Ruby.stg

@@ -1459,4 +1459,4 @@ placeAction(scope, name) ::= <<
 <endif>
 >>
 
-runtimeLibraryVersion() ::= "1.8.2"
+runtimeLibraryVersion() ::= "1.8.5"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: antlr3
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 61
   prerelease: false
   segments: 
   - 1
   - 8
-  - 2
-  version: 1.8.2
+  - 5
+  version: 1.8.5
 platform: ruby
 authors: 
 - Kyle Yetter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-02 00:00:00 -04:00
+date: 2010-10-22 00:00:00 -04:00
 default_executable: 
 dependencies: []