User: ara_e_w
Date: 02/03/12 08:55:13
Modified: javacc Java1.2-b.jjt
Log:
though no javadoc info is needed and collected for inner classes but they are
properly handled now
Revision Changes Path
1.18 +61 -30 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.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- Java1.2-b.jjt 10 Mar 2002 17:56:01 -0000 1.17
+++ Java1.2-b.jjt 12 Mar 2002 16:55:13 -0000 1.18
@@ -482,21 +482,27 @@
}
{
ct="class" {
+ if(sourceClass!=null) {
setToken( sourceClass, ct );
sourceClass.setInterface( false );
}
+ }
name=<IDENTIFIER> {
+ if(sourceClass!=null) {
sourceClass.setName(name.image);
}
+ }
[ "extends" superclass=Name() ]
[ "implements" Interfaces_NameList(sourceClass) ]
{
+ if(sourceClass!=null) {
if( superclass != null ) {
sourceClass.setSuperclass(superclass);
} else {
sourceClass.setSuperclass("java.lang.Object");
}
}
+ }
ClassBody(sourceClass, halt)
}
@@ -787,47 +793,70 @@
{
Token t = null;
String exceptions = null;
+
+ //this may remain null for anonymous inner classes (sourceClass==null), not a
problem because we're not going to access class structure of an anonymous inner class
MethodImpl methodImpl = null;
+
+ if(sourceClass!=null) {
methodImpl = new MethodImpl(sourceClass, null);
}
+}
{
(
t="public" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.PUBLIC );
setToken( methodImpl, t );
}
+ }
| t="protected" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.PROTECTED );
setToken( methodImpl, t );
}
+ }
| t="private" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.PRIVATE );
setToken( methodImpl, t );
}
+ }
| t="static" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.STATIC );
setToken( methodImpl, t );
}
+ }
| t="abstract" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.ABSTRACT );
setToken( methodImpl, t );
}
+ }
| t="final" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.FINAL );
setToken( methodImpl, t );
}
+ }
| t="native" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.NATIVE );
setToken( methodImpl, t );
}
+ }
| t="synchronized" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.SYNCHRONIZED );
setToken( methodImpl, t );
}
+ }
| t="strictfp" {
+ if(methodImpl!=null) {
methodImpl.addModifier( Modifier.STRICT );
setToken( methodImpl, t );
}
+ }
)*
ResultType(methodImpl)
MethodDeclarator(methodImpl)
@@ -836,7 +865,9 @@
{
// we must add the method after the fields are in, because the
// signature must be complete when adding
+ if(sourceClass!=null) {
sourceClass.addMethod(methodImpl);
+ }
}
}
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel