Program::resolveEnvironment now integrate used modules in parent envi…

…ronment
Fil-Language · Sep 5, 2023 · ce1be78 · ce1be78
1 parent 8d78582
commit ce1be78
Show file tree

Hide file tree

Showing 54 changed files with 652 additions and 214 deletions.
diff --git a/src/lib/FilCompiler.cpp b/src/lib/FilCompiler.cpp
@@ -198,7 +198,7 @@ namespace filc {
                 }
 
                 try {
-                    program->resolveEnvironment(collector);
+                    program->resolveEnvironment(collector, _modules);
                 } catch (std::exception &e) {
                     collector->addError(new filc::message::BasicError(filc::message::ERROR,
                                                                       "Error when resolve module " + module.first +

diff --git a/src/lib/ast/AST.h b/src/lib/ast/AST.h
@@ -30,6 +30,7 @@
 #include "MessageCollector.h"
 #include <string>
 #include <vector>
+#include <map>
 
 namespace filc::ast {
     class Program {
@@ -49,7 +50,11 @@ namespace filc::ast {
 
         auto setFilename(const std::string &filename) -> void;
 
-        auto resolveEnvironment(filc::message::MessageCollector *collector) -> void;
+        auto resolveEnvironment(filc::message::MessageCollector *collector,
+                                const std::map<const std::string, Program *> &modules) -> void;
+
+        [[nodiscard]] auto getPublicEnvironment(const filc::environment::Environment *parent) const
+        -> filc::environment::Environment *;
 
     private:
         std::string _module;
@@ -85,6 +90,8 @@ namespace filc::ast {
                                  filc::message::MessageCollector *collector,
                                  AbstractType *preferred_type = nullptr) -> void;
 
+        virtual auto addNameToEnvironment(filc::environment::Environment *environment) const -> void;
+
     private:
         bool _exported{false};
         filc::utils::Position *_position{nullptr};
@@ -108,6 +115,8 @@ namespace filc::ast {
                          filc::message::MessageCollector *collector,
                          AbstractType *preferred_type) -> void override;
 
+        auto addNameToEnvironment(filc::environment::Environment *environment) const -> void override;
+
     private:
         std::string _name;
     };
@@ -187,6 +196,8 @@ namespace filc::ast {
         auto resolveType(filc::environment::Environment *environment, filc::message::MessageCollector *collector,
                          AbstractType *preferred_type) -> void override;
 
+        auto addNameToEnvironment(filc::environment::Environment *environment) const -> void override;
+
     private:
         bool _constant;
         Identifier *_identifier;
@@ -529,6 +540,8 @@ namespace filc::ast {
                          filc::message::MessageCollector *collector,
                          AbstractType *preferred_type) -> void override;
 
+        auto addNameToEnvironment(filc::environment::Environment *environment) const -> void override;
+
     private:
         Identifier *_name;
     };

diff --git a/src/lib/ast/AbstractExpression.cpp b/src/lib/ast/AbstractExpression.cpp
@@ -23,6 +23,7 @@
  */
 #include "AST.h"
 #include "Error.h"
+#include "tools.h"
 
 namespace filc::ast {
     AbstractExpression::~AbstractExpression() {
@@ -62,4 +63,10 @@ namespace filc::ast {
                                          getPosition())
         );
     }
+
+    auto AbstractExpression::addNameToEnvironment(filc::environment::Environment *environment) const -> void {
+        auto name = filc::utils::joinString(filc::utils::splitString(environment->getModule(), '.'), "_")
+                    + "_" + std::to_string(getPosition()->getLine());
+        environment->addName(name, getExpressionType());
+    }
 }
diff --git a/src/lib/ast/ForI.cpp b/src/lib/ast/ForI.cpp
@@ -58,7 +58,7 @@ namespace filc::ast {
     auto ForI::resolveType(filc::environment::Environment *environment,
                            filc::message::MessageCollector *collector,
                            AbstractType *preferred_type) -> void {
-        _body_environment = new filc::environment::Environment(environment);
+        _body_environment = new filc::environment::Environment("", environment);
 
         if (_declaration != nullptr) {
             _declaration->resolveType(_body_environment, collector, nullptr);

diff --git a/src/lib/ast/ForIter.cpp b/src/lib/ast/ForIter.cpp
@@ -56,7 +56,7 @@ namespace filc::ast {
     auto ForIter::resolveType(filc::environment::Environment *environment,
                               filc::message::MessageCollector *collector,
                               AbstractType *preferred_type) -> void {
-        _body_environment = new filc::environment::Environment(environment);
+        _body_environment = new filc::environment::Environment("", environment);
 
         _array->resolveType(environment, collector);
         auto *array_type = _array->getExpressionType();

diff --git a/src/lib/ast/Function.cpp b/src/lib/ast/Function.cpp
@@ -55,4 +55,8 @@ namespace filc::ast {
 
         environment->addName(_name->getName(), getExpressionType());
     }
+
+    auto Function::addNameToEnvironment(filc::environment::Environment *environment) const -> void {
+        environment->addName(_name->getName(), getExpressionType());
+    }
 }
diff --git a/src/lib/ast/Identifier.cpp b/src/lib/ast/Identifier.cpp
@@ -50,4 +50,8 @@ namespace filc::ast {
             setExpressionType(name->getType());
         }
     }
+
+    auto Identifier::addNameToEnvironment(filc::environment::Environment *environment) const -> void {
+        environment->addName(_name, getExpressionType());
+    }
 }
diff --git a/src/lib/ast/Lambda.cpp b/src/lib/ast/Lambda.cpp
@@ -54,7 +54,7 @@ namespace filc::ast {
     auto Lambda::resolveType(filc::environment::Environment *environment,
                              filc::message::MessageCollector *collector,
                              AbstractType *preferred_type) -> void {
-        _body_environment = new filc::environment::Environment(environment);
+        _body_environment = new filc::environment::Environment("", environment);
 
         std::vector<AbstractType *> parameters_types;
         for (const auto &parameter: _parameters) {

diff --git a/src/lib/ast/Program.cpp b/src/lib/ast/Program.cpp
@@ -68,13 +68,35 @@ namespace filc::ast {
         }
     }
 
-    auto Program::resolveEnvironment(filc::message::MessageCollector *collector) -> void {
-        _environment = new filc::environment::Environment(filc::environment::Environment::getGlobalEnvironment());
+    auto Program::resolveEnvironment(filc::message::MessageCollector *collector,
+                                     const std::map<const std::string, Program *> &modules) -> void {
+        const auto *parent = filc::environment::Environment::getGlobalEnvironment();
+        for (const auto &item: _imports) {
+            auto module = modules.find(item);
+            if (module == modules.end()) {
+                throw std::logic_error("Module " + item + " not found");
+            }
 
-        // TODO : add imports env to _environment
+            parent = module->second->getPublicEnvironment(parent);
+        }
+
+        _environment = new filc::environment::Environment(_module, parent);
 
         for (const auto &expression: _expressions) {
             expression->resolveType(_environment, collector);
         }
     }
+
+    auto Program::getPublicEnvironment(const filc::environment::Environment *parent) const
+    -> filc::environment::Environment * {
+        auto *environment = new filc::environment::Environment(_module, parent);
+
+        for (const auto &expression: _expressions) {
+            if (expression->isExported()) {
+                expression->addNameToEnvironment(environment);
+            }
+        }
+
+        return environment;
+    }
 }
diff --git a/src/lib/ast/VariableDeclaration.cpp b/src/lib/ast/VariableDeclaration.cpp
@@ -85,4 +85,8 @@ namespace filc::ast {
         environment->addName(_identifier->getName(), _type);
         setExpressionType(_type);
     }
+
+    auto VariableDeclaration::addNameToEnvironment(filc::environment::Environment *environment) const -> void {
+        environment->addName(_identifier->getName(), getExpressionType());
+    }
 }