Manager修改module

src/Tools/Managers/ClassManager.cpp

@@ -1,19 +1,17 @@
-//
-// Created by wangz on 24-7-29.
-//
+module;
+#include <stdexcept>
+module Manager.ClassManager;
 
-#include "ClassManager.h"
-
-namespace Riddle{
+namespace Riddle {
     /// @brief 查找相关的类
-    ClassNode ClassManager::getClass(const std::string &name){
-        if (const auto it = Classes.find(name);it == Classes.end()) {
+    ClassNode ClassManager::getClass(const std::string &name) {
+        if(const auto it = Classes.find(name); it == Classes.end()) {
             throw std::logic_error("没有这个类或者使用了不支持的路径");
         }
         return Classes.find(name)->second;
     }
 
-    void ClassManager::createClass(const ClassNode &theClass){
-        Classes.emplace(theClass.get().types->getName().str(),theClass);
+    void ClassManager::createClass(const ClassNode &theClass) {
+        Classes.emplace(theClass.get().types->getName().str(), theClass);
     }
 } // namespace Riddle

src/Tools/Managers/ClassManager.h → src/Tools/Managers/ClassManger.ixx

@@ -1,26 +1,19 @@
-//
-// Created by wangz on 24-7-29.
-//
-
-#ifndef RIDDLE_LANGUAGE_CLASSMANAGER_H
-#define RIDDLE_LANGUAGE_CLASSMANAGER_H
+module;
 #include <llvm/IR/IRBuilder.h>
-
+export module Manager.ClassManager;
 import Types.Class;
 import Types.ClassNode;
 
-namespace Riddle{
+export namespace Riddle {
     /// @brief 管理类
-    class ClassManager{
+    class ClassManager {
         /// @brief 存储数据字段
-        std::unordered_map<std::string,const ClassNode> Classes;
+        std::unordered_map<std::string, const ClassNode> Classes;
 
     public:
         ClassNode getClass(const std::string &name);
 
         // class 在进入该函数后则不可修改
         void createClass(const ClassNode &theClass);
     };
-} // namespace Riddle
-
-#endif//RIDDLE_LANGUAGE_CLASSMANAGER_H
+} // namespace Riddle

src/Tools/Managers/VarManager.cpp

@@ -1,5 +1,7 @@
-#include "VarManager.h"
+module;
 #include <stdexcept>
+#include <llvm/IR/Value.h>
+module Manager.VarManager;
 
 namespace Riddle {
     bool VarManager::isDefined(const std::string &name) {
@@ -12,16 +14,16 @@ namespace Riddle {
         Defined.emplace();
     }
     void VarManager::pop() {
-        for(auto i: Defined.top()) {
-            NamedVar[i.first].pop();
-            if(NamedVar[i.first].empty()) {
-                NamedVar.erase(i.first);
+        for(auto [name, iDefined]: Defined.top()) {
+            NamedVar[name].pop();
+            if(NamedVar[name].empty()) {
+                NamedVar.erase(name);
             }
         }
         Defined.pop();
     }
     void VarManager::defineVar(const std::string &name, const bool &isConst, llvm::Value *value) {
-        if(Defined.top().count(name)) {
+        if(Defined.top().contains(name)) {
             throw std::logic_error("The variable has been defined multiple times");
         }
         NamedVar[name].push(Variable(name, value, isConst));

src/Tools/Managers/VarManager.h → src/Tools/Managers/VarManager.ixx

@@ -1,18 +1,18 @@
-#ifndef RIDDLE_LANGUAGE_VARMANAGER_H
-#define RIDDLE_LANGUAGE_VARMANAGER_H
-
+module;
 #include <llvm/IR/Value.h>
 #include <stack>
 #include <string>
 #include <unordered_map>
+export module Manager.VarManager;
+
 import Type.Variable;
-namespace Riddle {
+
+export namespace Riddle {
     class VarManager {
-    private://成员区
+        //成员区
         std::unordered_map<std::string, std::stack<Variable>> NamedVar;
         std::stack<std::unordered_map<std::string, bool>> Defined;
 
-    private:
         bool isDefined(const std::string &name);
 
     public://函数区
@@ -35,6 +35,4 @@ namespace Riddle {
         [[nodiscard]] bool isGlobal()const;
     };
 
-}// namespace Riddle
-
-#endif//RIDDLE_LANGUAGE_VARMANAGER_H
+}// namespace Riddle

src/Types/Variable.ixx

@@ -4,7 +4,6 @@ module;
 #include <utility>
 export module Type.Variable;
 export namespace Riddle {
-    const std::string Null = "null";
     class Variable {
     public:
         const std::string name;

src/Visitors/GenVisitor.h

@@ -8,7 +8,8 @@
 #include <llvm/IR/LLVMContext.h>
 #include <variant>
 
-#include "Tools/Managers/ClassManager.h"
+import Types.ClassNode;
+import Manager.ClassManager;
 
 namespace Riddle {
     /// @brief 用于实现生成 IR 的类