#18 TypeFlags are not really required

albeva · Mar 4, 2022 · 5ce1e70 · 5ce1e70
1 parent 76b8c60
commit 5ce1e70
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 26 deletions.
diff --git a/src/Parser/Parser.cpp b/src/Parser/Parser.cpp
@@ -10,8 +10,8 @@
 #include "Lexer/Token.hpp"
 #include "Lexer/TokenSource.hpp"
 #include "ParseResult.hpp"
-#include "Type/Type.hpp"
 #include "Symbol/SymbolTable.hpp"
+#include "Type/Type.hpp"
 using namespace lbc;
 
 Parser::Parser(Context& context, TokenSource& source, bool isMain, SymbolTable* symbolTable)
@@ -27,7 +27,6 @@ Parser::Parser(Context& context, TokenSource& source, bool isMain, SymbolTable*
 void Parser::reset() noexcept {
     m_scope = Scope::Root;
     m_exprFlags = {};
-    m_typeFlags = {};
     m_endLoc = {};
     m_token = {};
     advance();
@@ -982,10 +981,7 @@ ParseResult<AstContinuationStmt> Parser::kwExit() {
  *          | TypeOf
  *          .
  */
-ParseResult<AstTypeExpr> Parser::typeExpr(TypeFlags flags) {
-    RESTORE_ON_EXIT(m_typeFlags);
-    m_typeFlags = flags;
-
+ParseResult<AstTypeExpr> Parser::typeExpr() {
     auto start = m_token.range().Start;
     bool parenthesized = accept(TokenKind::ParenOpen);
     bool mustBePtr = false;
@@ -1001,7 +997,7 @@ ParseResult<AstTypeExpr> Parser::typeExpr(TypeFlags flags) {
         TRY_ASSIGN(expr, kwTypeOf())
     } else {
         TRY_DECLARE(ident, identifier())
-        if (m_typeFlags.consultSymbolTable && m_symbolTable != nullptr) {
+        if (m_symbolTable != nullptr) {
             auto* symbol = m_symbolTable->find(ident->name);
             if (symbol == nullptr || !symbol->getFlags().type) {
                 return ParseResult<AstTypeExpr>::error();
@@ -1038,13 +1034,6 @@ ParseResult<AstTypeOf> Parser::kwTypeOf() {
     auto start = m_token.range().Start;
     advance();
 
-    if (m_typeFlags.evaluateTypeOf) {
-        TRY(consume(TokenKind::ParenOpen))
-        TRY_DECLARE(type, typeExpr(m_typeFlags))
-        TRY(consume(TokenKind::ParenClose))
-        return m_context.create<AstTypeOf>(llvm::SMRange{ start, m_endLoc }, type);
-    }
-
     TRY(consume(TokenKind::ParenOpen))
     std::vector<Token> tokens;
     int parens = 1;
@@ -1395,4 +1384,3 @@ void Parser::advance() {
     m_endLoc = m_token.range().End;
     m_source.next(m_token);
 }
-
diff --git a/src/Parser/Parser.hpp b/src/Parser/Parser.hpp
@@ -25,17 +25,12 @@ class Parser final {
         LLVM_MARK_AS_BITMASK_ENUM(/* LargestValue = */ CallWithoutParens)
     };
 
-    struct TypeFlags {
-        bool evaluateTypeOf: 1;
-        bool consultSymbolTable: 1;
-    };
-
     Parser(Context& context, TokenSource& source, bool isMain, SymbolTable* symbolTable = nullptr);
     ~Parser() noexcept = default;
 
     [[nodiscard]] ParseResult<AstModule> parse();
     [[nodiscard]] ParseResult<AstExpr> expression(ExprFlags flags = ExprFlags::None);
-    [[nodiscard]] ParseResult<AstTypeExpr> typeExpr(TypeFlags flags = {});
+    [[nodiscard]] ParseResult<AstTypeExpr> typeExpr();
 
     void reset() noexcept;
 
@@ -137,7 +132,6 @@ class Parser final {
     Token m_token{};
     llvm::SMLoc m_endLoc{};
     ExprFlags m_exprFlags{};
-    TypeFlags m_typeFlags{};
 };
 
 } // namespace lbc
diff --git a/src/Sem/SemanticAnalyzer.cpp b/src/Sem/SemanticAnalyzer.cpp
@@ -6,14 +6,14 @@
 #include "Driver/Context.hpp"
 #include "Lexer/Token.hpp"
 #include "Lexer/TokenProvider.hpp"
+#include "Parser/Parser.hpp"
 #include "Passes/ForStmtPass.hpp"
 #include "Passes/ForwardDeclPass.hpp"
 #include "Symbol/Symbol.hpp"
 #include "Symbol/SymbolTable.hpp"
 #include "Type/Type.hpp"
 #include "Type/TypeProxy.hpp"
 #include "Type/TypeUdt.hpp"
-#include "Parser/Parser.hpp"
 
 using namespace lbc;
 
@@ -238,13 +238,12 @@ void SemanticAnalyzer::visit(AstTypeOf& ast) {
         TokenProvider provider{ m_astRootModule->fileId, *tokens };
         Parser parser{ m_context, provider, /* isMain */ false, getSymbolTable() };
 
-        if (auto* type = parser.typeExpr({.evaluateTypeOf = true, .consultSymbolTable = true}).getPointer()) {
+        if (auto* type = parser.typeExpr().getPointer()) {
             ast.typeExpr = type;
         } else {
             provider.reset();
             parser.reset();
-            auto result = parser.expression();
-            if (auto* expr = result.getPointer()) {
+            if (auto* expr = parser.expression().getPointer()) {
                 ast.typeExpr = expr;
             }
         }