Author: bernhard
Date: Tue Feb 26 13:26:24 2008
New Revision: 26076

Modified:
   trunk/languages/plumhead/src/antlr3/GenPastPir.g
   trunk/languages/plumhead/src/antlr3/GenPastPir.java
   trunk/languages/plumhead/src/antlr3/PlumheadLexer.java
   trunk/languages/plumhead/src/antlr3/PlumheadParser.java

Log:
[Plumhead]
Slight beautification of GenPastPir.g
Regenerate Java code with antlr


Modified: trunk/languages/plumhead/src/antlr3/GenPastPir.g
==============================================================================
--- trunk/languages/plumhead/src/antlr3/GenPastPir.g    (original)
+++ trunk/languages/plumhead/src/antlr3/GenPastPir.g    Tue Feb 26 13:26:24 2008
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2007, The Perl Foundation.
+// Copyright (C) 2006-2008, The Perl Foundation.
 // $Id$
 
 // Transform ANTLR PAST to PIR that sets up a PAST data structure
@@ -28,53 +28,55 @@
 gen_pir_past 
   : {
       System.out.println( 
-          "#!/usr/bin/env parrot                                             
\n"
-        + "                                                                  
\n"
-        + "# Do not edit this file.                                          
\n"
-        + "# This file has been generated by GenPastPir.xsl                  
\n"
-        + "                                                                  
\n"
-        + ".sub 'php_init' :load :init                                       
\n"
-        + "                                                                  
\n"
-        + "  load_bytecode 'PGE.pbc'                                         
\n"
-        + "  load_bytecode 'PGE/Text.pbc'                                    
\n"
-        + "  load_bytecode 'PGE/Util.pbc'                                    
\n"
-        + "  load_bytecode 'PGE/Dumper.pbc'                                  
\n"
-        + "  load_bytecode 'PCT.pbc'                                         
\n"
-        + "  load_bytecode 'languages/plumhead/src/common/plumheadlib.pbc'   
\n"
-        + "  load_bytecode 'MIME/Base64.pbc'                                 
\n"
-        + "  load_bytecode 'dumper.pbc'                                      
\n"
-        + "  load_bytecode 'CGI/QueryHash.pbc'                               
\n"
-        + "                                                                  
\n"
-        + ".end                                                              
\n"
-        + "                                                                  
\n"
-        + ".sub plumhead :main                                               
\n"
-        + "                                                                  
\n"
-        + "    # look for subs in other namespaces                           
\n"
-        + "    .local pmc parse_get_sub, parse_post_sub   \n"
-        + "    parse_get_sub  = get_global [ 'CGI'; 'QueryHash' ], 'parse_get' 
        \n"
-        + "    parse_post_sub = get_global [ 'CGI'; 'QueryHash' ], 
'parse_post'        \n"
-        + "                                                                  
\n"
-        + "    # the superglobals                                            
\n"
-        + "    .local pmc superglobal_GET                                    
\n"
-        + "    ( superglobal_GET ) = parse_get_sub()                         
\n"
-        + "    set_global '\$_GET', superglobal_GET                            
\n"
-        + "                                                                  
\n"
-        + "    .local pmc superglobal_POST                                   
\n"
-        + "    ( superglobal_POST ) = parse_post_sub()                       
\n"
-        + "    set_global '\$_POST', superglobal_POST                          
\n"
-        + "                                                                  
\n"
-        + "    # The root node of PAST.                                      
\n"
-        + "    .local pmc past_root                                          
\n"
-        + "    past_root  = new 'PAST::Block'                                
\n"
-        + "    past_root.init('name' => 'plumhead_main')                     
\n"
-        + "                                                                  
\n"
-        + "    .local pmc past_stmts                                         
\n"
-        + "    past_stmts = new 'PAST::Stmts'                                
\n"
-        + "                                                                  
\n"
-        + "    .local pmc past_temp                                          
\n"
-        + "    .local pmc past_name                                          
\n"
-        + "    .local pmc past_if_op                                         
\n"
-        + "                                                                  
\n"
+          "#!/usr/bin/env parrot                                               
   \n"
+        + "                                                                    
   \n"
+        + "# Do not edit this file.                                            
   \n"
+        + "# This file has been generated by GenPastPir.g                      
   \n"
+        + "                                                                    
   \n"
+        + ".sub 'php_init' :load :init                                         
   \n"
+        + "                                                                    
   \n"
+        + "    load_bytecode 'PGE.pbc'                                         
   \n"
+        + "    load_bytecode 'PGE/Text.pbc'                                    
   \n"
+        + "    load_bytecode 'PGE/Util.pbc'                                    
   \n"
+        + "    load_bytecode 'PGE/Dumper.pbc'                                  
   \n"
+        + "    load_bytecode 'PCT.pbc'                                         
   \n"
+        + "    load_bytecode 'languages/plumhead/src/common/plumheadlib.pbc'   
   \n"
+        + "    load_bytecode 'MIME/Base64.pbc'                                 
   \n"
+        + "    load_bytecode 'dumper.pbc'                                      
   \n"
+        + "    load_bytecode 'CGI/QueryHash.pbc'                               
   \n"
+        + "                                                                    
   \n"
+        + ".end                                                                
   \n"
+        + "                                                                    
   \n"
+        + "                                                                    
   \n"
+        + ".sub plumhead :main                                                 
   \n"
+        + "                                                                    
   \n"
+        + "    # look for subs in other namespaces                             
   \n"
+        + "    .local pmc decode_base64_sub, parse_get_sub, parse_post_sub     
   \n"
+        + "    decode_base64_sub = get_global [ "MIME"; "Base64" ], 
'decode_base64'  \n"
+        + "    parse_get_sub  = get_global [ 'CGI'; 'QueryHash' ], 'parse_get' 
   \n"
+        + "    parse_post_sub = get_global [ 'CGI'; 'QueryHash' ], 
'parse_post'   \n"
+        + "                                                                    
   \n"
+        + "    # the superglobals                                              
   \n"
+        + "    .local pmc superglobal_GET                                      
   \n"
+        + "    ( superglobal_GET ) = parse_get_sub()                           
   \n"
+        + "    set_global "_GET", superglobal_GET                              
   \n"
+        + "                                                                    
   \n"
+        + "    .local pmc superglobal_POST                                     
   \n"
+        + "    ( superglobal_POST ) = parse_post_sub()                         
   \n"
+        + "    set_global "_POST", superglobal_POST                            
   \n"
+        + "                                                                    
   \n"
+        + "    # The root node of PAST.                                        
   \n"
+        + "    .local pmc past_root                                            
   \n"
+        + "    past_root  = new 'PAST::Block'                                  
   \n"
+        + "    past_root.init('name' => 'plumhead_main')                       
   \n"
+        + "                                                                    
   \n"
+        + "    .local pmc past_stmts                                           
   \n"
+        + "    past_stmts = new 'PAST::Stmts'                                  
   \n"
+        + "                                                                    
   \n"
+        + "    .local pmc past_temp                                            
   \n"
+        + "    .local pmc past_name                                            
   \n"
+        + "    .local pmc past_if_op                                           
   \n"
+        + "                                                                    
   \n"
       );
     }
     ^( PROGRAM node["past_stmts"]* )
