fix comment sanning for double dashes

zgpxiong · Nov 28, 2014 · 8572e4e · 8572e4e
1 parent fa57e7f
commit 8572e4e
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 39 deletions.
diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java
@@ -736,66 +736,66 @@ public void scanComment() {
             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;
-        scanChar();
-
-        if (ch == '*') {
-            scanChar();
-            bufPos++;
-
-            for (;;) {
-                if (ch == '*' && charAt(pos + 1) == '/') {
-                    bufPos += 2;
-                    scanChar();
-                    scanChar();
-                    break;
-                }
 
+        for (;;) {
+            if (ch == '*' && charAt(pos + 1) == '/') {
                 scanChar();
-                bufPos++;
+                scanChar();
+                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;
-                }
+        stringVal = subString(mark, bufPos);
+        token = Token.MULTI_LINE_COMMENT;
+        hasComment = true;
+    }
 
-                if (ch == '\n') {
+    private void scanSingleLineComment() {
+        scanChar();
+        scanChar();
+        mark = pos;
+        bufPos = 0;
+
+        for (;;) {
+            if (ch == '\r') {
+                if (charAt(pos + 1) == '\n') {
                     scanChar();
-                    bufPos++;
                     break;
                 }
+                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() {

diff --git a/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java b/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java
@@ -62,4 +62,21 @@ public void test_1() throws Exception {
 
         System.out.println(out.toString());
     }
+
+    public void test_2() throws Exception {
+        String sql = "//hello world\n";
+        Lexer lexer = new Lexer(sql);
+        lexer.nextToken();
+        assertEquals("hello world", lexer.stringVal());
+
+        sql = "/*hello \nworld*/";
+        lexer = new Lexer(sql);
+        lexer.nextToken();
+        assertEquals("hello \nworld", lexer.stringVal());
+
+        sql = "--hello world\n";
+        lexer = new Lexer(sql);
+        lexer.nextToken();
+        assertEquals("hello world", lexer.stringVal());
+    }
 }