feat: use namespace <name>; over #pragma namespace <name>

WerWolv · Feb 4, 2024 · 6dae1bc · 6dae1bc
1 parent 188a808
commit 6dae1bc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/lib/include/pl/core/parser.hpp b/lib/include/pl/core/parser.hpp
@@ -36,7 +36,7 @@ namespace pl::core {
         explicit Parser() = default;
         ~Parser() override = default;
 
-        hlp::CompileResult<std::vector<std::shared_ptr<ast::ASTNode>>> parse(const std::vector<Token> &tokens, const std::vector<std::string>& prefixNamespace = {});
+        hlp::CompileResult<std::vector<std::shared_ptr<ast::ASTNode>>> parse(const std::vector<Token> &tokens);
 
         const auto &getTypes() { return this->m_types; }
 
@@ -48,6 +48,10 @@ namespace pl::core {
             this->m_parserManager = parserManager;
         }
 
+        void setDefaultNamespace(const std::vector<std::string> &defaultNamespace) {
+            this->m_defaultNamespace = defaultNamespace;
+        }
+
     private:
         TokenIter m_curr;
         TokenIter m_startToken, m_originalPosition, m_partOriginalPosition;
@@ -64,6 +68,8 @@ namespace pl::core {
 
         ParserManager* m_parserManager = nullptr;
 
+        std::vector<std::string> m_defaultNamespace;
+
         Location location() override;
         // error helpers
         void errorHere(const std::string &message);

diff --git a/lib/source/pl/core/parser.cpp b/lib/source/pl/core/parser.cpp
@@ -2083,6 +2083,17 @@ namespace pl::core {
                 break;
         }
 
+        if (sequence(tkn::Separator::Semicolon)) {
+            // default namespace declaration
+            if (!m_defaultNamespace.empty()) {
+                return { };
+            }
+
+            this->m_defaultNamespace = this->m_currNamespace.back();
+
+            return { };
+        }
+
         if (!sequence(tkn::Separator::LeftBrace)) {
             error("Expected '{{' at beginning of namespace, got {}.", getFormattedToken(0));
             return { };
@@ -2282,7 +2293,7 @@ namespace pl::core {
     }
 
     // <(parseNamespace)...> EndOfProgram
-    hlp::CompileResult<std::vector<std::shared_ptr<ast::ASTNode>>> Parser::parse(const std::vector<Token> &tokens, const std::vector<std::string>& prefixNamespace) {
+    hlp::CompileResult<std::vector<std::shared_ptr<ast::ASTNode>>> Parser::parse(const std::vector<Token> &tokens) {
 
         this->m_curr = this->m_startToken = this->m_originalPosition = this->m_partOriginalPosition
             = TokenIter(tokens.begin(), tokens.end());
@@ -2294,8 +2305,8 @@ namespace pl::core {
 
         this->m_currNamespace.clear();
         this->m_currNamespace.emplace_back();
-        if(!prefixNamespace.empty())
-            this->m_currNamespace.push_back(prefixNamespace);
+        if (!this->m_defaultNamespace.empty())
+            this->m_currNamespace.back() = this->m_defaultNamespace;
 
         try {
             auto program = parseTillToken(tkn::Separator::EndOfProgram);

diff --git a/lib/source/pl/core/parser_manager.cpp b/lib/source/pl/core/parser_manager.cpp
@@ -27,12 +27,6 @@ ParserManager::parse(api::Source *source, const std::string &namespacePrefix) {
 
     const auto& preprocessor = internals.preprocessor;
 
-    preprocessor->addPragmaHandler("namespace", [&](auto&, const std::string& value) {
-        if(namespacePrefix.empty())
-            namespaces = wolv::util::splitString(value, "::");
-        return true;
-    });
-
     const auto& lexer = internals.lexer;
     const auto& validator = internals.validator;
 
@@ -53,8 +47,9 @@ ParserManager::parse(api::Source *source, const std::string &namespacePrefix) {
     }
 
     parser.setParserManager(this);
+    parser.setDefaultNamespace(namespaces);
 
-    auto result = parser.parse(tokens.value(), namespaces);
+    auto result = parser.parse(tokens.value());
     if (result.hasErrs())
         return result;
 

diff --git a/tests/source/main.cpp b/tests/source/main.cpp
@@ -88,7 +88,7 @@ int runTests(int argc, char **argv) {
     )", "IA");
 
     (void)runtime.addVirtualSource(R"(
-        #pragma namespace B
+        namespace B;
 
         import IC as C;