Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

fix comment sanning for double dashes

Browse Source
This commit is contained in:
James Xu
2014-11-28 20:06:10 +08:00
parent fa57e7f3e5
commit 8572e4edf2
2 changed files with 60 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/parser/Lexer.java
+43 -43
View File
@@ -736,66 +736,66 @@ public class Lexer {
throw new NotAllowCommentException();
}
if (ch != '/') {
if ((ch == '/' && charAt(pos + 1) == '/')
|| (ch == '-' && charAt(pos + 1) == '-')) {
scanSingleLineComment();
} else if (ch == '/' && charAt(pos + 1) == '*') {
scanMultiLineComment();
} else {
throw new IllegalStateException();
}
}
private void scanMultiLineComment() {
scanChar();
scanChar();
mark = pos;
bufPos = 0;
for (;;) {
if (ch == '*' && charAt(pos + 1) == '/') {
scanChar();
scanChar();
break;
}
scanChar();
bufPos++;
}
stringVal = subString(mark, bufPos);
token = Token.MULTI_LINE_COMMENT;
hasComment = true;
}
private void scanSingleLineComment() {
scanChar();
scanChar();
mark = pos;
bufPos = 0;
if (ch == '*') {
scanChar();
bufPos++;
for (;;) {
if (ch == '*' && charAt(pos + 1) == '/') {
bufPos += 2;
scanChar();
for (;;) {
if (ch == '\r') {
if (charAt(pos + 1) == '\n') {
scanChar();
break;
}
scanChar();
bufPos++;
break;
}
stringVal = subString(mark, bufPos);
token = Token.MULTI_LINE_COMMENT;
hasComment = true;
return;
}
if (ch == '/') {
scanChar();
bufPos++;
for (;;) {
if (ch == '\r') {
if (charAt(pos + 1) == '\n') {
bufPos += 2;
scanChar();
break;
}
bufPos++;
break;
}
if (ch == '\n') {
scanChar();
bufPos++;
break;
}
if (ch == '\n') {
scanChar();
bufPos++;
break;
}
stringVal = subString(mark + 1, bufPos);
token = Token.LINE_COMMENT;
hasComment = true;
return;
scanChar();
bufPos++;
}
stringVal = subString(mark, bufPos);
token = Token.LINE_COMMENT;
hasComment = true;
}
public void scanIdentifier() {