multi line comments

Author: wickwirew

Sources/Compiler/Parse/Lexer.swift

@@ -96,7 +96,6 @@ struct Lexer {
 
         switch (current, peek) {
         case ("*", "/"): return consumeDouble(of: .starForwardSlash)
-        case ("/", "*"): return consumeDouble(of: .forwardSlashStar)
         case ("<", "<"): return consumeDouble(of: .shiftLeft)
         case ("<", "="): return consumeDouble(of: .lte)
         case (">", ">"): return consumeDouble(of: .shiftRight)
@@ -105,6 +104,9 @@ struct Lexer {
         case ("-", "-"):
             skipSingleLineComment()
             return next()
+        case ("/", "*"):
+            skipMultiLineComment()
+            return next()
         case ("=", "="): return consumeDouble(of: .doubleEqual)
         case ("!", "="): return consumeDouble(of: .notEqual)
         case ("<", ">"): return consumeDouble(of: .notEqual2)
@@ -407,6 +409,7 @@ struct Lexer {
         return double
     }
 
+    /// Will skip a single line comment like "-- The comment"
     private mutating func skipSingleLineComment() {
         advance()
         advance()
@@ -416,6 +419,23 @@ struct Lexer {
         }
     }
 
+    /// Will skip a multi line comment like "/* The comment */"
+    private mutating func skipMultiLineComment() {
+        advance()
+        advance()
+        
+        while let current {
+            // Hit end of comment
+            if current == "*", peek == "/" {
+                advance()
+                advance()
+                return
+            }
+            
+            advance()
+        }
+    }
+    
     private func location(
         from start: Start,
         to upperBound: Substring.Index

Tests/CompilerTests/Compiler/CompileTableOrSubqueries.sql

@@ -1,11 +1,13 @@
--- TableOrSubquery seems to be the trickiest part of the AST
--- and want to have lots of tests validating it matches SQLite
--- even for the weird use cases.
+/*
+TableOrSubquery seems to be the trickiest part of the AST
+and want to have lots of tests validating it matches SQLite
+even for the weird use cases.
 
--- Each test has a "SQLite Output" above it to show exact what SQLite
--- returns when run locally as a sanity check.
+Each test has a "SQLite Output" above it to show exact what SQLite
+returns when run locally as a sanity check.
 
--- https://www.sqlite.org/syntax/table-or-subquery.html
+https://www.sqlite.org/syntax/table-or-subquery.html
+ */
 
 CREATE TABLE foo (bar INTEGER);
 CREATE TABLE baz (qux INTEGER);
@@ -129,3 +131,7 @@ SELECT * FROM foo AS quux CROSS JOIN baz;
 -- CHECK:   TABLES
 -- CHECK:     foo
 SELECT quux FROM ((SELECT bar AS quux FROM foo));
+
+/*
+Comment at the end
+*/