Title: [671] trunk/qdox/src/grammar: parsing-part fixed for QDOX-76: Handling of JavaDoc between multiple field initializers in a single statement
Revision
671
Author
rfscholte
Date
2009-09-12 12:30:20 -0500 (Sat, 12 Sep 2009)

Log Message

parsing-part fixed for QDOX-76: Handling of JavaDoc between multiple field initializers in a single statement

Modified Paths

Diff

Modified: trunk/qdox/src/grammar/parser.y (670 => 671)

--- trunk/qdox/src/grammar/parser.y	2009-09-12 09:57:33 UTC (rev 670)
+++ trunk/qdox/src/grammar/parser.y	2009-09-12 17:30:20 UTC (rev 671)
@@ -429,7 +429,7 @@
     constructor |
     static_block |
     class |
-	  enum |
+    enum |
     SEMI;
 
 memberend:
@@ -457,6 +457,9 @@
 extrafields: | 
     extrafields COMMA { line = lexer.getLine(); } arrayidentifier {
         makeField($4, lexer.getCodeBody());
+    } | 
+    extrafields COMMA javadoc { line = lexer.getLine(); } arrayidentifier {
+        makeField($5, lexer.getCodeBody());
     };
 
 

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java (670 => 671)

--- trunk/qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java	2009-09-12 09:57:33 UTC (rev 670)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java	2009-09-12 17:30:20 UTC (rev 671)
@@ -1011,6 +1011,19 @@
         assertTrue("Public", modifiers.contains("public"));
     }
 
+    public void testMultipleFieldsWithJavaDoc() throws Exception {
+    	String sourceCode = "class Thing {\n" +
+    			" /** some doc */\n" +
+    			" int a = 1,\n" +
+    			" /** more doc */\n" +
+    			" b = 2,\n" +
+    			" /** etc */\n" +
+    			" c = 3; }";
+    	JavaDocBuilder builder = new JavaDocBuilder();
+    	builder.addSource(new StringReader(sourceCode));
+    }
+
+    
     public void testJiraQdox117() throws Exception {
     	JavaDocBuilder builder = new JavaDocBuilder();
         String sourceCode = "" +


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to