@@ -82,19 +84,7 @@
       System.out.println( 
           "                                                                  
\n"
         + "                                                                  
\n"
-        + "  past_root.'push'( past_stmts )                                  
\n"
-        + "                                                                  
\n"
-        + "    #'_dumper'(past_root, 'past')                                \n"
-        + "    # '_dumper'(superglobal_POST , 'superglobal_POST')            
\n"
-        + "    # '_dumper'(superglobal_GET , 'superglobal_GET')              
\n"
-        + "                                                                  
\n"
-        + "    # .local pmc post                                             
\n"
-        + "    # post = past_root.'compile'( 'target' => 'post' )            
\n"
-        + "    # '_dumper'(post, 'post')                                     
\n"
-        + "                                                                  
\n"
-        + "    # .local pmc pir                                              
\n"
-        + "    # pir = past_root.'compile'( 'target' => 'pir' )              
\n"
-        + "    # print pir                                                   
\n"
+        + "    past_root.'push'( past_stmts )                                
\n"
         + "                                                                  
\n"
         + "    .local pmc past_compiler                                      
\n"
         + "    past_compiler = new [ 'PCT::HLLCompiler' ]                    
\n"

Modified: trunk/languages/plumhead/src/antlr3/GenPastPir.java
==============================================================================
--- trunk/languages/plumhead/src/antlr3/GenPastPir.java (original)
+++ trunk/languages/plumhead/src/antlr3/GenPastPir.java Tue Feb 26 13:26:24 2008
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/antlr3/GenPastPir.g 2008-02-26 20:49:08
+// $ANTLR 3.0.1 src/antlr3/GenPastPir.g 2008-02-26 22:21:13
 
   import java.util.regex.*;
 
@@ -67,60 +67,62 @@
             {
 
                   System.out.println( 
-                      "#!/usr/bin/env parrot                                   
          \n"
-                    + "                                                        
          \n"
-                    + "# Do not edit this file.                                
          \n"
-                    + "# This file has been generated by GenPastPir.xsl        
          \n"
-                    + "                                                        
          \n"
-                    + ".sub 'php_init' :load :init                             
          \n"
-                    + "                                                        
          \n"
-                    + "  load_bytecode 'PGE.pbc'                               
          \n"
-                    + "  load_bytecode 'PGE/Text.pbc'                          
          \n"
-                    + "  load_bytecode 'PGE/Util.pbc'                          
          \n"
-                    + "  load_bytecode 'PGE/Dumper.pbc'                        
          \n"
-                    + "  load_bytecode 'PCT.pbc'                               
          \n"
-                    + "  load_bytecode 
'languages/plumhead/src/common/plumheadlib.pbc'   \n"
-                    + "  load_bytecode 'MIME/Base64.pbc'                       
          \n"
-                    + "  load_bytecode 'dumper.pbc'                            
          \n"
-                    + "  load_bytecode 'CGI/QueryHash.pbc'                     
          \n"
-                    + "                                                        
          \n"
-                    + ".end                                                    
          \n"
-                    + "                                                        
          \n"
-                    + ".sub plumhead :main                                     
          \n"
-                    + "                                                        
          \n"
-                    + "    # look for subs in other namespaces                 
          \n"
-                    + "    .local pmc parse_get_sub, parse_post_sub   \n"
-                    + "    parse_get_sub  = get_global [ 'CGI'; 'QueryHash' ], 
'parse_get'         \n"
-                    + "    parse_post_sub = get_global [ 'CGI'; 'QueryHash' ], 
'parse_post'        \n"
-                    + "                                                        
          \n"
-                    + "    # the superglobals                                  
          \n"
-                    + "    .local pmc superglobal_GET                          
          \n"
-                    + "    ( superglobal_GET ) = parse_get_sub()               
          \n"
-                    + "    set_global '$_GET', superglobal_GET                 
           \n"
-                    + "                                                        
          \n"
-                    + "    .local pmc superglobal_POST                         
          \n"
-                    + "    ( superglobal_POST ) = parse_post_sub()             
          \n"
-                    + "    set_global '$_POST', superglobal_POST               
           \n"
-                    + "                                                        
          \n"
-                    + "    # The root node of PAST.                            
          \n"
-                    + "    .local pmc past_root                                
          \n"
-                    + "    past_root  = new 'PAST::Block'                      
          \n"
-                    + "    past_root.init('name' => 'plumhead_main')           
          \n"
-                    + "                                                        
          \n"
-                    + "    .local pmc past_stmts                               
          \n"
-                    + "    past_stmts = new 'PAST::Stmts'                      
          \n"
-                    + "                                                        
          \n"
-                    + "    .local pmc past_temp                                
          \n"
-                    + "    .local pmc past_name                                
          \n"
-                    + "    .local pmc past_if_op                               
          \n"
-                    + "                                                        
          \n"
+                      "#!/usr/bin/env parrot                                   
               \n"
+                    + "                                                        
               \n"
+                    + "# Do not edit this file.                                
               \n"
+                    + "# This file has been generated by GenPastPir.g          
               \n"
+                    + "                                                        
               \n"
+                    + ".sub 'php_init' :load :init                             
               \n"
+                    + "                                                        
               \n"
+                    + "    load_bytecode 'PGE.pbc'                             
               \n"
+                    + "    load_bytecode 'PGE/Text.pbc'                        
               \n"
+                    + "    load_bytecode 'PGE/Util.pbc'                        
               \n"
+                    + "    load_bytecode 'PGE/Dumper.pbc'                      
               \n"
+                    + "    load_bytecode 'PCT.pbc'                             
               \n"
+                    + "    load_bytecode 
'languages/plumhead/src/common/plumheadlib.pbc'      \n"
+                    + "    load_bytecode 'MIME/Base64.pbc'                     
               \n"
+                    + "    load_bytecode 'dumper.pbc'                          
               \n"
+                    + "    load_bytecode 'CGI/QueryHash.pbc'                   
               \n"
+                    + "                                                        
               \n"
+                    + ".end                                                    
               \n"
+                    + "                                                        
               \n"
+                    + "                                                        
               \n"
+                    + ".sub plumhead :main                                     
               \n"
+                    + "                                                        
               \n"
+                    + "    # look for subs in other namespaces                 
               \n"
+                    + "    .local pmc decode_base64_sub, parse_get_sub, 
parse_post_sub        \n"
+                    + "    decode_base64_sub = get_global [ "MIME"; "Base64" 
], 'decode_base64'  \n"
+                    + "    parse_get_sub  = get_global [ 'CGI'; 'QueryHash' ], 
'parse_get'    \n"
+                    + "    parse_post_sub = get_global [ 'CGI'; 'QueryHash' ], 
'parse_post'   \n"
+                    + "                                                        
               \n"
+                    + "    # the superglobals                                  
               \n"
+                    + "    .local pmc superglobal_GET                          
               \n"
+                    + "    ( superglobal_GET ) = parse_get_sub()               
               \n"
+                    + "    set_global "_GET", superglobal_GET                  
               \n"
+                    + "                                                        
               \n"
+                    + "    .local pmc superglobal_POST                         
               \n"
+                    + "    ( superglobal_POST ) = parse_post_sub()             
               \n"
+                    + "    set_global "_POST", superglobal_POST                
               \n"
+                    + "                                                        
               \n"
+                    + "    # The root node of PAST.                            
               \n"
+                    + "    .local pmc past_root                                
               \n"
+                    + "    past_root  = new 'PAST::Block'                      
               \n"
+                    + "    past_root.init('name' => 'plumhead_main')           
               \n"
+                    + "                                                        
               \n"
+                    + "    .local pmc past_stmts                               
               \n"
+                    + "    past_stmts = new 'PAST::Stmts'                      
               \n"
+                    + "                                                        
               \n"
+                    + "    .local pmc past_temp                                
               \n"
+                    + "    .local pmc past_name                                
               \n"
+                    + "    .local pmc past_if_op                               
               \n"
+                    + "                                                        
               \n"
                   );
                 
             match(input,PROGRAM,FOLLOW_PROGRAM_in_gen_pir_past75); 
 
             if ( input.LA(1)==Token.DOWN ) {
                 match(input, Token.DOWN, null); 
-                // src/antlr3/GenPastPir.g:80:16: ( node[\"past_stmts\"] )*
+                // src/antlr3/GenPastPir.g:82:16: ( node[\"past_stmts\"] )*
                 loop1:
                 do {
                     int alt1=2;
@@ -133,7 +135,7 @@
 
                     switch (alt1) {
                        case 1 :
-                           // src/antlr3/GenPastPir.g:80:16: 
node[\"past_stmts\"]
+                           // src/antlr3/GenPastPir.g:82:16: 
node[\"past_stmts\"]
                            {
                            pushFollow(FOLLOW_node_in_gen_pir_past77);
                            node("past_stmts");
@@ -155,19 +157,7 @@
                   System.out.println( 
                       "                                                        
          \n"
                     + "                                                        
          \n"
-                    + "  past_root.'push'( past_stmts )                        
          \n"
-                    + "                                                        
          \n"
-                    + "    #'_dumper'(past_root, 'past')                       
         \n"
-                    + "    # '_dumper'(superglobal_POST , 'superglobal_POST')  
          \n"
-                    + "    # '_dumper'(superglobal_GET , 'superglobal_GET')    
          \n"
-                    + "                                                        
          \n"
-                    + "    # .local pmc post                                   
          \n"
-                    + "    # post = past_root.'compile'( 'target' => 'post' )  
          \n"
-                    + "    # '_dumper'(post, 'post')                           
          \n"
-                    + "                                                        
          \n"
-                    + "    # .local pmc pir                                    
          \n"
-                    + "    # pir = past_root.'compile'( 'target' => 'pir' )    
          \n"
-                    + "    # print pir                                         
          \n"
+                    + "    past_root.'push'( past_stmts )                      
          \n"
                     + "                                                        
          \n"
                     + "    .local pmc past_compiler                            
          \n"
                     + "    past_compiler = new [ 'PCT::HLLCompiler' ]          
          \n"
@@ -195,7 +185,7 @@
 
 
     // $ANTLR start node
-    // src/antlr3/GenPastPir.g:111:1: node[String reg_mother] : ( ^( ECHO 
node[\"past_echo\"] ) | ^( VAR_DUMP node[\"past_var_dump\"] ) | NOQUOTE_STRING 
| SINGLEQUOTE_STRING | DOUBLEQUOTE_STRING | NUMBER | INTEGER | ^(infix= ( PLUS 
| MINUS | MUL_OP | BITWISE_OP ) node[reg] node[reg] ) | ^(prefix= PREFIX 
node[reg] ) | ^( REL_OP node[reg] node[reg] ) | ^( IF node[\"past_if_op\"] 
node[\"past_if_op\"] ( node[\"past_if_op\"] )? ) | ^( STMTS ( node[reg_stmts] 
)* ) | ^( ASSIGN_OP node[reg_assign] node[reg_assign] ) | SCALAR | ^( ARRAY 
node[reg_array] ) );
+    // src/antlr3/GenPastPir.g:101:1: node[String reg_mother] : ( ^( ECHO 
node[\"past_echo\"] ) | ^( VAR_DUMP node[\"past_var_dump\"] ) | NOQUOTE_STRING 
| SINGLEQUOTE_STRING | DOUBLEQUOTE_STRING | NUMBER | INTEGER | ^(infix= ( PLUS 
| MINUS | MUL_OP | BITWISE_OP ) node[reg] node[reg] ) | ^(prefix= PREFIX 
node[reg] ) | ^( REL_OP node[reg] node[reg] ) | ^( IF node[\"past_if_op\"] 
node[\"past_if_op\"] ( node[\"past_if_op\"] )? ) | ^( STMTS ( node[reg_stmts] 
)* ) | ^( ASSIGN_OP node[reg_assign] node[reg_assign] ) | SCALAR | ^( ARRAY 
node[reg_array] ) );
     public final void node(String reg_mother) throws RecognitionException {
         CommonTree infix=null;
         CommonTree prefix=null;
@@ -209,7 +199,7 @@
         CommonTree ARRAY8=null;
 
         try {
-            // src/antlr3/GenPastPir.g:112:3: ( ^( ECHO node[\"past_echo\"] ) 
| ^( VAR_DUMP node[\"past_var_dump\"] ) | NOQUOTE_STRING | SINGLEQUOTE_STRING | 
DOUBLEQUOTE_STRING | NUMBER | INTEGER | ^(infix= ( PLUS | MINUS | MUL_OP | 
BITWISE_OP ) node[reg] node[reg] ) | ^(prefix= PREFIX node[reg] ) | ^( REL_OP 
node[reg] node[reg] ) | ^( IF node[\"past_if_op\"] node[\"past_if_op\"] ( 
node[\"past_if_op\"] )? ) | ^( STMTS ( node[reg_stmts] )* ) | ^( ASSIGN_OP 
node[reg_assign] node[reg_assign] ) | SCALAR | ^( ARRAY node[reg_array] ) )
+            // src/antlr3/GenPastPir.g:102:3: ( ^( ECHO node[\"past_echo\"] ) 
| ^( VAR_DUMP node[\"past_var_dump\"] ) | NOQUOTE_STRING | SINGLEQUOTE_STRING | 
DOUBLEQUOTE_STRING | NUMBER | INTEGER | ^(infix= ( PLUS | MINUS | MUL_OP | 
BITWISE_OP ) node[reg] node[reg] ) | ^(prefix= PREFIX node[reg] ) | ^( REL_OP 
node[reg] node[reg] ) | ^( IF node[\"past_if_op\"] node[\"past_if_op\"] ( 
node[\"past_if_op\"] )? ) | ^( STMTS ( node[reg_stmts] )* ) | ^( ASSIGN_OP 
node[reg_assign] node[reg_assign] ) | SCALAR | ^( ARRAY node[reg_array] ) )
             int alt4=15;
             switch ( input.LA(1) ) {
             case ECHO:
@@ -292,14 +282,14 @@
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("111:1: node[String reg_mother] : 
( ^( ECHO node[\"past_echo\"] ) | ^( VAR_DUMP node[\"past_var_dump\"] ) | 
NOQUOTE_STRING | SINGLEQUOTE_STRING | DOUBLEQUOTE_STRING | NUMBER | INTEGER | 
^(infix= ( PLUS | MINUS | MUL_OP | BITWISE_OP ) node[reg] node[reg] ) | 
^(prefix= PREFIX node[reg] ) | ^( REL_OP node[reg] node[reg] ) | ^( IF 
node[\"past_if_op\"] node[\"past_if_op\"] ( node[\"past_if_op\"] )? ) | ^( 
STMTS ( node[reg_stmts] )* ) | ^( ASSIGN_OP node[reg_assign] node[reg_assign] ) 
| SCALAR | ^( ARRAY node[reg_array] ) );", 4, 0, input);
+                    new NoViableAltException("101:1: node[String reg_mother] : 
( ^( ECHO node[\"past_echo\"] ) | ^( VAR_DUMP node[\"past_var_dump\"] ) | 
NOQUOTE_STRING | SINGLEQUOTE_STRING | DOUBLEQUOTE_STRING | NUMBER | INTEGER | 
^(infix= ( PLUS | MINUS | MUL_OP | BITWISE_OP ) node[reg] node[reg] ) | 
^(prefix= PREFIX node[reg] ) | ^( REL_OP node[reg] node[reg] ) | ^( IF 
node[\"past_if_op\"] node[\"past_if_op\"] ( node[\"past_if_op\"] )? ) | ^( 
STMTS ( node[reg_stmts] )* ) | ^( ASSIGN_OP node[reg_assign] node[reg_assign] ) 
| SCALAR | ^( ARRAY node[reg_array] ) );", 4, 0, input);
 
                 throw nvae;
             }
 
             switch (alt4) {
                 case 1 :
-                    // src/antlr3/GenPastPir.g:112:5: ^( ECHO 
node[\"past_echo\"] )
+                    // src/antlr3/GenPastPir.g:102:5: ^( ECHO 
node[\"past_echo\"] )
                     {
 
                           System.out.println( 
@@ -330,7 +320,7 @@
                     }
                     break;
                 case 2 :
-                    // src/antlr3/GenPastPir.g:129:5: ^( VAR_DUMP 
node[\"past_var_dump\"] )
+                    // src/antlr3/GenPastPir.g:119:5: ^( VAR_DUMP 
node[\"past_var_dump\"] )
                     {
 
                           System.out.println( 
@@ -361,7 +351,7 @@
                     }
                     break;
                 case 3 :
-                    // src/antlr3/GenPastPir.g:146:5: NOQUOTE_STRING
+                    // src/antlr3/GenPastPir.g:136:5: NOQUOTE_STRING
                     {
                     NOQUOTE_STRING1=(CommonTree)input.LT(1);
                     
match(input,NOQUOTE_STRING,FOLLOW_NOQUOTE_STRING_in_node151); 
@@ -387,7 +377,7 @@
                     }
                     break;
                 case 4 :
-                    // src/antlr3/GenPastPir.g:165:5: SINGLEQUOTE_STRING
+                    // src/antlr3/GenPastPir.g:155:5: SINGLEQUOTE_STRING
                     {
                     SINGLEQUOTE_STRING2=(CommonTree)input.LT(1);
                     
match(input,SINGLEQUOTE_STRING,FOLLOW_SINGLEQUOTE_STRING_in_node163); 
@@ -413,7 +403,7 @@
                     }
                     break;
                 case 5 :
-                    // src/antlr3/GenPastPir.g:184:5: DOUBLEQUOTE_STRING
+                    // src/antlr3/GenPastPir.g:174:5: DOUBLEQUOTE_STRING
                     {
                     DOUBLEQUOTE_STRING3=(CommonTree)input.LT(1);
                     
match(input,DOUBLEQUOTE_STRING,FOLLOW_DOUBLEQUOTE_STRING_in_node175); 
@@ -439,7 +429,7 @@
                     }
                     break;
                 case 6 :
-                    // src/antlr3/GenPastPir.g:203:5: NUMBER
+                    // src/antlr3/GenPastPir.g:193:5: NUMBER
                     {
                     NUMBER4=(CommonTree)input.LT(1);
                     match(input,NUMBER,FOLLOW_NUMBER_in_node187); 
@@ -458,7 +448,7 @@
                     }
                     break;
                 case 7 :
-                    // src/antlr3/GenPastPir.g:215:5: INTEGER
+                    // src/antlr3/GenPastPir.g:205:5: INTEGER
                     {
                     INTEGER5=(CommonTree)input.LT(1);
                     match(input,INTEGER,FOLLOW_INTEGER_in_node199); 
@@ -477,7 +467,7 @@
                     }
                     break;
                 case 8 :
-                    // src/antlr3/GenPastPir.g:227:5: ^(infix= ( PLUS | MINUS 
| MUL_OP | BITWISE_OP ) node[reg] node[reg] )
+                    // src/antlr3/GenPastPir.g:217:5: ^(infix= ( PLUS | MINUS 
| MUL_OP | BITWISE_OP ) node[reg] node[reg] )
                     {
 
                           reg_num++;
@@ -540,7 +530,7 @@
                     }
                     break;
                 case 9 :
-                    // src/antlr3/GenPastPir.g:262:5: ^(prefix= PREFIX 
node[reg] )
+                    // src/antlr3/GenPastPir.g:252:5: ^(prefix= PREFIX 
node[reg] )
                     {
 
                           reg_num++;
@@ -579,7 +569,7 @@
                     }
                     break;
                 case 10 :
-                    // src/antlr3/GenPastPir.g:286:5: ^( REL_OP node[reg] 
node[reg] )
+                    // src/antlr3/GenPastPir.g:276:5: ^( REL_OP node[reg] 
node[reg] )
                     {
 
                           reg_num++;
@@ -622,7 +612,7 @@
                     }
                     break;
                 case 11 :
-                    // src/antlr3/GenPastPir.g:310:5: ^( IF 
node[\"past_if_op\"] node[\"past_if_op\"] ( node[\"past_if_op\"] )? )
+                    // src/antlr3/GenPastPir.g:300:5: ^( IF 
node[\"past_if_op\"] node[\"past_if_op\"] ( node[\"past_if_op\"] )? )
                     {
 
                           reg_num++;
@@ -648,7 +638,7 @@
                     node("past_if_op");
                     _fsp--;
 
-                    // src/antlr3/GenPastPir.g:323:49: ( node[\"past_if_op\"] 
)?
+                    // src/antlr3/GenPastPir.g:313:49: ( node[\"past_if_op\"] 
)?
                     int alt2=2;
                     int LA2_0 = input.LA(1);
 
@@ -657,7 +647,7 @@
                     }
                     switch (alt2) {
                         case 1 :
-                            // src/antlr3/GenPastPir.g:323:49: 
node[\"past_if_op\"]
+                            // src/antlr3/GenPastPir.g:313:49: 
node[\"past_if_op\"]
                             {
                             pushFollow(FOLLOW_node_in_node328);
                             node("past_if_op");
@@ -682,7 +672,7 @@
                     }
                     break;
                 case 12 :
-                    // src/antlr3/GenPastPir.g:331:5: ^( STMTS ( 
node[reg_stmts] )* )
+                    // src/antlr3/GenPastPir.g:321:5: ^( STMTS ( 
node[reg_stmts] )* )
                     {
 
                           reg_num++;
@@ -698,7 +688,7 @@
 
                     if ( input.LA(1)==Token.DOWN ) {
                         match(input, Token.DOWN, null); 
-                        // src/antlr3/GenPastPir.g:341:14: ( node[reg_stmts] )*
+                        // src/antlr3/GenPastPir.g:331:14: ( node[reg_stmts] )*
                         loop3:
                         do {
                             int alt3=2;
@@ -711,7 +701,7 @@
 
                             switch (alt3) {
                                case 1 :
-                                   // src/antlr3/GenPastPir.g:341:14: 
node[reg_stmts]
+                                   // src/antlr3/GenPastPir.g:331:14: 
node[reg_stmts]
                                    {
                                    pushFollow(FOLLOW_node_in_node354);
                                    node(reg_stmts);
@@ -739,7 +729,7 @@
                     }
                     break;
                 case 13 :
-                    // src/antlr3/GenPastPir.g:348:5: ^( ASSIGN_OP 
node[reg_assign] node[reg_assign] )
+                    // src/antlr3/GenPastPir.g:338:5: ^( ASSIGN_OP 
node[reg_assign] node[reg_assign] )
                     {
 
                           reg_num++;
@@ -775,7 +765,7 @@
                     }
                     break;
                 case 14 :
-                    // src/antlr3/GenPastPir.g:366:5: SCALAR
+                    // src/antlr3/GenPastPir.g:356:5: SCALAR
                     {
                     SCALAR7=(CommonTree)input.LT(1);
                     match(input,SCALAR,FOLLOW_SCALAR_in_node398); 
@@ -793,7 +783,7 @@
                     }
                     break;
                 case 15 :
-                    // src/antlr3/GenPastPir.g:377:5: ^( ARRAY node[reg_array] 
)
+                    // src/antlr3/GenPastPir.g:367:5: ^( ARRAY node[reg_array] 
)
                     {
 
                           reg_num++;

Modified: trunk/languages/plumhead/src/antlr3/PlumheadLexer.java
==============================================================================
--- trunk/languages/plumhead/src/antlr3/PlumheadLexer.java      (original)
+++ trunk/languages/plumhead/src/antlr3/PlumheadLexer.java      Tue Feb 26 
13:26:24 2008
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/antlr3/Plumhead.g 2008-02-26 20:49:05
+// $ANTLR 3.0.1 src/antlr3/Plumhead.g 2008-02-26 22:21:11
 
 import org.antlr.runtime.*;
 import java.util.Stack;

Modified: trunk/languages/plumhead/src/antlr3/PlumheadParser.java
==============================================================================
--- trunk/languages/plumhead/src/antlr3/PlumheadParser.java     (original)
+++ trunk/languages/plumhead/src/antlr3/PlumheadParser.java     Tue Feb 26 
13:26:24 2008
@@ -1,4 +1,4 @@
-// $ANTLR 3.0.1 src/antlr3/Plumhead.g 2008-02-26 20:49:04
+// $ANTLR 3.0.1 src/antlr3/Plumhead.g 2008-02-26 22:21:10
 
 import org.antlr.runtime.*;
 import java.util.Stack;

Reply via email to