User: ara_e_w
Date: 02/06/26 12:44:29
Modified: javacc Java1.2-b.jjt
Log:
- class level inner classes are now correctly resolved. No ProxyClass is used, I
just changed the call order and ensured everything is lazyly calculated. anonymous
classes and method level inner classes are not resolved yet, I should change the
sourceClass to a stack (tomorrow night).
- Some mini optimizations: _namedMethods/_namedConstructors/etc lazyly created,
absolutely when nessecary (very rare usage).
Revision Changes Path
1.25 +7 -20 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.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- Java1.2-b.jjt 7 Jun 2002 14:51:25 -0000 1.24
+++ Java1.2-b.jjt 26 Jun 2002 19:44:28 -0000 1.25
@@ -495,6 +495,11 @@
name=<IDENTIFIER> {
if(sourceClass!=null) {
sourceClass.setName(name.image);
+
+ //inner classes should be added after setName(), first level
classes are added in XJavaDoc.getXClass()
+ if(sourceClass.getContainingClass()!=null) {
+ XJavaDoc.getInstance().addSourceClass(sourceClass);
+ }
}
}
[ "extends" superclass=Name() ]
@@ -569,9 +574,6 @@
sourceClass.addInnerClass( innerClass );
}
NestedClassDeclaration(innerClass)
- {
- XJavaDoc.getInstance().addSourceClass(innerClass);
- }
|
LOOKAHEAD( ( "static" | "abstract" | "final" | "public" | "protected" | "private"
| "strictfp")* "interface" )
{
@@ -579,9 +581,6 @@
sourceClass.addInnerClass( innerClass );
}
NestedInterfaceDeclaration(innerClass)
- {
- XJavaDoc.getInstance().addSourceClass(innerClass);
- }
|
LOOKAHEAD( [ "public" | "protected" | "private" ] Name() "(" )
ConstructorDeclaration(sourceClass)
@@ -661,9 +660,6 @@
sourceClass.addInnerClass( innerClass );
}
NestedClassDeclaration(innerClass)
- {
- XJavaDoc.getInstance().addSourceClass(innerClass);
- }
|
LOOKAHEAD( ( "static" | "abstract" | "final" | "public" | "protected" | "private"
| "strictfp")* "interface" )
{
@@ -671,9 +667,6 @@
sourceClass.addInnerClass( innerClass );
}
NestedInterfaceDeclaration(innerClass)
- {
- XJavaDoc.getInstance().addSourceClass(innerClass);
- }
|
LOOKAHEAD( MethodDeclarationLookahead() )
MethodDeclaration(sourceClass)
@@ -1553,18 +1546,12 @@
sourceClass.addInnerClass( innerClass );
}
UnmodifiedClassDeclaration(innerClass)
- {
- XJavaDoc.getInstance().addSourceClass(innerClass);
- }
|
{
innerClass = new SourceClass(sourceClass, null, null);
sourceClass.addInnerClass( innerClass );
}
UnmodifiedInterfaceDeclaration(innerClass)
- {
- XJavaDoc.getInstance().addSourceClass(innerClass);
- }
}
void LocalVariableDeclaration() :
-------------------------------------------------------
This sf.net email is sponsored by: Jabber Inc.
Don't miss the IM event of the season | Special offer for OSDN members!
JabberConf 2002, Aug. 20-22, Keystone, CO http://www.jabberconf.com/osdn
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
