support nullable operator

Author: CppCXY

LuaParser/src/Ast/LuaSyntaxTree.cpp

@@ -1,13 +1,12 @@
 #include "LuaParser/Ast/LuaSyntaxTree.h"
-#include <algorithm>
-#include "LuaParser/Parse/LuaParser.h"
 #include "LuaParser/Lexer/LuaTokenTypeDetail.h"
+#include "LuaParser/Parse/LuaParser.h"
 #include "Util/format.h"
+#include <algorithm>
 
 LuaSyntaxTree::LuaSyntaxTree()
-        : _file(),
-          _tokenIndex(0) {
-
+    : _file(),
+      _tokenIndex(0) {
 }
 
 void LuaSyntaxTree::BuildTree(LuaParser &p) {
@@ -107,8 +106,7 @@ void LuaSyntaxTree::EatInlineComment(LuaParser &p) {
             case TK_LONG_COMMENT:
             case TK_SHEBANG: {
                 auto prevToken = tokens[index - 1];
-                if (_file->GetLine(prevToken.Range.GetEndOffset())
-                    == _file->GetLine(tokens[index].Range.StartOffset)) {
+                if (_file->GetLine(prevToken.Range.GetEndOffset()) == _file->GetLine(tokens[index].Range.StartOffset)) {
                     EatToken(p);
                 }
                 break;
@@ -263,7 +261,7 @@ std::size_t LuaSyntaxTree::GetEndOffset(std::size_t index) const {
 TextRange LuaSyntaxTree::GetTokenRange(std::size_t index) const {
     if (index < _nodeOrTokens.size()) {
         auto &n = _nodeOrTokens[index];
-        if(n.Type == NodeOrTokenType::Token) {
+        if (n.Type == NodeOrTokenType::Token) {
             auto &token = _tokens[n.Data.TokenIndex];
             return TextRange(token.Start, token.Length);
         }
@@ -343,7 +341,7 @@ std::size_t LuaSyntaxTree::GetPrevToken(std::size_t index) const {
             if (tokenIndex != 0) {
                 return _tokens[tokenIndex - 1].NodeIndex;
             }
-        } else { // Node, 可能存在无元素节点
+        } else {// Node, 可能存在无元素节点
             for (auto nodeIndex = index - 1; nodeIndex > 0; nodeIndex--) {
                 if (IsToken(nodeIndex)) {
                     return nodeIndex;
@@ -364,7 +362,7 @@ std::size_t LuaSyntaxTree::GetNextToken(std::size_t index) const {
         auto &n = _nodeOrTokens[index];
         if (n.Type == NodeOrTokenType::Token) {
             tokenNodeIndex = index;
-        } else { // Node, 可能存在无元素节点
+        } else {// Node, 可能存在无元素节点
             auto lastTokenIndex = GetLastToken(index);
             if (lastTokenIndex != 0) {
                 tokenNodeIndex = lastTokenIndex;
@@ -541,13 +539,9 @@ bool LuaSyntaxTree::HasError() const {
 }
 
 bool LuaSyntaxTree::IsEatAllComment(LuaSyntaxNodeKind kind) const {
-    return kind == LuaSyntaxNodeKind::Block
-           || kind == LuaSyntaxNodeKind::TableFieldList
-           || kind == LuaSyntaxNodeKind::File;
+    return kind == LuaSyntaxNodeKind::Block || kind == LuaSyntaxNodeKind::TableFieldList || kind == LuaSyntaxNodeKind::File;
 }
 
 const std::vector<LuaParseError> &LuaSyntaxTree::GetErrors() const {
     return _errors;
 }
-
-

LuaParser/src/Lexer/LuaLexer.cpp

@@ -354,6 +354,14 @@ LuaTokenKind LuaLexer::Lex() {
                 }
                 return '{';
             }
+            case '?': {
+                _reader.SaveAndNext();
+                if(_supportNonStandardSymbol && _reader.CheckNext1('.')) {
+                    return '.';
+                }
+
+                return '?';
+            }
             default: {
                 if (lislalpha(_reader.GetCurrentChar())) /* identifier or reserved word? */
                 {

LuaParser/src/Parse/LuaParser.cpp

@@ -463,40 +463,6 @@ void LuaParser::ExpressionStatement() {
     }
 }
 
-//
-//void LuaParser::DocStatement(std::shared_ptr<LuaSyntaxNode> comment, LuaToken &docComment) {
-//    LuaDocTokenParser docTokenParser(docComment.Text, docComment.Range);
-//    docTokenParser.Next();
-//
-//    switch (docTokenParser.Current().TokenType) {
-//        case TK_DOC_TAG_FORMAT: {
-//            DocTagFormatStatement(comment, docTokenParser);
-//            break;
-//        }
-//        default: {
-//            break;
-//        }
-//    }
-//}
-//
-//void LuaParser::DocTagFormatStatement(std::shared_ptr<LuaSyntaxNode> comment, LuaDocTokenParser &docTokenParser) {
-//    auto docFormat = CreateAstNodeFromToken(LuaSyntaxNodeKind::DocTagFormat, docTokenParser.Current());
-//
-//    docTokenParser.Next();
-//    switch (docTokenParser.Current().TokenType) {
-//        case TK_DOC_DISABLE:
-//        case TK_DOC_DISABLE_NEXT: {
-//            docFormat->AddChild(CreateAstNodeFromToken(LuaSyntaxNodeKind::KeyWord, docTokenParser.Current()));
-//            break;
-//        }
-//        default: {
-//            return;
-//        }
-//    }
-//
-//    comment->AddChild(docFormat);
-//}
-
 void LuaParser::Condition() {
     Expression();
 }
@@ -1013,15 +979,3 @@ void LuaParser::NameDefList() {
 std::vector<LuaToken> &LuaParser::GetTokens() {
     return _tokens;
 }
-
-
-
-
-
-
-
-
-
-
-
-

Test/src/Grammar_unitest.cpp

@@ -57,4 +57,7 @@ local t = 123/*1233*/
     EXPECT_FALSE(TestHelper::GetParser(R"(
 local t = {@abaa}
 )", true).HasError()) << "extend grammar issue 119 test fail";
+    EXPECT_FALSE(TestHelper::GetParser(R"(
+local t = disableControl?.disableMovement
+)", true).HasError()) << "extend grammar nullable operator test fail";
 }

Test2/src/FormatTest2.cpp

@@ -8,16 +8,11 @@
 
 int main() {
     std::string buffer = R"(
-t+=123
-t-=123
-t/=123
-t//=123
-t*=123
-t<<=123
-t>>=123
-t%=123
-t|=123
-t&=123
+local disable = {
+move= disableControls?.disableMovement,
+oko = disableControls?.disableLook,
+combat = disableControls?.disableCombat,
+}
 )";
 
     auto file = std::make_shared<LuaFile>(std::move(buffer));