add syntax highlighting (WIP)

src/coders/commons.cpp

@@ -214,10 +214,14 @@ std::string_view BasicParser::readUntil(char c) {
     return source.substr(start, pos - start);
 }
 
-std::string_view BasicParser::readUntil(std::string_view s) {
+std::string_view BasicParser::readUntil(std::string_view s, bool nothrow) {
     int start = pos;
     size_t found = source.find(s, pos);
     if (found == std::string::npos) {
+        if (nothrow) {
+            pos = source.size();
+            return source.substr(start);
+        }
         throw error(util::quote(std::string(s))+" expected");
     }
     skip(found - pos);

src/coders/commons.hpp

@@ -105,7 +105,7 @@ protected:
     parsing_error error(const std::string& message);
 public:
     std::string_view readUntil(char c);
-    std::string_view readUntil(std::string_view s);
+    std::string_view readUntil(std::string_view s, bool nothrow);
     std::string_view readUntilWhitespace();
     std::string_view readUntilEOL();
     std::string parseName();

src/coders/lua_parsing.cpp

@@ -119,24 +119,28 @@ public:
                 );
                 continue;
             } else if (is_digit(c)) {
-                auto value = parseNumber(1);
+                dv::value value;
+                auto tag = TokenTag::UNEXPECTED;
+                try {
+                    value = parseNumber(1);
+                    tag = value.isInteger() ? TokenTag::INTEGER
+                                            : TokenTag::NUMBER;
+                } catch (const parsing_error& err) {}
+
                 auto literal = source.substr(start.pos, pos - start.pos);
-                emitToken(
-                    value.isInteger() ? TokenTag::INTEGER : TokenTag::NUMBER,
-                    std::string(literal),
-                    start
-                );
+                emitToken(tag, std::string(literal), start);
                 continue;
             }
             switch (c) {
                 case '(': case '[': case '{': 
                     if (isNext("[==[")) {
-                        readUntil("]==]");
+                        auto string = readUntil("]==]", true);
                         skip(4);
+                        emitToken(TokenTag::COMMENT, std::string(string)+"]==]", start);
                         continue;
                     } else if (isNext("[[")) {
                         skip(2);
-                        auto string = readUntil("]]");
+                        auto string = readUntil("]]", true);
                         skip(2);
                         emitToken(TokenTag::STRING, std::string(string), start);
                         continue;
@@ -154,7 +158,7 @@ public:
                     continue;
                 case '\'': case '"': {
                     skip(1);
-                    auto string = parseString(c);
+                    auto string = parseString(c, false);
                     emitToken(TokenTag::STRING, std::move(string), start);
                     continue;
                 }
@@ -163,6 +167,8 @@ public:
             if (is_lua_operator_start(c)) {
                 auto text = parseOperator();
                 if (text == "--") {
+                    auto string = readUntilEOL();
+                    emitToken(TokenTag::COMMENT, std::string(string), start);
                     skipLine();
                     continue;
                 }

src/coders/lua_parsing.hpp

@@ -12,7 +12,7 @@ namespace lua {
 
     enum class TokenTag {
         KEYWORD, NAME, INTEGER, NUMBER, OPEN_BRACKET, CLOSE_BRACKET, STRING,
-        OPERATOR, COMMA, SEMICOLON, UNEXPECTED
+        OPERATOR, COMMA, SEMICOLON, UNEXPECTED, COMMENT
     };
 
     struct Token {