github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#8074] Support parsing nested block comments

Browse Source
This commit is contained in:
lukaseder 2018-11-28 11:05:30 +01:00
parent 2c3cab6bc0
commit c89dae2291
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -8828,6 +8828,11 @@ final class ParserImpl implements Parser {
}
private static final int afterWhitespace(ParserContext ctx, int position) {
// [#8074] The SQL standard and some implementations (e.g. PostgreSQL,
// SQL Server) support nesting block comments
int blockCommentNestLevel = 0;
loop:
for (int i = position; i < ctx.sql.length; i++) {
switch (ctx.sql[i]) {
@ -8841,19 +8846,32 @@ final class ParserImpl implements Parser {
case '/':
if (i + 1 < ctx.sql.length && ctx.sql[i + 1] == '*') {
i = i + 2;
blockCommentNestLevel++;
while (i < ctx.sql.length) {
switch (ctx.sql[i]) {
case '/':
if (i + 1 < ctx.sql.length && ctx.sql[i + 1] == '*') {
i = i + 2;
blockCommentNestLevel++;
}
break;
case '+':
if (!ctx.ignoreHints() && i + 1 < ctx.sql.length && ((ctx.sql[i + 1] >= 'A' && ctx.sql[i + 1] <= 'Z') || (ctx.sql[i + 1] >= 'a' && ctx.sql[i + 1] <= 'z')))
if (!ctx.ignoreHints() && i + 1 < ctx.sql.length && ((ctx.sql[i + 1] >= 'A' && ctx.sql[i + 1] <= 'Z') || (ctx.sql[i + 1] >= 'a' && ctx.sql[i + 1] <= 'z'))) {
blockCommentNestLevel = 0;
break loop;
}
break;
case '*':
if (i + 1 < ctx.sql.length && ctx.sql[i + 1] == '/') {
position = (i = i + 1) + 1;
continue loop;
if (--blockCommentNestLevel == 0)
continue loop;
}
break;
@ -8895,6 +8913,9 @@ final class ParserImpl implements Parser {
}
}
if (blockCommentNestLevel > 0)
throw ctx.exception("Nested block comment not properly closed");
return position;
}