[qdox-scm] [588] trunk/qdox/src/grammar: fix for qdox-158

[rfscholte]

Title: [588] trunk/qdox/src/grammar: fix for qdox-158

Revision

588

Author

rfscholte

Date

2009-03-22 08:13:50 -0500 (Sun, 22 Mar 2009)

Log Message

fix for qdox-158

Modified Paths

• trunk/qdox/src/grammar/lexer.flex
• trunk/qdox/src/test/com/thoughtworks/qdox/parser/LexerTest.java

Diff

Modified: trunk/qdox/src/grammar/lexer.flex (587 => 588)

--- trunk/qdox/src/grammar/lexer.flex	2009-03-22 13:06:24 UTC (rev 587)
+++ trunk/qdox/src/grammar/lexer.flex	2009-03-22 13:13:50 UTC (rev 588)
@@ -198,7 +198,7 @@
         pushState(ASSIGNMENT);
     }
     {Id} {
-        annotation = at;
+        annotation |= at;
         at = false;
         
         return Parser.IDENTIFIER;

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/parser/LexerTest.java (587 => 588)

--- trunk/qdox/src/test/com/thoughtworks/qdox/parser/LexerTest.java	2009-03-22 13:06:24 UTC (rev 587)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/parser/LexerTest.java	2009-03-22 13:13:50 UTC (rev 588)
@@ -671,7 +671,7 @@
     }
     
     //for QDOX-158
-    public void todo_testAnnotationWithMultipleParameters() throws Exception {
+    public void testAnnotationWithMultipleParameters() throws Exception {
     	String in = 
     			"@MyFunction.MyInterface( prefix1 = \"abc\", prefix2 = \"abc\" )";
     	Lexer lexer = new JFlexLexer(new StringReader(in));

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email