Merge pull request #24 from zourenDevote/develop

feat/test: 完善循环，条件语句翻译，实现多维数组结构, 添加测试用例
zourenDevote · Sep 5, 2023 · e0cee4a · e0cee4a
2 parents 8617bc2 + 9e8c002
commit e0cee4a
Show file tree

Hide file tree

Showing 32 changed files with 365 additions and 182 deletions.
diff --git a/include/ast.h b/include/ast.h
@@ -337,7 +337,6 @@ class VariableAST : public IdDefAST {
     unsigned VarFlag;                       // the flag that record the variable message
     std::vector<ExprAST *> Dims;            // the dimensions record of the variable
     ExprAST *InitExpr = nullptr;            // the init expr of the variable
-
 public:
     INSERT_ACCEPT
 };
@@ -674,7 +673,7 @@ class NumberExprAST : public ExprAST {
 
     char    CValue;
     bool    BValue;
-    long    LValue;
+    long long    LValue;
     double  DValue;
 
 public:
@@ -683,7 +682,7 @@ class NumberExprAST : public ExprAST {
 
 public: 
     explicit NumberExprAST(const LineNo&, ASTBase*, char);
-    explicit NumberExprAST(const LineNo&, ASTBase*, long);
+    explicit NumberExprAST(const LineNo&, ASTBase*, long long);
     explicit NumberExprAST(const LineNo&, ASTBase*, double);
     explicit NumberExprAST(const LineNo&, ASTBase*, bool);
 
@@ -695,8 +694,8 @@ class NumberExprAST : public ExprAST {
     bool            isChar          () { return IsChar; }
     bool            isSigned        () { return IsSigned; }
     char            getCValue    () { return CValue; }
-    long            getIValue    () { return LValue; }
-    unsigned long   getUIValue   () { return (unsigned long)LValue; }
+    long long          getIValue    () { return LValue; }
+    unsigned long long   getUIValue   () { return (unsigned long long)LValue; }
     double          getFValue  () { return DValue; }
     bool            getBoolValue    () { return BValue; }
 
@@ -768,6 +767,7 @@ class CallExprAST : public ExprAST {
     FuncAST               *TheCallFunction = nullptr;          // 对应的FuncAST的定义
     const std::string      FuncName;                           // 函数名
     std::vector<ExprAST *> Args;
+    bool                   IsCallStd;                          // flag to call std function
 public:
     explicit CallExprAST(const LineNo&, ASTBase*, const std::string&);
 
@@ -777,10 +777,12 @@ class CallExprAST : public ExprAST {
 
     void setFunction    (FuncAST *func)     { this->TheCallFunction = func; }
     void addArg         (ExprAST *arg)      { Args.push_back(arg); }
+    void setIsCallStd   (bool flag)         { IsCallStd = flag; }
 
     const std::vector<ExprAST*> &getArgs()          const    { return this->Args; }
     const std::string           &getName()          const    { return this->FuncName; }
     bool                         isArgEmpty()       const    { return this->Args.empty(); }
+    bool                         isCallStd()        const    { return this->IsCallStd; }
     llvm::Function              *getLLVMFunction();
     FuncAST                     *getFuncDef()                { return TheCallFunction; }
 

diff --git a/include/global_variable.h b/include/global_variable.h
@@ -4,6 +4,7 @@
 
 #include <vector>
 #include <string>
+#include <unordered_set>
 #include "ast.h"
 #include "llvm/IR/Module.h"
 
@@ -55,6 +56,8 @@ extern bool OnlyPrintIR;
 
 #endif
 
+extern std::unordered_set<std::string> StdFunctionSet;
+
 }
 
 #endif 
diff --git a/include/ir_builder.h b/include/ir_builder.h
@@ -22,6 +22,7 @@ class KaleIRBuilder: public AstVisitor {
     llvm::IRBuilder<>   *TheIRBuilder;
     llvm::Function      *CurFunc;
     llvm::BasicBlock    *CurBblk;
+    FuncAST             *CurFuncAst;
     ProgramAST          *Prog;
     bool                 IsRootScope;
     bool                 IsNeedPointer = false;
@@ -57,22 +58,24 @@ class KaleIRBuilder: public AstVisitor {
 private:
     llvm::FunctionType *getFunctionTypeByFuncASTNode(FuncAST *);
     llvm::Type         *getLLVMType(DataTypeAST *);
+    llvm::Type         *kaleTypeToLLVMType(KType ty);
+    llvm::Constant     *createConstantValue(llvm::Type *ty);
+
     long                getConstIntByExpr(ExprAST *expr);
-
     void                createAndSetCurrentFunc(const llvm::StringRef& name, llvm::FunctionType *ty);
     void                createAndSetCurrentBblk(const llvm::StringRef& name);
-    llvm::Constant     *createConstantValue(llvm::Type *ty);
     void                storeValueToPointer(llvm::Value *lv, llvm::Value *rv);
     void                typeConvert(llvm::Value *&lv, llvm::Value *&rv);
     void                convertToAimType(llvm::Type *t1);
     void                convertToI1();
-    llvm::Type         *kaleTypeToLLVMType(KType ty);
-
+    void                generateStdFuncCall(CallExprAST *node);
 private:
     static std::unordered_map<ProgramAST *, KaleIRBuilder *> ProgToIrBuilderMap;
-
+    static std::unordered_map<std::string, std::vector<KType>> StdKaleFuncTypeMap;
+    static std::unordered_map<std::string, llvm::FunctionType*> StdLLVMFuncTypeMap;
 public:
     static KaleIRBuilder *getOrCreateIrBuilderByProg(ProgramAST *prog);
+    static void initStdFunctionTypeMap();
 };
 
 }

diff --git a/include/parser.h b/include/parser.h
@@ -20,7 +20,7 @@ class TokenParser {
 private:
     LineNo LineInfo;    
     double DoubleNumVal;
-    long IntNumVal;
+    long long IntNumVal;
     std::string LiteralVal;
     std::string IdStr;
     int LastChar;
@@ -36,7 +36,7 @@ class TokenParser {
 
     LineNo getCurLineNo() const { return LineInfo; }
     double getDoubleVal() const { return DoubleNumVal; }
-    long   getIntVal()    const { return IntNumVal; }
+    long long getIntVal()    const { return IntNumVal; }
     const std::string& getIdStr() const { return IdStr; }
     const std::string& getLiteral() const { return LiteralVal; }
     bool   isSigned() { return IsSigned; }

diff --git a/kale_std/CMakeLists.txt b/kale_std/CMakeLists.txt
@@ -3,3 +3,7 @@ project(kale_std)
 
 add_library(${PROJECT_NAME}
             kaleidoscope_std.c)
+
+add_executable(kale_std_test test.c)
+
+target_link_libraries(kale_std_test kale_std)
diff --git a/kale_std/kaleidoscope_std.c b/kale_std/kaleidoscope_std.c
@@ -1,6 +1,7 @@
 
 #include "kaleidoscope_std.h"
 #include <stdio.h>
+#include <stdarg.h>
 
 /// @brief kaleidoscope 标准库函数 获取整型变量，获取浮点变量
 /// @return 
@@ -17,24 +18,18 @@ double GetDouble() {
 }
 
 /// @brief kaleidoscope 标准库函数 打印整型变量，打印浮点变量，换行, 空格
-void PutInt(int v) {
-    printf("%d", v);
+void Print(const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    vprintf(format, args);
+    va_end(args);
 }
 
-void PutDouble(double v) {
-    printf("%f", v);
-}
-
-void NewLine() {
+void PrintLn(const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    vprintf(format, args);
+    va_end(args);
     printf("\n");
 }
 
-void Space() {
-    printf(" ");
-}
-
-void PutChar(int v) {
-    char c = (char)v;
-    printf("%c", c);
-}
-
diff --git a/kale_std/kaleidoscope_std.h b/kale_std/kaleidoscope_std.h
@@ -8,11 +8,11 @@ int GetInt();
 double GetDouble();
 
 /// @brief kaleidoscope 标准库函数 打印整型变量，打印浮点变量，换行, 空格
-void PutInt(int);
-void PutDouble(double);
-void NewLine();
-void Space();
-void PutChar(int);
+
+void Print(const char *s, ...);
+void PrintLn(const char *s, ...);
+
+
 #endif
 
 
diff --git a/kale_std/test.c b/kale_std/test.c
@@ -0,0 +1,11 @@
+//
+// Created by 20580 on 2023/9/3.
+//
+
+#include "kaleidoscope_std.h"
+
+int main() {
+    Print("Hello, World %d, %d\n", 10, 20);
+    PrintLn("Hello, World %d, %d", 10, 20);
+    return 0;
+}
diff --git a/src/ast.cpp b/src/ast.cpp
@@ -192,7 +192,7 @@ NumberExprAST::NumberExprAST(const LineNo &lineNo, ASTBase *parent, char v) : Ex
     this->IsChar = true;
 }
 
-NumberExprAST::NumberExprAST(const LineNo &lineNo, ASTBase *parent, long v) : ExprAST(lineNo, parent) {
+NumberExprAST::NumberExprAST(const LineNo &lineNo, ASTBase *parent, long long v) : ExprAST(lineNo, parent) {
     this->LValue = v;
     this->IsLong = true;
 }
@@ -224,6 +224,7 @@ IdIndexedRefAST::IdIndexedRefAST(const LineNo &lineNo, ASTBase *parent, const st
 /// CallExprAST define code
 CallExprAST::CallExprAST(const LineNo &lineNo, ASTBase *parent, const std::string& name) : ExprAST(lineNo, parent), FuncName(name){
     TheCallFunction = nullptr;
+    IsCallStd = false;
 }
 
 llvm::Function *CallExprAST::getLLVMFunction() {

diff --git a/src/global_variable.cpp b/src/global_variable.cpp
@@ -1,6 +1,7 @@
 
 #include "global_variable.h"
 #include "llvm/IR/Module.h"
+#include <unordered_set>
 
 namespace kale {
 
@@ -46,6 +47,14 @@ bool OnlyParse = false;
 bool OnlyPrintIR = false;
 bool OnlyPrintAST = false;
 
+/// T ==> Std Function map
+std::unordered_set<std::string> StdFunctionSet = {
+        "Print",
+        "PrintLn",
+        "GetInt",
+        "GetDouble",
+};
+
 #endif
 
 }