⚡ fix(Gen): 修复对类的调用可能会炸

wangziwenhk · Aug 9, 2024 · 3bdc6fa · 3bdc6fa
1 parent b03300a
commit 3bdc6fa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/src/Setup.h b/src/Setup.h
@@ -9,7 +9,7 @@
 
 namespace Riddle {
     typedef std::unordered_map<std::string, std::unordered_map<std::string, std::function<llvm::Value *(llvm::IRBuilder<> &, llvm::Value *)>>> castMapTy;
-    typedef std::unordered_map<std::string, std::unordered_map<llvm::Type *, std::pmr::unordered_map<llvm::Type *, std::function<llvm::Value *(llvm::IRBuilder<> &, llvm::Value *, llvm::Value *)>>>> binaryOpMapTeleTy;
+    typedef std::unordered_map<std::string, std::unordered_map<llvm::Type *, std::unordered_map<llvm::Type *, std::function<llvm::Value *(llvm::IRBuilder<> &, llvm::Value *, llvm::Value *)>>>> binaryOpMapTeleTy;
     const static castMapTy castMapTemplate = {
             {"int",
              {

diff --git a/src/Tools/Managers/VarManager.cpp b/src/Tools/Managers/VarManager.cpp
@@ -2,13 +2,11 @@
 #include <stdexcept>
 
 namespace Riddle {
-    bool VarManager::isDefined(std::string name) {
-        auto it = NamedVar.find(name);
+    bool VarManager::isDefined(const std::string &name) {
+        const auto it = NamedVar.find(name);
         if(it == NamedVar.end()) return false;
-        else if(it->second.empty())
-            return false;
-        else
-            return true;
+        if(it->second.empty()) return false;
+        return true;
     }
     void VarManager::push() {
         Defined.emplace();

diff --git a/src/Tools/Managers/VarManager.h b/src/Tools/Managers/VarManager.h
@@ -12,7 +12,7 @@ namespace Riddle {
         std::stack<std::unordered_map<std::string, bool>> Defined;
 
     private:
-        bool isDefined(std::string name);
+        bool isDefined(const std::string &name);
 
     public://函数区
         VarManager() = default;

diff --git a/src/Visitors/GenVisitor.cpp b/src/Visitors/GenVisitor.cpp
@@ -80,7 +80,7 @@ namespace Riddle {
             const auto type = any_cast<llvm::Type *>(visit(ctx->returnType));
             resultType = type;
         }
-        if(isClassDefine(ParentStack.top())) {
+        if(ParentStack.size() && isClassDefine(ParentStack.top())) {
             args.names.insert(args.names.begin(), "this");
             args.types.insert(args.types.begin(), std::get<ClassNode>(ParentStack.top()).get().types);
         }
@@ -93,7 +93,7 @@ namespace Riddle {
         llvm::BasicBlock *oldBlock = Builder.GetInsertBlock();
         Builder.SetInsertPoint(entry);
         // 对于类中方法的定义
-        if(isClassDefine(ParentStack.top())) {
+        if(ParentStack.size() && isClassDefine(ParentStack.top())) {
             const auto theClass = std::get<ClassNode>(ParentStack.top());
             theClass.get().funcs[ctx->funcName->getText()] = module->getOrInsertFunction(funcPkgName, funcType);
         } else {