完成了while语句，并添加了测试文件夹

Author: Whu-MT

AST.h

@@ -174,10 +174,6 @@ static AllocaInst *CreateEntryBlockAlloca(Function *TheFunction,
 
 		const std::string &getName() const { return Name; }
 
-		/*
-		* 待重构：VSL 中不需要 PrototypeAST
-		* VSL 中的函数声明必须要带函数体，所以没有必要将 Prototype 分离出来
-		*/
 		Function * codegen() {
 			//不允许函数重定义
 			Function *TheFunction = TheModule->getFunction(Name);
@@ -411,9 +407,6 @@ static AllocaInst *CreateEntryBlockAlloca(Function *TheFunction,
 			std::unique_ptr<StatAST> Body)
 			: Proto(std::move(Proto)), Body(std::move(Body)) {}
 
-		/*
-		* 待重构：如上
-		*/
 		Function * codegen() {
 			//可在当前模块中获取任何先前声明的函数的函数声明
 			auto &P = *Proto;
@@ -500,12 +493,45 @@ static AllocaInst *CreateEntryBlockAlloca(Function *TheFunction,
 			:funcs(std::move(funcs)) {}
 	};
 
+	class WhileStatAST:public StatAST{
+		std::unique_ptr<StatAST> Expr, Stat;
+	public:
+		WhileStatAST(std::unique_ptr<StatAST> Expr, std::unique_ptr<StatAST> Stat):
+			Expr(std::move(Expr)), Stat(std::move(Stat)){}
+		
+		Value *codegen()
+		{
+			Function *TheFunction = Builder.GetInsertBlock()->getParent();
+			BasicBlock *LoopBB = BasicBlock::Create(TheContext, "loop", TheFunction);
+			BasicBlock *AfterBB = BasicBlock::Create(TheContext, "afterLoop", TheFunction);
+
+			Value *EndCond = Expr->codegen();
+			if(!EndCond)
+				return nullptr;
+			EndCond = Builder.CreateICmpNE(EndCond, Builder.getInt32(0),
+					"loopCondIn");
+			Builder.CreateCondBr(EndCond, LoopBB, AfterBB);
+
+			Builder.SetInsertPoint(LoopBB);
+			Value *inLoopVal = Stat->codegen();
+			if(!inLoopVal)
+				return nullptr;
+			EndCond = Builder.CreateICmpNE(Expr->codegen(), 
+				Builder.getInt32(0), "loopCondOut");
+			Builder.CreateCondBr(EndCond, LoopBB, AfterBB);
+
+			Builder.SetInsertPoint(AfterBB);
+
+			return Builder.getInt32(0);
+		}
+	};
+
 
 	//创建和初始化模块和传递管理器
 	static void InitializeModuleAndPassManager() {
 
 		// Open a new module.
-		TheModule = llvm::make_unique<Module>("my cool jit", TheContext);
+		TheModule = llvm::make_unique<Module>("VSL jit", TheContext);
 		TheModule->setDataLayout(TheJIT->getTargetMachine().createDataLayout());
 
 		// Create a new pass manager attached to it.
@@ -547,18 +573,4 @@ static AllocaInst *CreateEntryBlockAlloca(Function *TheFunction,
 	#else
 	#define DLLEXPORT
 	#endif
-
-	// putchard - putchar that takes a double and returns 0.
-	extern "C" DLLEXPORT double putchard(double X) {
-		fputc((char)X, stderr);
-		return 0;
-	}
-
-	// printd - printf that takes a double prints it as "%f\n", returning 0.
-	extern "C" DLLEXPORT double printd(double X) {
-		fprintf(stderr, "%f\n", X);
-		return 0;
-	}
-
-
 #endif

DesignDocs/.~l语法解析器设计文档.doc

@@ -34,6 +34,7 @@ enum Token
 
 static std::string IdentifierStr;
 static int NumberVal;
+static FILE *inputFile;
 
 /*
 *返回输入单词类型
@@ -44,14 +45,14 @@ static int gettok()
 
 	//过滤空格
 	while(isspace(LastChar))
-		LastChar = getchar();
+		LastChar = fgetc(inputFile);
 
 	//解析标识符:{lc_letter}({lc_letter}|{digit})*
 	if(isalpha(LastChar))
 	{
 		IdentifierStr = "";
 		IdentifierStr += LastChar;
-		while(isalnum((LastChar = getchar())))
+		while (isalnum((LastChar = fgetc(inputFile))))
 			IdentifierStr += LastChar;
 
 		if(IdentifierStr == "FUNC")
@@ -88,7 +89,7 @@ static int gettok()
 		std::string NumStr;
 		do{
 			NumStr += LastChar;
-			LastChar = getchar();
+			LastChar = fgetc(inputFile);
 		}while(isdigit(LastChar));
 
 		NumberVal = atoi(NumStr.c_str());
@@ -98,11 +99,11 @@ static int gettok()
 
 	//解析注释:"//".*
 	if(LastChar == '/')
-        if((LastChar = getchar()) == '/')
-        {
+		if ((LastChar = fgetc(inputFile)) == '/')
+		{
             do
-                LastChar = getchar();
-            while(LastChar != EOF && LastChar != '\n' && LastChar != '\r');
+				LastChar = fgetc(inputFile);
+			while(LastChar != EOF && LastChar != '\n' && LastChar != '\r');
 
             //若未到达结尾，返回下一个输入类型
             if(LastChar != EOF)
@@ -112,23 +113,23 @@ static int gettok()
         }
 
 	//赋值符号
-	if(LastChar == ':' && (LastChar = getchar()) == '=')
+	if (LastChar == ':' && (LastChar = fgetc(inputFile)) == '=')
 	{
-		LastChar = getchar();	//获取下一个字符
+		LastChar = fgetc(inputFile); //获取下一个字符
 		return ASSIGN_SYMBOL;
 	}
 
 	//TEXT
 	if(LastChar == '\"')
 	{
         IdentifierStr = "";
-        LastChar = getchar();
-        do
+		LastChar = fgetc(inputFile);
+		do
 		{
             if(LastChar == '\\')
             {
-                LastChar = getchar();
-                if(LastChar == 'n')
+				LastChar = fgetc(inputFile);
+				if(LastChar == 'n')
                     LastChar = '\n';
                 else if(LastChar == 't')
                     LastChar = '\t';
@@ -138,27 +139,27 @@ static int gettok()
                     IdentifierStr += '\\';
             }
 			IdentifierStr += LastChar;
-			LastChar = getchar();
+			LastChar = fgetc(inputFile);
 		}while(LastChar != '\"');
-		LastChar = getchar();
+		LastChar = fgetc(inputFile);
 		return TEXT;
 	}
 
 	if(LastChar == '\\')
     {
         int tmp;
-        LastChar = getchar();
-        if(LastChar == 'n')
+		LastChar = fgetc(inputFile);
+		if(LastChar == 'n')
             tmp = '\n';
         else if(LastChar == 't')
             tmp = '\t';
         else if(LastChar == 'r')
             tmp = '\r';
         else
             return '\\';
-        LastChar = getchar();
+		LastChar = fgetc(inputFile);
 
-        return tmp;
+		return tmp;
     }
 
 	//文档结束标志
@@ -167,7 +168,7 @@ static int gettok()
 
 	//以上情况均不满足，直接返回当前字符
 	int tmpChar = LastChar;
-	LastChar = getchar();
+	LastChar = fgetc(inputFile);
 
 	return tmpChar;
 }

Lexer.h

@@ -209,7 +209,7 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
 	return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames));
 }
 
-//function ::= FUNC prototype '{' statement '}'
+//function ::= FUNC VARIABLE '(' parameter_lst ')' statement
 static std::unique_ptr<FunctionAST> ParseFunc()
 {
 	getNextToken(); // eat FUNC.
@@ -337,7 +337,32 @@ static std::unique_ptr<StatAST> ParseAssStat() {
 	return llvm::make_unique<AssStatAST>(std::move(NameV), std::move(Expression));
 }
 
-static std::unique_ptr<StatAST> ParseStatement() {
+//解析while语句
+static std::unique_ptr<StatAST> ParseWhileStat()
+{
+	getNextToken();//eat WHILE
+
+	auto E = ParseExpression();
+	if(!E)
+		return nullptr;
+	
+	if(CurTok != DO)
+		return LogErrorS("expect DO in WHILE statement");
+	getNextToken();//eat DO
+
+	auto S = ParseStatement();
+	if(!S)
+	return nullptr;
+
+	if(CurTok != DONE)
+		return LogErrorS("expect DONE in WHILE statement");
+	getNextToken();//eat DONE
+
+	return llvm::make_unique<WhileStatAST>(std::move(E), std::move(S));
+}
+
+static std::unique_ptr<StatAST> ParseStatement()
+{
 	switch (CurTok) {
 		case IF:
 			return ParseIfStat();
@@ -349,6 +374,9 @@ static std::unique_ptr<StatAST> ParseStatement() {
 		case VAR:
 			return ParseDec();
 			break;
+		case WHILE:
+			return ParseWhileStat();
+			break;
 		default:
 			auto E = ParseAssStat();
 			return E;
@@ -440,27 +468,9 @@ static void HandleTopLevelExpression() {
 	}
 }
 
-//program ::= definition | expression
+//program ::= function_list
 static void MainLoop() {
-
-	while (true) {
-		fprintf(stderr, "ready> ");
-		switch (CurTok) {
-			case ';': // ignore top-level semicolons.
-				getNextToken();
-				break;
-			case TOK_EOF:
-				return;
-			case FUNC:
-		 		HandleFuncDefinition();
-				break;
-			case VAR:
-
-			default:
-				HandleTopLevelExpression();
-				break;
-		}
-	}
-
+	while(CurTok != TOK_EOF)
+		HandleFuncDefinition();
 }
 #endif

Parser.h

@@ -1,3 +1,5 @@
+#include <cstdio>
+#include <cstdlib>
 #include "Lexer.h"
 #include "AST.h"
 #include "Parser.h"
@@ -9,32 +11,43 @@
 #include "../include/KaleidoscopeJIT.h"
 #endif
 
+void usage()
+{
+    printf("usage:./VSL file\n");
 
-int main() {
-  InitializeNativeTarget();
-  InitializeNativeTargetAsmPrinter();
-  InitializeNativeTargetAsmParser();
+    exit(EXIT_FAILURE);
+}
+
+int main(int argc, char *argv[]) {
+    if(argc != 2)
+        usage();
+    inputFile = fopen(argv[1], "r");
+    if(!inputFile){
+        printf("%s open error!\n", argv[0]);
+        exit(EXIT_FAILURE);
+    }
 
-  BinopPrecedence['+'] = 10;
-  BinopPrecedence['-'] = 10;
-  BinopPrecedence['*'] = 40;
-  BinopPrecedence['/'] = 40;
+    InitializeNativeTarget();
+    InitializeNativeTargetAsmPrinter();
+    InitializeNativeTargetAsmParser();
 
-  // Prime the first token.
-  fprintf(stderr, "ready> ");
-  getNextToken();
+    BinopPrecedence['+'] = 10;
+    BinopPrecedence['-'] = 10;
+    BinopPrecedence['*'] = 40;
+    BinopPrecedence['/'] = 40;
 
-  // Make the module, which holds all the code.
-  //TheModule = new Module("my cool jit", TheContext);
+    // Make the module, which holds all the code.
+    //TheModule = new Module("my cool jit", TheContext);
 
-  TheJIT = llvm::make_unique<KaleidoscopeJIT>();
-  InitializeModuleAndPassManager();
+    TheJIT = llvm::make_unique<KaleidoscopeJIT>();
+    InitializeModuleAndPassManager();
 
-  // Run the main "interpreter loop" now.
-  MainLoop();
+    // Run the main "interpreter loop" now.
+    getNextToken();
+    MainLoop();
 
-  // Print out all of the generated code.
-  TheModule->print(errs(), nullptr);
+    // Print out all of the generated code.
+    //TheModule->print(errs(), nullptr);
 
-  return 0;
+    return 0;
 }

main.cpp

@@ -0,0 +1 @@
+/home/mt/作业/解释器构造实践/VSL/bin/Debug/VSL

tests/VSL

@@ -0,0 +1,2 @@
+FUNC a(x)
+	x := 2

tests/t_assign.VSL

@@ -0,0 +1,7 @@
+FUNC a()
+{
+	VAR a
+	a := 2
+
+	RETURN a
+}