paul-hammant#90 Seems QDox 2.0.1 has issue parsing parameter names na…

…med "record"
TongchengOpenSource · Jul 24, 2022 · c887457 · c887457
1 parent 89461e6
commit c887457
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/src/grammar/lexer.flex b/src/grammar/lexer.flex
@@ -239,7 +239,7 @@ JavadocEnd                      = "*"+ "/"
 <ANNOTATIONNOARG> {
   {WhiteSpace} { popState(); }
 }
-<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, NAME, RECORD, TYPE> {
+<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, NAME, TYPE> {
     "."                 { return Parser.DOT; }
     "..."               { return Parser.DOTDOTDOT; }
     ","                 { return Parser.COMMA; }
@@ -265,7 +265,6 @@ JavadocEnd                      = "*"+ "/"
     "implements"        { return Parser.IMPLEMENTS; }
     "super"             { return Parser.SUPER; }
     "new"               { return Parser.NEW; }
-    "record"            { return Parser.RECORD; }
     "sealed"            { return Parser.SEALED; }
     "non-sealed"        { return Parser.NON_SEALED; }
     "permits"           { return Parser.PERMITS; }
@@ -309,6 +308,13 @@ JavadocEnd                      = "*"+ "/"
         pushState(NAME);
         return Parser.ENUM;
     }
+    "record" / {WhiteSpace}* {Id} {
+        markAnnotatedElementLine();
+        classDepth++;
+        braceMode = CODEBLOCK;
+        pushState(NAME);
+        return Parser.RECORD;
+    }
     "@"                 {
         markAnnotatedElementLine();
         pushState(ATANNOTATION);
@@ -430,7 +436,7 @@ JavadocEnd                      = "*"+ "/"
             }
          }
 }
-<ENUM, RECORD, TYPE> {
+<ENUM, TYPE> {
     "default"           { return Parser.DEFAULT; }
 }
 <ANNOTATIONTYPE> {
@@ -441,7 +447,7 @@ JavadocEnd                      = "*"+ "/"
     {Id} / {WhiteSpace}* [;{(] { resetAnnotatedElementLine(); popState(); return Parser.IDENTIFIER; }
     {Id}                       { popState(); return Parser.IDENTIFIER; }
 }
-<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, MODULE, RECORD, TYPE> {
+<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, MODULE, TYPE> {
     {Id} { return Parser.IDENTIFIER;
          }
 }
@@ -657,12 +663,12 @@ JavadocEnd                      = "*"+ "/"
     }
 }
 
-<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, RECORD, TYPE> {
+<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, TYPE> {
     "\""                { if (appendingToCodeBody) { codeBody.append('"');  } pushState(STRING); }
     \'                  { if (appendingToCodeBody) { codeBody.append('\''); } pushState(CHAR); }
 }
 
-<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, ANNOTATION, ATANNOTATION, ARGUMENTS, RECORD, TYPE, NAME, MODULE > {
+<ASSIGNMENT, YYINITIAL, CODEBLOCK, PARENBLOCK, ENUM, ANNOTATIONTYPE, ANNOTATION, ATANNOTATION, ARGUMENTS, TYPE, NAME, MODULE > {
   "//"                { if (appendingToCodeBody) { codeBody.append("//"); } pushState(SINGLELINECOMMENT); }
   "/*"                { if (appendingToCodeBody) { codeBody.append("/*"); } pushState(MULTILINECOMMENT); }
   "/**/"              { if (appendingToCodeBody) { codeBody.append("/**/"); } }

diff --git a/src/test/java/com/thoughtworks/qdox/RecordsTest.java b/src/test/java/com/thoughtworks/qdox/RecordsTest.java
@@ -138,4 +138,30 @@ public void withAnnotatedParameters() {
             + "    @GreaterThanZero double width) { }";
         builder.addSource( new StringReader(source) );
     }
+
+    @Test
+    public void withAnnotation() {
+        String source = "@Deprecated\n"
+            + "record Line(int lenght) { }";
+        builder.addSource( new StringReader(source) );
+    }
+
+
+    @Test
+    public void recordAsTypeAndIdentifiers() {
+        String source = "package record.record.record;\n"
+            + "\n"
+            + "public class record\n"
+            + "{\n"
+            + "    private Object record;\n"
+            + "    \n"
+            + "    public record() {\n"
+            + "    }\n"
+            + "    \n"
+            + "    private Object record(Object record) {\n"
+            + "        return record;\n"
+            + "    }\n"
+            + "}";
+            builder.addSource( new StringReader(source) );
+    }
 }