[qdox-scm] [582] trunk/qdox/src/grammar: qdox-118 bugfix: enum with JavaDoc and Annotations

[rfscholte]

Title: [582] trunk/qdox/src/grammar: qdox-118 bugfix: enum with JavaDoc and Annotations

Revision

582

Author

rfscholte

Date

2009-03-10 17:38:11 -0500 (Tue, 10 Mar 2009)

Log Message

qdox-118 bugfix: enum with JavaDoc and Annotations

Modified Paths

• trunk/qdox/src/grammar/parser.y
• trunk/qdox/src/test/com/thoughtworks/qdox/EnumsModelTest.java

Diff

Modified: trunk/qdox/src/grammar/parser.y (581 => 582)

--- trunk/qdox/src/grammar/parser.y	2009-03-10 22:06:27 UTC (rev 581)
+++ trunk/qdox/src/grammar/parser.y	2009-03-10 22:38:11 UTC (rev 582)
@@ -379,7 +379,7 @@
 enum_values: | enum_value | enum_value COMMA enum_values;
 
 enum_value:
-    javadoc enum_constructor |
+    javadoc opt_annotations enum_constructor |
     opt_annotations enum_constructor;
 
 enum_constructor:

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/EnumsModelTest.java (581 => 582)

--- trunk/qdox/src/test/com/thoughtworks/qdox/EnumsModelTest.java	2009-03-10 22:06:27 UTC (rev 581)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/EnumsModelTest.java	2009-03-10 22:38:11 UTC (rev 582)
@@ -187,6 +187,20 @@
         assertTrue(cls.isEnum());
     }
     
+    //for qdox-118 
+    public void testEnumWithJavaDocAndAnnotation() {
+        String source = "public enum TestEnum\n" +
+        		"{\n" +
+        		"/**\n" +
+        		"* Blah blah\n" +
+        		"*/\n" +
+        		"@MyAnno\n" +
+        		"TEST;\n" +
+        		"}\n";
+        JavaDocBuilder javaDocBuilder = new JavaDocBuilder();
+        javaDocBuilder.addSource(new StringReader(source));
+    }
+    
 /*
     private void printFields(final JavaField fields[]) {
 	    

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email