Set Handle Error Logic

fly-lang · Apr 26, 2024 · fc666b4 · fc666b4
1 parent 5333184
commit fc666b4
Show file tree

Hide file tree

Showing 42 changed files with 661 additions and 685 deletions.
diff --git a/include/AST/ASTBlock.h b/include/AST/ASTBlock.h
@@ -76,8 +76,6 @@ namespace fly {
 
     public:
 
-        ASTFunctionBase *getTop() const;
-
         ASTBlockKind getBlockKind() const;
 
         const std::vector<ASTStmt *> &getContent() const;

diff --git a/include/AST/ASTCall.h b/include/AST/ASTCall.h
@@ -25,10 +25,15 @@ namespace fly {
     class ASTArg;
     class ASTCallExpr;
     class ASTVar;
+    class ASTError;
 
     enum class ASTCallKind {
-        CALL_NORMAL,
-        CALL_NEW,
+        CALL_FUNCTION,
+        CALL_CONSTRUCTOR
+    };
+
+    enum class ASTMemoryKind {
+        CALL_MANAGED,
         CALL_UNIQUE,
         CALL_SHARED,
         CALL_WEAK
@@ -44,24 +49,32 @@ namespace fly {
         friend class SemaBuilder;
         friend class SemaResolver;
 
+        ASTError *ErrorHandler = nullptr;
+
         std::vector<ASTArg *> Args;
 
         ASTFunctionBase *Def = nullptr;
 
-        ASTCallKind CallKind = ASTCallKind::CALL_NORMAL;
+        ASTCallKind CallKind = ASTCallKind::CALL_FUNCTION;
+
+        ASTMemoryKind MemoryKind = ASTMemoryKind::CALL_MANAGED;
 
         ASTCall(const SourceLocation &Loc, llvm::StringRef Name);
 
         ASTCall(ASTFunctionBase *Function);
 
     public:
 
+        const ASTError *getErrorHandler() const;
+
         const std::vector<ASTArg *> getArgs() const;
 
         ASTFunctionBase *getDef() const;
 
         ASTCallKind getCallKind() const;
 
+        ASTMemoryKind getMemoryKind() const;
+
         std::string str() const;
     };
 

diff --git a/include/AST/ASTError.h b/include/AST/ASTError.h
diff --git a/include/AST/ASTExpr.h b/include/AST/ASTExpr.h
@@ -106,7 +106,7 @@ namespace fly {
 
     public:
 
-        virtual ASTType *getType() const;
+        ASTType *getType() const;
 
         ASTExprKind getExprKind() const;
 
@@ -160,8 +160,6 @@ namespace fly {
 
         ASTVarRef *getVarRef() const;
 
-        ASTType *getType() const override;
-
         std::string str() const override;
     };
 
@@ -181,8 +179,6 @@ namespace fly {
 
         ASTCall *getCall() const;
 
-        ASTType *getType() const override;
-
         std::string str() const override;
     };
 
@@ -204,8 +200,6 @@ namespace fly {
 
         virtual ASTExprGroupKind getGroupKind();
 
-        virtual ASTType *getType() const override = 0;
-
         std::string str() const;
     };
 
@@ -233,8 +227,6 @@ namespace fly {
 
         const ASTVarRefExpr *getFirst() const;
 
-        ASTType *getType() const override;
-
         std::string str() const override;
     };
 
@@ -268,8 +260,6 @@ namespace fly {
 
         const ASTExpr *getSecond() const;
 
-        ASTType *getType() const override;
-
         std::string str() const override;
     };
 
@@ -301,8 +291,6 @@ namespace fly {
 
         ASTTernaryOperatorKind getOperatorKind() const;
 
-        ASTType *getType() const override;
-
         const ASTExpr *getFirst() const;
 
         const ASTExpr *getSecond() const;

diff --git a/include/AST/ASTFailStmt.h b/include/AST/ASTFailStmt.h
@@ -15,13 +15,16 @@
 namespace fly {
 
     class ASTVarRef;
+    class ASTHandleStmt;
 
     class ASTFailStmt : public ASTStmt {
 
         friend class SemaBuilder;
 
         ASTExpr *Expr = nullptr;
 
+        ASTHandleStmt *Handle = nullptr;
+
         ASTFailStmt(ASTStmt *Parent, const SourceLocation &Loc);
 
     public:
@@ -30,6 +33,10 @@ namespace fly {
 
         void setExpr(ASTExpr *);
 
+        bool hasHandle();
+
+        ASTHandleStmt *getHandle();
+
         std::string str() const override;
     };
 }

diff --git a/include/AST/ASTFunctionBase.h b/include/AST/ASTFunctionBase.h
@@ -63,6 +63,8 @@ namespace fly {
         // Body is the main BlockStmt
         ASTBlock *Body = nullptr;
 
+        ASTParam *ErrorHandler = nullptr;
+
     protected:
 
         ASTFunctionBase(const SourceLocation &Loc, ASTFunctionKind Kind, ASTType *ReturnType, llvm::StringRef Name,
@@ -86,6 +88,10 @@ namespace fly {
 
         const ASTBlock *getBody() const;
 
+        void setErrorHandler(ASTParam *ErrorHandler);
+
+        ASTParam *getErrorHandler();
+
         virtual CodeGenFunctionBase *getCodeGen() const = 0;
 
         bool isVarArg();

diff --git a/include/AST/ASTHandleStmt.h b/include/AST/ASTHandleStmt.h
@@ -16,28 +16,35 @@
 namespace fly {
 
     class ASTVarRef;
+    class CodeGenHandle;
 
     class ASTHandleStmt : public ASTStmt {
 
         friend class SemaBuilder;
         friend class SemaResolver;
 
-        ASTVarRef *ErrorRef = nullptr;
+        ASTVarRef *ErrorHandlerRef = nullptr;
 
         ASTStmt *Handle = nullptr;
 
+        CodeGenHandle * CodeGen = nullptr;
+
         ASTHandleStmt(ASTStmt *Parent, const SourceLocation &Loc);
 
     public:
 
-        ASTVarRef *getErrorRef() const;
+        ASTVarRef *getErrorHandlerRef() const;
 
-        void setErrorRef(ASTVarRef *errorRef);
+        void setErrorHandlerRef(ASTVarRef *errorRef);
 
         ASTStmt *getHandle() const;
 
         void setHandle(ASTStmt *H);
 
+        CodeGenHandle *getCodeGen() const;
+
+        void setCodeGen(CodeGenHandle *codeGen);
+
         std::string str() const;
     };
 }

diff --git a/include/AST/ASTStmt.h b/include/AST/ASTStmt.h
@@ -29,6 +29,7 @@ namespace fly {
 
     class ASTExpr;
     class ASTBlock;
+    class ASTVar;
     class ASTFunctionBase;
 
     class ASTStmt : public ASTBase {
@@ -44,19 +45,21 @@ namespace fly {
 
         ASTStmtKind Kind;
 
-        bool HandleError = false;
+        ASTVar *ErrorHandler = nullptr;
 
         ASTStmt(ASTStmt *Parent, const SourceLocation &Loc, ASTStmtKind Kind);
 
     public:
 
         virtual ASTStmt *getParent() const;
 
+        ASTFunctionBase *getTop() const;
+
         ASTStmtKind getKind() const;
 
-        void setHandleError(bool HandleError);
+        void setErrorHandler(ASTVar *ErrorHandler);
 
-        bool isHandlerError();
+        ASTVar *getErrorHandler();
 
         virtual std::string str() const;
     };

diff --git a/include/AST/ASTVarRef.h b/include/AST/ASTVarRef.h
@@ -13,8 +13,6 @@
 
 #include "AST/ASTIdentifier.h"
 
-#include <string>
-
 namespace fly {
 
     class ASTVar;

diff --git a/include/CodeGen/CodeGenError.h b/include/CodeGen/CodeGenError.h
@@ -0,0 +1,57 @@
+//===--------------------------------------------------------------------------------------------------------------===//
+// include/CodeGen/CodeGenFail.h - Code Generator of Fail
+//
+// Part of the Fly Project https://flylang.org
+// Under the Apache License v2.0 see LICENSE for details.
+// Thank you to LLVM Project https://llvm.org/
+//
+//===--------------------------------------------------------------------------------------------------------------===//
+
+#ifndef FLY_CODEGEN_ERROR_H
+#define FLY_CODEGEN_ERROR_H
+
+#include "CodeGenVarBase.h"
+#include "llvm/IR/DerivedTypes.h"
+
+namespace fly {
+
+    class CodeGenModule;
+    class CodeGenFunctionBase;
+    class ASTExpr;
+    class ASTVar;
+
+    class CodeGenError : public CodeGenVarBase {
+
+        CodeGenModule *CGM = nullptr;
+
+        ASTVar *Error = nullptr;
+
+        llvm::Type *T = nullptr;
+
+        llvm::Value *Pointer = nullptr;
+
+    public:
+
+        CodeGenError(CodeGenModule *CGM, ASTVar *Error);
+
+        static llvm::StructType *GenErrorType(CodeGenModule *CGM);
+
+        void Init() override;
+
+        llvm::Type *getType();
+
+        llvm::StoreInst *Store(llvm::Value *Val) override;
+
+        llvm::LoadInst *Load() override;
+
+        llvm::Value *getValue() override;
+
+        llvm::Value *getPointer() override;
+
+        ASTVar *getVar() override;
+
+        void Store(ASTExpr *Expr);
+    };
+}
+
+#endif //FLY_CODEGEN_ERROR_H