[Xdoclet-devel] CVS update: xjavadoc/javacc Java1.2-b.jjt

[Aslak Helles?y]

  User: rinkrank
  Date: 02/06/07 07:51:25

  Modified:    javacc   Java1.2-b.jjt
  Log:
  Migrated to Jakarta commons logging
  Removed dead code from grammar
  Minor changes I don't remember
  JUnit is working again 100%
  
  Revision  Changes    Path
  1.24      +22 -21    xjavadoc/javacc/Java1.2-b.jjt
  
  Index: Java1.2-b.jjt
  ===================================================================
  RCS file: /cvsroot/xdoclet/xjavadoc/javacc/Java1.2-b.jjt,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -w -r1.23 -r1.24
  --- Java1.2-b.jjt     26 May 2002 20:31:05 -0000      1.23
  +++ Java1.2-b.jjt     7 Jun 2002 14:51:25 -0000       1.24
  @@ -382,7 +382,7 @@
   {
     [ PackageDeclaration(sourceClass) ]
     ( ImportDeclaration(sourceClass) )*
  -  ( TypeDeclaration(sourceClass,true) )*
  +  ( TypeDeclaration(sourceClass) )*
     <EOF>
     {
         // sourceClass must know about ASTCompilationUnit
  @@ -432,13 +432,13 @@
     }
   }
   
  -void TypeDeclaration(SourceClass sourceClass, boolean halt) :
  +void TypeDeclaration(SourceClass sourceClass) :
   {}
   {
     LOOKAHEAD( ( "abstract" | "final" | "public" | "strictfp" )* "class" )
  -  ClassDeclaration(sourceClass, halt)
  +  ClassDeclaration(sourceClass)
   |
  -  InterfaceDeclaration(sourceClass, halt)
  +  InterfaceDeclaration(sourceClass)
   |
     ";"
   }
  @@ -453,7 +453,7 @@
   attached to the first modifier token (if there are any modifiers)
   or to the first token in UnmodifiedClassDeclaration
   */
  -void ClassDeclaration(SourceClass sourceClass, boolean halt) :
  +void ClassDeclaration(SourceClass sourceClass) :
   {
      Token t = null;
   }
  @@ -476,10 +476,10 @@
          sourceClass.addModifier( Modifier.STRICT );
       }
     )*
  -  UnmodifiedClassDeclaration(sourceClass, halt)
  +  UnmodifiedClassDeclaration(sourceClass)
   }
   
  -void UnmodifiedClassDeclaration(SourceClass sourceClass, boolean halt) :
  +void UnmodifiedClassDeclaration(SourceClass sourceClass) :
   {
      Token ct;
      Token name = null;
  @@ -508,10 +508,10 @@
                        }
                }
      }
  -   ClassBody(sourceClass, halt)
  +   ClassBody(sourceClass)
   }
   
  -void ClassBody(SourceClass sourceClass, boolean halt) :
  +void ClassBody(SourceClass sourceClass) :
   {
      //notifyAndWait(sourceClass);
   }
  @@ -554,7 +554,7 @@
          sourceClass.setToken( t );
       }
     )*
  -  UnmodifiedClassDeclaration(sourceClass, false)
  +  UnmodifiedClassDeclaration(sourceClass)
   }
   
   void ClassBodyDeclaration(SourceClass sourceClass) :
  @@ -600,7 +600,7 @@
     ResultType(null) <IDENTIFIER> "("
   }
   
  -void InterfaceDeclaration(SourceClass sourceClass, boolean halt) :
  +void InterfaceDeclaration(SourceClass sourceClass) :
   {
      Token t = null;
   }
  @@ -620,17 +620,17 @@
       }
     )*
   
  -  UnmodifiedInterfaceDeclaration(sourceClass, halt)
  +  UnmodifiedInterfaceDeclaration(sourceClass)
   }
   
   void NestedInterfaceDeclaration(SourceClass sourceClass) :
   {}
   {
     ( "static" | "abstract" | "final" | "public" | "protected" | "private" | 
"strictfp")*
  -  UnmodifiedInterfaceDeclaration(sourceClass, false)
  +  UnmodifiedInterfaceDeclaration(sourceClass)
   }
   
  -void UnmodifiedInterfaceDeclaration(SourceClass sourceClass,boolean halt) :
  +void UnmodifiedInterfaceDeclaration(SourceClass sourceClass) :
   {
      Token it;
      Token t = null;
  @@ -1439,11 +1439,12 @@
         Arguments()
         [
         {
  -         SourceClass anonymousClass = new SourceClass(null, null, null);
  +           SourceClass anonymousClass = new SourceClass(null, "ANONYMOUS DUMMY", 
null);
         }
  -      ClassBody(anonymousClass, false)
  +      ClassBody(anonymousClass)
         {
  -         XJavaDoc.getInstance().addSourceClass(anonymousClass);
  +//         Don't care about anonymous classes. They don't have javadocs
  +//         XJavaDoc.getInstance().addSourceClass(anonymousClass);
         }
         ]
       )
  @@ -1532,9 +1533,9 @@
   |
     Statement()
   |
  -  UnmodifiedClassDeclaration(null, false)
  +  UnmodifiedClassDeclaration(null)
   |
  -  UnmodifiedInterfaceDeclaration(null, false)
  +  UnmodifiedInterfaceDeclaration(null)
   }
   
   void Method_BlockStatement(SourceClass sourceClass) :
  @@ -1551,7 +1552,7 @@
        innerClass = new SourceClass(sourceClass, null, null);
        sourceClass.addInnerClass( innerClass );
     }
  -  UnmodifiedClassDeclaration(innerClass,false)
  +  UnmodifiedClassDeclaration(innerClass)
     {
        XJavaDoc.getInstance().addSourceClass(innerClass);
     }
  @@ -1560,7 +1561,7 @@
        innerClass = new SourceClass(sourceClass, null, null);
        sourceClass.addInnerClass( innerClass );
     }
  -  UnmodifiedInterfaceDeclaration(innerClass,false)
  +  UnmodifiedInterfaceDeclaration(innerClass)
     {
        XJavaDoc.getInstance().addSourceClass(innerClass);
     }
  
  
  

_______________________________________________________________

Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm

_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel