phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lua] Fix parsing of short/long comments

Browse Source
This commit is contained in:
Andreas Dangel
2022-09-24 17:13:29 +02:00
parent 05c30a1053
commit dcd8ff0ac0
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pmd-lua/src/main/antlr4/net/sourceforge/pmd/lang/lua/antlr4/Lua.g4
View File

@ -469,11 +469,11 @@ CLOSE_PARENS
; ;
NL NL
: '\r\n' | '\r' | '\n' : '\r\n' | '\r' | '\n'
| '\u0085' // <Next Line CHARACTER (U+0085)>' | '\u0085' // <Next Line CHARACTER (U+0085)>'
| '\u2028' //'<Line Separator CHARACTER (U+2028)>' | '\u2028' //'<Line Separator CHARACTER (U+2028)>'
| '\u2029' //'<Paragraph Separator CHARACTER (U+2029)>' | '\u2029' //'<Paragraph Separator CHARACTER (U+2029)>'
; ;
COMMA COMMA
: ',' : ','
@ -525,6 +525,11 @@ HexDigit
: [0-9a-fA-F] : [0-9a-fA-F]
; ;
fragment
StartingSingleCommentLineInputCharacter
: ~[[\r\n\u0085\u2028\u2029]
;
fragment fragment
SingleLineInputCharacter SingleLineInputCharacter
: ~[\r\n\u0085\u2028\u2029] : ~[\r\n\u0085\u2028\u2029]
@ -535,7 +540,7 @@ COMMENT
; ;
LINE_COMMENT LINE_COMMENT
: '--' SingleLineInputCharacter* -> channel(HIDDEN) : '--' (NL | StartingSingleCommentLineInputCharacter SingleLineInputCharacter*) -> channel(HIDDEN)
; ;
WS WS

5
pmd-lua/src/test/java/net/sourceforge/pmd/cpd/LuaTokenizerTest.java
View File

@ -44,4 +44,9 @@ public class LuaTokenizerTest extends CpdTextComparisonTest {
public void testRegression() { public void testRegression() {
doTest("luauTypes"); doTest("luauTypes");
} }
@Test
public void testComment() {
doTest("comment");
}
} }