Remove trailing whitespace from the old Orc Kaleidoscope examples.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247971 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames 2015-09-18 06:16:49 +00:00
parent bbbfd6aad1
commit fc85502bf6
4 changed files with 444 additions and 448 deletions

View File

@ -39,14 +39,14 @@ enum Token {
// primary // primary
tok_identifier = -4, tok_number = -5, tok_identifier = -4, tok_number = -5,
// control // control
tok_if = -6, tok_then = -7, tok_else = -8, tok_if = -6, tok_then = -7, tok_else = -8,
tok_for = -9, tok_in = -10, tok_for = -9, tok_in = -10,
// operators // operators
tok_binary = -11, tok_unary = -12, tok_binary = -11, tok_unary = -12,
// var definition // var definition
tok_var = -13 tok_var = -13
}; };
@ -95,11 +95,11 @@ static int gettok() {
// Comment until end of line. // Comment until end of line.
do LastChar = getchar(); do LastChar = getchar();
while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); while (LastChar != EOF && LastChar != '\n' && LastChar != '\r');
if (LastChar != EOF) if (LastChar != EOF)
return gettok(); return gettok();
} }
// Check for end of file. Don't eat the EOF. // Check for end of file. Don't eat the EOF.
if (LastChar == EOF) if (LastChar == EOF)
return tok_eof; return tok_eof;
@ -140,7 +140,7 @@ struct VariableExprAST : public ExprAST {
/// UnaryExprAST - Expression class for a unary operator. /// UnaryExprAST - Expression class for a unary operator.
struct UnaryExprAST : public ExprAST { struct UnaryExprAST : public ExprAST {
UnaryExprAST(char Opcode, std::unique_ptr<ExprAST> Operand) UnaryExprAST(char Opcode, std::unique_ptr<ExprAST> Operand)
: Opcode(std::move(Opcode)), Operand(std::move(Operand)) {} : Opcode(std::move(Opcode)), Operand(std::move(Operand)) {}
Value *IRGen(IRGenContext &C) const override; Value *IRGen(IRGenContext &C) const override;
@ -152,7 +152,7 @@ struct UnaryExprAST : public ExprAST {
/// BinaryExprAST - Expression class for a binary operator. /// BinaryExprAST - Expression class for a binary operator.
struct BinaryExprAST : public ExprAST { struct BinaryExprAST : public ExprAST {
BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS, BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS,
std::unique_ptr<ExprAST> RHS) std::unique_ptr<ExprAST> RHS)
: Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {} : Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {}
Value *IRGen(IRGenContext &C) const override; Value *IRGen(IRGenContext &C) const override;
@ -224,7 +224,7 @@ struct PrototypeAST {
bool isUnaryOp() const { return IsOperator && Args.size() == 1; } bool isUnaryOp() const { return IsOperator && Args.size() == 1; }
bool isBinaryOp() const { return IsOperator && Args.size() == 2; } bool isBinaryOp() const { return IsOperator && Args.size() == 2; }
char getOperatorName() const { char getOperatorName() const {
assert(isUnaryOp() || isBinaryOp()); assert(isUnaryOp() || isBinaryOp());
return Name[Name.size()-1]; return Name[Name.size()-1];
@ -268,7 +268,7 @@ static std::map<char, int> BinopPrecedence;
static int GetTokPrecedence() { static int GetTokPrecedence() {
if (!isascii(CurTok)) if (!isascii(CurTok))
return -1; return -1;
// Make sure it's a declared binop. // Make sure it's a declared binop.
int TokPrec = BinopPrecedence[CurTok]; int TokPrec = BinopPrecedence[CurTok];
if (TokPrec <= 0) return -1; if (TokPrec <= 0) return -1;
@ -294,12 +294,12 @@ static std::unique_ptr<ExprAST> ParseExpression();
/// ::= identifier '(' expression* ')' /// ::= identifier '(' expression* ')'
static std::unique_ptr<ExprAST> ParseIdentifierExpr() { static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
std::string IdName = IdentifierStr; std::string IdName = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
if (CurTok != '(') // Simple variable ref. if (CurTok != '(') // Simple variable ref.
return llvm::make_unique<VariableExprAST>(IdName); return llvm::make_unique<VariableExprAST>(IdName);
// Call. // Call.
getNextToken(); // eat ( getNextToken(); // eat (
std::vector<std::unique_ptr<ExprAST>> Args; std::vector<std::unique_ptr<ExprAST>> Args;
@ -319,7 +319,7 @@ static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
// Eat the ')'. // Eat the ')'.
getNextToken(); getNextToken();
return llvm::make_unique<CallExprAST>(IdName, std::move(Args)); return llvm::make_unique<CallExprAST>(IdName, std::move(Args));
} }
@ -336,7 +336,7 @@ static std::unique_ptr<ExprAST> ParseParenExpr() {
auto V = ParseExpression(); auto V = ParseExpression();
if (!V) if (!V)
return nullptr; return nullptr;
if (CurTok != ')') if (CurTok != ')')
return ErrorU<ExprAST>("expected ')'"); return ErrorU<ExprAST>("expected ')'");
getNextToken(); // eat ). getNextToken(); // eat ).
@ -346,29 +346,29 @@ static std::unique_ptr<ExprAST> ParseParenExpr() {
/// ifexpr ::= 'if' expression 'then' expression 'else' expression /// ifexpr ::= 'if' expression 'then' expression 'else' expression
static std::unique_ptr<ExprAST> ParseIfExpr() { static std::unique_ptr<ExprAST> ParseIfExpr() {
getNextToken(); // eat the if. getNextToken(); // eat the if.
// condition. // condition.
auto Cond = ParseExpression(); auto Cond = ParseExpression();
if (!Cond) if (!Cond)
return nullptr; return nullptr;
if (CurTok != tok_then) if (CurTok != tok_then)
return ErrorU<ExprAST>("expected then"); return ErrorU<ExprAST>("expected then");
getNextToken(); // eat the then getNextToken(); // eat the then
auto Then = ParseExpression(); auto Then = ParseExpression();
if (!Then) if (!Then)
return nullptr; return nullptr;
if (CurTok != tok_else) if (CurTok != tok_else)
return ErrorU<ExprAST>("expected else"); return ErrorU<ExprAST>("expected else");
getNextToken(); getNextToken();
auto Else = ParseExpression(); auto Else = ParseExpression();
if (!Else) if (!Else)
return nullptr; return nullptr;
return llvm::make_unique<IfExprAST>(std::move(Cond), std::move(Then), return llvm::make_unique<IfExprAST>(std::move(Cond), std::move(Then),
std::move(Else)); std::move(Else));
} }
@ -379,26 +379,26 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<ForExprAST>("expected identifier after for"); return ErrorU<ForExprAST>("expected identifier after for");
std::string IdName = IdentifierStr; std::string IdName = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
if (CurTok != '=') if (CurTok != '=')
return ErrorU<ForExprAST>("expected '=' after for"); return ErrorU<ForExprAST>("expected '=' after for");
getNextToken(); // eat '='. getNextToken(); // eat '='.
auto Start = ParseExpression(); auto Start = ParseExpression();
if (!Start) if (!Start)
return nullptr; return nullptr;
if (CurTok != ',') if (CurTok != ',')
return ErrorU<ForExprAST>("expected ',' after for start value"); return ErrorU<ForExprAST>("expected ',' after for start value");
getNextToken(); getNextToken();
auto End = ParseExpression(); auto End = ParseExpression();
if (!End) if (!End)
return nullptr; return nullptr;
// The step value is optional. // The step value is optional.
std::unique_ptr<ExprAST> Step; std::unique_ptr<ExprAST> Step;
if (CurTok == ',') { if (CurTok == ',') {
@ -407,11 +407,11 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
if (!Step) if (!Step)
return nullptr; return nullptr;
} }
if (CurTok != tok_in) if (CurTok != tok_in)
return ErrorU<ForExprAST>("expected 'in' after for"); return ErrorU<ForExprAST>("expected 'in' after for");
getNextToken(); // eat 'in'. getNextToken(); // eat 'in'.
auto Body = ParseExpression(); auto Body = ParseExpression();
if (Body) if (Body)
return nullptr; return nullptr;
@ -420,7 +420,7 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
std::move(Step), std::move(Body)); std::move(Step), std::move(Body));
} }
/// varexpr ::= 'var' identifier ('=' expression)? /// varexpr ::= 'var' identifier ('=' expression)?
// (',' identifier ('=' expression)?)* 'in' expression // (',' identifier ('=' expression)?)* 'in' expression
static std::unique_ptr<VarExprAST> ParseVarExpr() { static std::unique_ptr<VarExprAST> ParseVarExpr() {
getNextToken(); // eat the var. getNextToken(); // eat the var.
@ -430,7 +430,7 @@ static std::unique_ptr<VarExprAST> ParseVarExpr() {
// At least one variable name is required. // At least one variable name is required.
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<VarExprAST>("expected identifier after var"); return ErrorU<VarExprAST>("expected identifier after var");
while (1) { while (1) {
std::string Name = IdentifierStr; std::string Name = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
@ -439,31 +439,31 @@ static std::unique_ptr<VarExprAST> ParseVarExpr() {
std::unique_ptr<ExprAST> Init; std::unique_ptr<ExprAST> Init;
if (CurTok == '=') { if (CurTok == '=') {
getNextToken(); // eat the '='. getNextToken(); // eat the '='.
Init = ParseExpression(); Init = ParseExpression();
if (!Init) if (!Init)
return nullptr; return nullptr;
} }
VarBindings.push_back(VarExprAST::Binding(Name, std::move(Init))); VarBindings.push_back(VarExprAST::Binding(Name, std::move(Init)));
// End of var list, exit loop. // End of var list, exit loop.
if (CurTok != ',') break; if (CurTok != ',') break;
getNextToken(); // eat the ','. getNextToken(); // eat the ','.
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<VarExprAST>("expected identifier list after var"); return ErrorU<VarExprAST>("expected identifier list after var");
} }
// At this point, we have to have 'in'. // At this point, we have to have 'in'.
if (CurTok != tok_in) if (CurTok != tok_in)
return ErrorU<VarExprAST>("expected 'in' keyword after 'var'"); return ErrorU<VarExprAST>("expected 'in' keyword after 'var'");
getNextToken(); // eat 'in'. getNextToken(); // eat 'in'.
auto Body = ParseExpression(); auto Body = ParseExpression();
if (!Body) if (!Body)
return nullptr; return nullptr;
return llvm::make_unique<VarExprAST>(std::move(VarBindings), std::move(Body)); return llvm::make_unique<VarExprAST>(std::move(VarBindings), std::move(Body));
} }
@ -493,7 +493,7 @@ static std::unique_ptr<ExprAST> ParseUnary() {
// If the current token is not an operator, it must be a primary expr. // If the current token is not an operator, it must be a primary expr.
if (!isascii(CurTok) || CurTok == '(' || CurTok == ',') if (!isascii(CurTok) || CurTok == '(' || CurTok == ',')
return ParsePrimary(); return ParsePrimary();
// If this is a unary operator, read it. // If this is a unary operator, read it.
int Opc = CurTok; int Opc = CurTok;
getNextToken(); getNextToken();
@ -509,21 +509,21 @@ static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
// If this is a binop, find its precedence. // If this is a binop, find its precedence.
while (1) { while (1) {
int TokPrec = GetTokPrecedence(); int TokPrec = GetTokPrecedence();
// If this is a binop that binds at least as tightly as the current binop, // If this is a binop that binds at least as tightly as the current binop,
// consume it, otherwise we are done. // consume it, otherwise we are done.
if (TokPrec < ExprPrec) if (TokPrec < ExprPrec)
return LHS; return LHS;
// Okay, we know this is a binop. // Okay, we know this is a binop.
int BinOp = CurTok; int BinOp = CurTok;
getNextToken(); // eat binop getNextToken(); // eat binop
// Parse the unary expression after the binary operator. // Parse the unary expression after the binary operator.
auto RHS = ParseUnary(); auto RHS = ParseUnary();
if (!RHS) if (!RHS)
return nullptr; return nullptr;
// If BinOp binds less tightly with RHS than the operator after RHS, let // If BinOp binds less tightly with RHS than the operator after RHS, let
// the pending operator take RHS as its LHS. // the pending operator take RHS as its LHS.
int NextPrec = GetTokPrecedence(); int NextPrec = GetTokPrecedence();
@ -532,7 +532,7 @@ static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
if (!RHS) if (!RHS)
return nullptr; return nullptr;
} }
// Merge LHS/RHS. // Merge LHS/RHS.
LHS = llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS)); LHS = llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS));
} }
@ -545,7 +545,7 @@ static std::unique_ptr<ExprAST> ParseExpression() {
auto LHS = ParseUnary(); auto LHS = ParseUnary();
if (!LHS) if (!LHS)
return nullptr; return nullptr;
return ParseBinOpRHS(0, std::move(LHS)); return ParseBinOpRHS(0, std::move(LHS));
} }
@ -555,10 +555,10 @@ static std::unique_ptr<ExprAST> ParseExpression() {
/// ::= unary LETTER (id) /// ::= unary LETTER (id)
static std::unique_ptr<PrototypeAST> ParsePrototype() { static std::unique_ptr<PrototypeAST> ParsePrototype() {
std::string FnName; std::string FnName;
unsigned Kind = 0; // 0 = identifier, 1 = unary, 2 = binary. unsigned Kind = 0; // 0 = identifier, 1 = unary, 2 = binary.
unsigned BinaryPrecedence = 30; unsigned BinaryPrecedence = 30;
switch (CurTok) { switch (CurTok) {
default: default:
return ErrorU<PrototypeAST>("Expected function name in prototype"); return ErrorU<PrototypeAST>("Expected function name in prototype");
@ -584,7 +584,7 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
FnName += (char)CurTok; FnName += (char)CurTok;
Kind = 2; Kind = 2;
getNextToken(); getNextToken();
// Read the precedence if present. // Read the precedence if present.
if (CurTok == tok_number) { if (CurTok == tok_number) {
if (NumVal < 1 || NumVal > 100) if (NumVal < 1 || NumVal > 100)
@ -594,23 +594,23 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
} }
break; break;
} }
if (CurTok != '(') if (CurTok != '(')
return ErrorU<PrototypeAST>("Expected '(' in prototype"); return ErrorU<PrototypeAST>("Expected '(' in prototype");
std::vector<std::string> ArgNames; std::vector<std::string> ArgNames;
while (getNextToken() == tok_identifier) while (getNextToken() == tok_identifier)
ArgNames.push_back(IdentifierStr); ArgNames.push_back(IdentifierStr);
if (CurTok != ')') if (CurTok != ')')
return ErrorU<PrototypeAST>("Expected ')' in prototype"); return ErrorU<PrototypeAST>("Expected ')' in prototype");
// success. // success.
getNextToken(); // eat ')'. getNextToken(); // eat ')'.
// Verify right number of names for operator. // Verify right number of names for operator.
if (Kind && ArgNames.size() != Kind) if (Kind && ArgNames.size() != Kind)
return ErrorU<PrototypeAST>("Invalid number of operands for operator"); return ErrorU<PrototypeAST>("Invalid number of operands for operator");
return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames), Kind != 0, return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames), Kind != 0,
BinaryPrecedence); BinaryPrecedence);
} }
@ -691,10 +691,10 @@ public:
PrototypeAST* getPrototypeAST(const std::string &Name); PrototypeAST* getPrototypeAST(const std::string &Name);
private: private:
typedef std::map<std::string, std::unique_ptr<PrototypeAST>> PrototypeMap; typedef std::map<std::string, std::unique_ptr<PrototypeAST>> PrototypeMap;
LLVMContext &Context; LLVMContext &Context;
std::unique_ptr<TargetMachine> TM; std::unique_ptr<TargetMachine> TM;
PrototypeMap Prototypes; PrototypeMap Prototypes;
}; };
@ -795,11 +795,11 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
} }
return ErrorP<Value>("Unknown variable name"); return ErrorP<Value>("Unknown variable name");
} }
Value *L = LHS->IRGen(C); Value *L = LHS->IRGen(C);
Value *R = RHS->IRGen(C); Value *R = RHS->IRGen(C);
if (!L || !R) return nullptr; if (!L || !R) return nullptr;
switch (Op) { switch (Op) {
case '+': return C.getBuilder().CreateFAdd(L, R, "addtmp"); case '+': return C.getBuilder().CreateFAdd(L, R, "addtmp");
case '-': return C.getBuilder().CreateFSub(L, R, "subtmp"); case '-': return C.getBuilder().CreateFSub(L, R, "subtmp");
@ -812,7 +812,7 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
"booltmp"); "booltmp");
default: break; default: break;
} }
// If it wasn't a builtin binary operator, it must be a user defined one. Emit // If it wasn't a builtin binary operator, it must be a user defined one. Emit
// a call to it. // a call to it.
std::string FnName = MakeLegalFunctionName(std::string("binary")+Op); std::string FnName = MakeLegalFunctionName(std::string("binary")+Op);
@ -820,7 +820,7 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
Value *Ops[] = { L, R }; Value *Ops[] = { L, R };
return C.getBuilder().CreateCall(F, Ops, "binop"); return C.getBuilder().CreateCall(F, Ops, "binop");
} }
return ErrorP<Value>("Unknown binary operator"); return ErrorP<Value>("Unknown binary operator");
} }
@ -836,7 +836,7 @@ Value *CallExprAST::IRGen(IRGenContext &C) const {
ArgsV.push_back(Args[i]->IRGen(C)); ArgsV.push_back(Args[i]->IRGen(C));
if (!ArgsV.back()) return nullptr; if (!ArgsV.back()) return nullptr;
} }
return C.getBuilder().CreateCall(CalleeF, ArgsV, "calltmp"); return C.getBuilder().CreateCall(CalleeF, ArgsV, "calltmp");
} }
@ -846,49 +846,49 @@ Value *CallExprAST::IRGen(IRGenContext &C) const {
Value *IfExprAST::IRGen(IRGenContext &C) const { Value *IfExprAST::IRGen(IRGenContext &C) const {
Value *CondV = Cond->IRGen(C); Value *CondV = Cond->IRGen(C);
if (!CondV) return nullptr; if (!CondV) return nullptr;
// Convert condition to a bool by comparing equal to 0.0. // Convert condition to a bool by comparing equal to 0.0.
ConstantFP *FPZero = ConstantFP *FPZero =
ConstantFP::get(C.getLLVMContext(), APFloat(0.0)); ConstantFP::get(C.getLLVMContext(), APFloat(0.0));
CondV = C.getBuilder().CreateFCmpONE(CondV, FPZero, "ifcond"); CondV = C.getBuilder().CreateFCmpONE(CondV, FPZero, "ifcond");
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Create blocks for the then and else cases. Insert the 'then' block at the // Create blocks for the then and else cases. Insert the 'then' block at the
// end of the function. // end of the function.
BasicBlock *ThenBB = BasicBlock::Create(C.getLLVMContext(), "then", TheFunction); BasicBlock *ThenBB = BasicBlock::Create(C.getLLVMContext(), "then", TheFunction);
BasicBlock *ElseBB = BasicBlock::Create(C.getLLVMContext(), "else"); BasicBlock *ElseBB = BasicBlock::Create(C.getLLVMContext(), "else");
BasicBlock *MergeBB = BasicBlock::Create(C.getLLVMContext(), "ifcont"); BasicBlock *MergeBB = BasicBlock::Create(C.getLLVMContext(), "ifcont");
C.getBuilder().CreateCondBr(CondV, ThenBB, ElseBB); C.getBuilder().CreateCondBr(CondV, ThenBB, ElseBB);
// Emit then value. // Emit then value.
C.getBuilder().SetInsertPoint(ThenBB); C.getBuilder().SetInsertPoint(ThenBB);
Value *ThenV = Then->IRGen(C); Value *ThenV = Then->IRGen(C);
if (!ThenV) return nullptr; if (!ThenV) return nullptr;
C.getBuilder().CreateBr(MergeBB); C.getBuilder().CreateBr(MergeBB);
// Codegen of 'Then' can change the current block, update ThenBB for the PHI. // Codegen of 'Then' can change the current block, update ThenBB for the PHI.
ThenBB = C.getBuilder().GetInsertBlock(); ThenBB = C.getBuilder().GetInsertBlock();
// Emit else block. // Emit else block.
TheFunction->getBasicBlockList().push_back(ElseBB); TheFunction->getBasicBlockList().push_back(ElseBB);
C.getBuilder().SetInsertPoint(ElseBB); C.getBuilder().SetInsertPoint(ElseBB);
Value *ElseV = Else->IRGen(C); Value *ElseV = Else->IRGen(C);
if (!ElseV) return nullptr; if (!ElseV) return nullptr;
C.getBuilder().CreateBr(MergeBB); C.getBuilder().CreateBr(MergeBB);
// Codegen of 'Else' can change the current block, update ElseBB for the PHI. // Codegen of 'Else' can change the current block, update ElseBB for the PHI.
ElseBB = C.getBuilder().GetInsertBlock(); ElseBB = C.getBuilder().GetInsertBlock();
// Emit merge block. // Emit merge block.
TheFunction->getBasicBlockList().push_back(MergeBB); TheFunction->getBasicBlockList().push_back(MergeBB);
C.getBuilder().SetInsertPoint(MergeBB); C.getBuilder().SetInsertPoint(MergeBB);
PHINode *PN = C.getBuilder().CreatePHI(Type::getDoubleTy(getGlobalContext()), 2, PHINode *PN = C.getBuilder().CreatePHI(Type::getDoubleTy(getGlobalContext()), 2,
"iftmp"); "iftmp");
PN->addIncoming(ThenV, ThenBB); PN->addIncoming(ThenV, ThenBB);
PN->addIncoming(ElseV, ElseBB); PN->addIncoming(ElseV, ElseBB);
return PN; return PN;
@ -901,7 +901,7 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// start = startexpr // start = startexpr
// store start -> var // store start -> var
// goto loop // goto loop
// loop: // loop:
// ... // ...
// bodyexpr // bodyexpr
// ... // ...
@ -914,40 +914,40 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// store nextvar -> var // store nextvar -> var
// br endcond, loop, endloop // br endcond, loop, endloop
// outloop: // outloop:
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Create an alloca for the variable in the entry block. // Create an alloca for the variable in the entry block.
AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName); AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName);
// Emit the start code first, without 'variable' in scope. // Emit the start code first, without 'variable' in scope.
Value *StartVal = Start->IRGen(C); Value *StartVal = Start->IRGen(C);
if (!StartVal) return nullptr; if (!StartVal) return nullptr;
// Store the value into the alloca. // Store the value into the alloca.
C.getBuilder().CreateStore(StartVal, Alloca); C.getBuilder().CreateStore(StartVal, Alloca);
// Make the new basic block for the loop header, inserting after current // Make the new basic block for the loop header, inserting after current
// block. // block.
BasicBlock *LoopBB = BasicBlock::Create(getGlobalContext(), "loop", TheFunction); BasicBlock *LoopBB = BasicBlock::Create(getGlobalContext(), "loop", TheFunction);
// Insert an explicit fall through from the current block to the LoopBB. // Insert an explicit fall through from the current block to the LoopBB.
C.getBuilder().CreateBr(LoopBB); C.getBuilder().CreateBr(LoopBB);
// Start insertion in LoopBB. // Start insertion in LoopBB.
C.getBuilder().SetInsertPoint(LoopBB); C.getBuilder().SetInsertPoint(LoopBB);
// Within the loop, the variable is defined equal to the PHI node. If it // Within the loop, the variable is defined equal to the PHI node. If it
// shadows an existing variable, we have to restore it, so save it now. // shadows an existing variable, we have to restore it, so save it now.
AllocaInst *OldVal = C.NamedValues[VarName]; AllocaInst *OldVal = C.NamedValues[VarName];
C.NamedValues[VarName] = Alloca; C.NamedValues[VarName] = Alloca;
// Emit the body of the loop. This, like any other expr, can change the // Emit the body of the loop. This, like any other expr, can change the
// current BB. Note that we ignore the value computed by the body, but don't // current BB. Note that we ignore the value computed by the body, but don't
// allow an error. // allow an error.
if (!Body->IRGen(C)) if (!Body->IRGen(C))
return nullptr; return nullptr;
// Emit the step value. // Emit the step value.
Value *StepVal; Value *StepVal;
if (Step) { if (Step) {
@ -957,52 +957,52 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// If not specified, use 1.0. // If not specified, use 1.0.
StepVal = ConstantFP::get(getGlobalContext(), APFloat(1.0)); StepVal = ConstantFP::get(getGlobalContext(), APFloat(1.0));
} }
// Compute the end condition. // Compute the end condition.
Value *EndCond = End->IRGen(C); Value *EndCond = End->IRGen(C);
if (EndCond == 0) return EndCond; if (EndCond == 0) return EndCond;
// Reload, increment, and restore the alloca. This handles the case where // Reload, increment, and restore the alloca. This handles the case where
// the body of the loop mutates the variable. // the body of the loop mutates the variable.
Value *CurVar = C.getBuilder().CreateLoad(Alloca, VarName.c_str()); Value *CurVar = C.getBuilder().CreateLoad(Alloca, VarName.c_str());
Value *NextVar = C.getBuilder().CreateFAdd(CurVar, StepVal, "nextvar"); Value *NextVar = C.getBuilder().CreateFAdd(CurVar, StepVal, "nextvar");
C.getBuilder().CreateStore(NextVar, Alloca); C.getBuilder().CreateStore(NextVar, Alloca);
// Convert condition to a bool by comparing equal to 0.0. // Convert condition to a bool by comparing equal to 0.0.
EndCond = C.getBuilder().CreateFCmpONE(EndCond, EndCond = C.getBuilder().CreateFCmpONE(EndCond,
ConstantFP::get(getGlobalContext(), APFloat(0.0)), ConstantFP::get(getGlobalContext(), APFloat(0.0)),
"loopcond"); "loopcond");
// Create the "after loop" block and insert it. // Create the "after loop" block and insert it.
BasicBlock *AfterBB = BasicBlock::Create(getGlobalContext(), "afterloop", TheFunction); BasicBlock *AfterBB = BasicBlock::Create(getGlobalContext(), "afterloop", TheFunction);
// Insert the conditional branch into the end of LoopEndBB. // Insert the conditional branch into the end of LoopEndBB.
C.getBuilder().CreateCondBr(EndCond, LoopBB, AfterBB); C.getBuilder().CreateCondBr(EndCond, LoopBB, AfterBB);
// Any new code will be inserted in AfterBB. // Any new code will be inserted in AfterBB.
C.getBuilder().SetInsertPoint(AfterBB); C.getBuilder().SetInsertPoint(AfterBB);
// Restore the unshadowed variable. // Restore the unshadowed variable.
if (OldVal) if (OldVal)
C.NamedValues[VarName] = OldVal; C.NamedValues[VarName] = OldVal;
else else
C.NamedValues.erase(VarName); C.NamedValues.erase(VarName);
// for expr always returns 0.0. // for expr always returns 0.0.
return Constant::getNullValue(Type::getDoubleTy(getGlobalContext())); return Constant::getNullValue(Type::getDoubleTy(getGlobalContext()));
} }
Value *VarExprAST::IRGen(IRGenContext &C) const { Value *VarExprAST::IRGen(IRGenContext &C) const {
std::vector<AllocaInst *> OldBindings; std::vector<AllocaInst *> OldBindings;
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Register all variables and emit their initializer. // Register all variables and emit their initializer.
for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) { for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) {
auto &VarName = VarBindings[i].first; auto &VarName = VarBindings[i].first;
auto &Init = VarBindings[i].second; auto &Init = VarBindings[i].second;
// Emit the initializer before adding the variable to scope, this prevents // Emit the initializer before adding the variable to scope, this prevents
// the initializer from referencing the variable itself, and permits stuff // the initializer from referencing the variable itself, and permits stuff
// like this: // like this:
@ -1014,22 +1014,22 @@ Value *VarExprAST::IRGen(IRGenContext &C) const {
if (!InitVal) return nullptr; if (!InitVal) return nullptr;
} else // If not specified, use 0.0. } else // If not specified, use 0.0.
InitVal = ConstantFP::get(getGlobalContext(), APFloat(0.0)); InitVal = ConstantFP::get(getGlobalContext(), APFloat(0.0));
AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName); AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName);
C.getBuilder().CreateStore(InitVal, Alloca); C.getBuilder().CreateStore(InitVal, Alloca);
// Remember the old variable binding so that we can restore the binding when // Remember the old variable binding so that we can restore the binding when
// we unrecurse. // we unrecurse.
OldBindings.push_back(C.NamedValues[VarName]); OldBindings.push_back(C.NamedValues[VarName]);
// Remember this binding. // Remember this binding.
C.NamedValues[VarName] = Alloca; C.NamedValues[VarName] = Alloca;
} }
// Codegen the body, now that all vars are in scope. // Codegen the body, now that all vars are in scope.
Value *BodyVal = Body->IRGen(C); Value *BodyVal = Body->IRGen(C);
if (!BodyVal) return nullptr; if (!BodyVal) return nullptr;
// Pop all our variables from scope. // Pop all our variables from scope.
for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) for (unsigned i = 0, e = VarBindings.size(); i != e; ++i)
C.NamedValues[VarBindings[i].first] = OldBindings[i]; C.NamedValues[VarBindings[i].first] = OldBindings[i];
@ -1042,7 +1042,7 @@ Function *PrototypeAST::IRGen(IRGenContext &C) const {
std::string FnName = MakeLegalFunctionName(Name); std::string FnName = MakeLegalFunctionName(Name);
// Make the function type: double(double,double) etc. // Make the function type: double(double,double) etc.
std::vector<Type*> Doubles(Args.size(), std::vector<Type*> Doubles(Args.size(),
Type::getDoubleTy(getGlobalContext())); Type::getDoubleTy(getGlobalContext()));
FunctionType *FT = FunctionType::get(Type::getDoubleTy(getGlobalContext()), FunctionType *FT = FunctionType::get(Type::getDoubleTy(getGlobalContext()),
Doubles, false); Doubles, false);
@ -1055,26 +1055,26 @@ Function *PrototypeAST::IRGen(IRGenContext &C) const {
// Delete the one we just made and get the existing one. // Delete the one we just made and get the existing one.
F->eraseFromParent(); F->eraseFromParent();
F = C.getM().getFunction(Name); F = C.getM().getFunction(Name);
// If F already has a body, reject this. // If F already has a body, reject this.
if (!F->empty()) { if (!F->empty()) {
ErrorP<Function>("redefinition of function"); ErrorP<Function>("redefinition of function");
return nullptr; return nullptr;
} }
// If F took a different number of args, reject. // If F took a different number of args, reject.
if (F->arg_size() != Args.size()) { if (F->arg_size() != Args.size()) {
ErrorP<Function>("redefinition of function with different # args"); ErrorP<Function>("redefinition of function with different # args");
return nullptr; return nullptr;
} }
} }
// Set names for all arguments. // Set names for all arguments.
unsigned Idx = 0; unsigned Idx = 0;
for (Function::arg_iterator AI = F->arg_begin(); Idx != Args.size(); for (Function::arg_iterator AI = F->arg_begin(); Idx != Args.size();
++AI, ++Idx) ++AI, ++Idx)
AI->setName(Args[Idx]); AI->setName(Args[Idx]);
return F; return F;
} }
@ -1096,19 +1096,19 @@ void PrototypeAST::CreateArgumentAllocas(Function *F, IRGenContext &C) {
Function *FunctionAST::IRGen(IRGenContext &C) const { Function *FunctionAST::IRGen(IRGenContext &C) const {
C.NamedValues.clear(); C.NamedValues.clear();
Function *TheFunction = Proto->IRGen(C); Function *TheFunction = Proto->IRGen(C);
if (!TheFunction) if (!TheFunction)
return nullptr; return nullptr;
// If this is an operator, install it. // If this is an operator, install it.
if (Proto->isBinaryOp()) if (Proto->isBinaryOp())
BinopPrecedence[Proto->getOperatorName()] = Proto->Precedence; BinopPrecedence[Proto->getOperatorName()] = Proto->Precedence;
// Create a new basic block to start insertion into. // Create a new basic block to start insertion into.
BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction); BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction);
C.getBuilder().SetInsertPoint(BB); C.getBuilder().SetInsertPoint(BB);
// Add all arguments to the symbol table and create their allocas. // Add all arguments to the symbol table and create their allocas.
Proto->CreateArgumentAllocas(TheFunction, C); Proto->CreateArgumentAllocas(TheFunction, C);
@ -1121,7 +1121,7 @@ Function *FunctionAST::IRGen(IRGenContext &C) const {
return TheFunction; return TheFunction;
} }
// Error reading body, remove function. // Error reading body, remove function.
TheFunction->eraseFromParent(); TheFunction->eraseFromParent();
@ -1350,7 +1350,7 @@ static void HandleTopLevelExpression(SessionContext &S, KaleidoscopeJIT &J) {
// Get the address of the JIT'd function in memory. // Get the address of the JIT'd function in memory.
auto ExprSymbol = J.findUnmangledSymbol("__anon_expr"); auto ExprSymbol = J.findUnmangledSymbol("__anon_expr");
// Cast it to the right type (takes no arguments, returns a double) so we // Cast it to the right type (takes no arguments, returns a double) so we
// can call it as a native function. // can call it as a native function.
double (*FP)() = (double (*)())(intptr_t)ExprSymbol.getAddress(); double (*FP)() = (double (*)())(intptr_t)ExprSymbol.getAddress();
@ -1393,20 +1393,20 @@ static void MainLoop() {
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// putchard - putchar that takes a double and returns 0. /// putchard - putchar that takes a double and returns 0.
extern "C" extern "C"
double putchard(double X) { double putchard(double X) {
putchar((char)X); putchar((char)X);
return 0; return 0;
} }
/// printd - printf that takes a double prints it as "%f\n", returning 0. /// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" extern "C"
double printd(double X) { double printd(double X) {
printf("%f", X); printf("%f", X);
return 0; return 0;
} }
extern "C" extern "C"
double printlf() { double printlf() {
printf("\n"); printf("\n");
return 0; return 0;
@ -1443,4 +1443,3 @@ int main() {
return 0; return 0;
} }

View File

@ -38,14 +38,14 @@ enum Token {
// primary // primary
tok_identifier = -4, tok_number = -5, tok_identifier = -4, tok_number = -5,
// control // control
tok_if = -6, tok_then = -7, tok_else = -8, tok_if = -6, tok_then = -7, tok_else = -8,
tok_for = -9, tok_in = -10, tok_for = -9, tok_in = -10,
// operators // operators
tok_binary = -11, tok_unary = -12, tok_binary = -11, tok_unary = -12,
// var definition // var definition
tok_var = -13 tok_var = -13
}; };
@ -94,11 +94,11 @@ static int gettok() {
// Comment until end of line. // Comment until end of line.
do LastChar = getchar(); do LastChar = getchar();
while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); while (LastChar != EOF && LastChar != '\n' && LastChar != '\r');
if (LastChar != EOF) if (LastChar != EOF)
return gettok(); return gettok();
} }
// Check for end of file. Don't eat the EOF. // Check for end of file. Don't eat the EOF.
if (LastChar == EOF) if (LastChar == EOF)
return tok_eof; return tok_eof;
@ -139,7 +139,7 @@ struct VariableExprAST : public ExprAST {
/// UnaryExprAST - Expression class for a unary operator. /// UnaryExprAST - Expression class for a unary operator.
struct UnaryExprAST : public ExprAST { struct UnaryExprAST : public ExprAST {
UnaryExprAST(char Opcode, std::unique_ptr<ExprAST> Operand) UnaryExprAST(char Opcode, std::unique_ptr<ExprAST> Operand)
: Opcode(std::move(Opcode)), Operand(std::move(Operand)) {} : Opcode(std::move(Opcode)), Operand(std::move(Operand)) {}
Value *IRGen(IRGenContext &C) const override; Value *IRGen(IRGenContext &C) const override;
@ -151,7 +151,7 @@ struct UnaryExprAST : public ExprAST {
/// BinaryExprAST - Expression class for a binary operator. /// BinaryExprAST - Expression class for a binary operator.
struct BinaryExprAST : public ExprAST { struct BinaryExprAST : public ExprAST {
BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS, BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS,
std::unique_ptr<ExprAST> RHS) std::unique_ptr<ExprAST> RHS)
: Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {} : Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {}
Value *IRGen(IRGenContext &C) const override; Value *IRGen(IRGenContext &C) const override;
@ -223,7 +223,7 @@ struct PrototypeAST {
bool isUnaryOp() const { return IsOperator && Args.size() == 1; } bool isUnaryOp() const { return IsOperator && Args.size() == 1; }
bool isBinaryOp() const { return IsOperator && Args.size() == 2; } bool isBinaryOp() const { return IsOperator && Args.size() == 2; }
char getOperatorName() const { char getOperatorName() const {
assert(isUnaryOp() || isBinaryOp()); assert(isUnaryOp() || isBinaryOp());
return Name[Name.size()-1]; return Name[Name.size()-1];
@ -267,7 +267,7 @@ static std::map<char, int> BinopPrecedence;
static int GetTokPrecedence() { static int GetTokPrecedence() {
if (!isascii(CurTok)) if (!isascii(CurTok))
return -1; return -1;
// Make sure it's a declared binop. // Make sure it's a declared binop.
int TokPrec = BinopPrecedence[CurTok]; int TokPrec = BinopPrecedence[CurTok];
if (TokPrec <= 0) return -1; if (TokPrec <= 0) return -1;
@ -293,12 +293,12 @@ static std::unique_ptr<ExprAST> ParseExpression();
/// ::= identifier '(' expression* ')' /// ::= identifier '(' expression* ')'
static std::unique_ptr<ExprAST> ParseIdentifierExpr() { static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
std::string IdName = IdentifierStr; std::string IdName = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
if (CurTok != '(') // Simple variable ref. if (CurTok != '(') // Simple variable ref.
return llvm::make_unique<VariableExprAST>(IdName); return llvm::make_unique<VariableExprAST>(IdName);
// Call. // Call.
getNextToken(); // eat ( getNextToken(); // eat (
std::vector<std::unique_ptr<ExprAST>> Args; std::vector<std::unique_ptr<ExprAST>> Args;
@ -318,7 +318,7 @@ static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
// Eat the ')'. // Eat the ')'.
getNextToken(); getNextToken();
return llvm::make_unique<CallExprAST>(IdName, std::move(Args)); return llvm::make_unique<CallExprAST>(IdName, std::move(Args));
} }
@ -335,7 +335,7 @@ static std::unique_ptr<ExprAST> ParseParenExpr() {
auto V = ParseExpression(); auto V = ParseExpression();
if (!V) if (!V)
return nullptr; return nullptr;
if (CurTok != ')') if (CurTok != ')')
return ErrorU<ExprAST>("expected ')'"); return ErrorU<ExprAST>("expected ')'");
getNextToken(); // eat ). getNextToken(); // eat ).
@ -345,29 +345,29 @@ static std::unique_ptr<ExprAST> ParseParenExpr() {
/// ifexpr ::= 'if' expression 'then' expression 'else' expression /// ifexpr ::= 'if' expression 'then' expression 'else' expression
static std::unique_ptr<ExprAST> ParseIfExpr() { static std::unique_ptr<ExprAST> ParseIfExpr() {
getNextToken(); // eat the if. getNextToken(); // eat the if.
// condition. // condition.
auto Cond = ParseExpression(); auto Cond = ParseExpression();
if (!Cond) if (!Cond)
return nullptr; return nullptr;
if (CurTok != tok_then) if (CurTok != tok_then)
return ErrorU<ExprAST>("expected then"); return ErrorU<ExprAST>("expected then");
getNextToken(); // eat the then getNextToken(); // eat the then
auto Then = ParseExpression(); auto Then = ParseExpression();
if (!Then) if (!Then)
return nullptr; return nullptr;
if (CurTok != tok_else) if (CurTok != tok_else)
return ErrorU<ExprAST>("expected else"); return ErrorU<ExprAST>("expected else");
getNextToken(); getNextToken();
auto Else = ParseExpression(); auto Else = ParseExpression();
if (!Else) if (!Else)
return nullptr; return nullptr;
return llvm::make_unique<IfExprAST>(std::move(Cond), std::move(Then), return llvm::make_unique<IfExprAST>(std::move(Cond), std::move(Then),
std::move(Else)); std::move(Else));
} }
@ -378,26 +378,26 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<ForExprAST>("expected identifier after for"); return ErrorU<ForExprAST>("expected identifier after for");
std::string IdName = IdentifierStr; std::string IdName = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
if (CurTok != '=') if (CurTok != '=')
return ErrorU<ForExprAST>("expected '=' after for"); return ErrorU<ForExprAST>("expected '=' after for");
getNextToken(); // eat '='. getNextToken(); // eat '='.
auto Start = ParseExpression(); auto Start = ParseExpression();
if (!Start) if (!Start)
return nullptr; return nullptr;
if (CurTok != ',') if (CurTok != ',')
return ErrorU<ForExprAST>("expected ',' after for start value"); return ErrorU<ForExprAST>("expected ',' after for start value");
getNextToken(); getNextToken();
auto End = ParseExpression(); auto End = ParseExpression();
if (!End) if (!End)
return nullptr; return nullptr;
// The step value is optional. // The step value is optional.
std::unique_ptr<ExprAST> Step; std::unique_ptr<ExprAST> Step;
if (CurTok == ',') { if (CurTok == ',') {
@ -406,11 +406,11 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
if (!Step) if (!Step)
return nullptr; return nullptr;
} }
if (CurTok != tok_in) if (CurTok != tok_in)
return ErrorU<ForExprAST>("expected 'in' after for"); return ErrorU<ForExprAST>("expected 'in' after for");
getNextToken(); // eat 'in'. getNextToken(); // eat 'in'.
auto Body = ParseExpression(); auto Body = ParseExpression();
if (Body) if (Body)
return nullptr; return nullptr;
@ -419,7 +419,7 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
std::move(Step), std::move(Body)); std::move(Step), std::move(Body));
} }
/// varexpr ::= 'var' identifier ('=' expression)? /// varexpr ::= 'var' identifier ('=' expression)?
// (',' identifier ('=' expression)?)* 'in' expression // (',' identifier ('=' expression)?)* 'in' expression
static std::unique_ptr<VarExprAST> ParseVarExpr() { static std::unique_ptr<VarExprAST> ParseVarExpr() {
getNextToken(); // eat the var. getNextToken(); // eat the var.
@ -429,7 +429,7 @@ static std::unique_ptr<VarExprAST> ParseVarExpr() {
// At least one variable name is required. // At least one variable name is required.
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<VarExprAST>("expected identifier after var"); return ErrorU<VarExprAST>("expected identifier after var");
while (1) { while (1) {
std::string Name = IdentifierStr; std::string Name = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
@ -438,31 +438,31 @@ static std::unique_ptr<VarExprAST> ParseVarExpr() {
std::unique_ptr<ExprAST> Init; std::unique_ptr<ExprAST> Init;
if (CurTok == '=') { if (CurTok == '=') {
getNextToken(); // eat the '='. getNextToken(); // eat the '='.
Init = ParseExpression(); Init = ParseExpression();
if (!Init) if (!Init)
return nullptr; return nullptr;
} }
VarBindings.push_back(VarExprAST::Binding(Name, std::move(Init))); VarBindings.push_back(VarExprAST::Binding(Name, std::move(Init)));
// End of var list, exit loop. // End of var list, exit loop.
if (CurTok != ',') break; if (CurTok != ',') break;
getNextToken(); // eat the ','. getNextToken(); // eat the ','.
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<VarExprAST>("expected identifier list after var"); return ErrorU<VarExprAST>("expected identifier list after var");
} }
// At this point, we have to have 'in'. // At this point, we have to have 'in'.
if (CurTok != tok_in) if (CurTok != tok_in)
return ErrorU<VarExprAST>("expected 'in' keyword after 'var'"); return ErrorU<VarExprAST>("expected 'in' keyword after 'var'");
getNextToken(); // eat 'in'. getNextToken(); // eat 'in'.
auto Body = ParseExpression(); auto Body = ParseExpression();
if (!Body) if (!Body)
return nullptr; return nullptr;
return llvm::make_unique<VarExprAST>(std::move(VarBindings), std::move(Body)); return llvm::make_unique<VarExprAST>(std::move(VarBindings), std::move(Body));
} }
@ -492,7 +492,7 @@ static std::unique_ptr<ExprAST> ParseUnary() {
// If the current token is not an operator, it must be a primary expr. // If the current token is not an operator, it must be a primary expr.
if (!isascii(CurTok) || CurTok == '(' || CurTok == ',') if (!isascii(CurTok) || CurTok == '(' || CurTok == ',')
return ParsePrimary(); return ParsePrimary();
// If this is a unary operator, read it. // If this is a unary operator, read it.
int Opc = CurTok; int Opc = CurTok;
getNextToken(); getNextToken();
@ -508,21 +508,21 @@ static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
// If this is a binop, find its precedence. // If this is a binop, find its precedence.
while (1) { while (1) {
int TokPrec = GetTokPrecedence(); int TokPrec = GetTokPrecedence();
// If this is a binop that binds at least as tightly as the current binop, // If this is a binop that binds at least as tightly as the current binop,
// consume it, otherwise we are done. // consume it, otherwise we are done.
if (TokPrec < ExprPrec) if (TokPrec < ExprPrec)
return LHS; return LHS;
// Okay, we know this is a binop. // Okay, we know this is a binop.
int BinOp = CurTok; int BinOp = CurTok;
getNextToken(); // eat binop getNextToken(); // eat binop
// Parse the unary expression after the binary operator. // Parse the unary expression after the binary operator.
auto RHS = ParseUnary(); auto RHS = ParseUnary();
if (!RHS) if (!RHS)
return nullptr; return nullptr;
// If BinOp binds less tightly with RHS than the operator after RHS, let // If BinOp binds less tightly with RHS than the operator after RHS, let
// the pending operator take RHS as its LHS. // the pending operator take RHS as its LHS.
int NextPrec = GetTokPrecedence(); int NextPrec = GetTokPrecedence();
@ -531,7 +531,7 @@ static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
if (!RHS) if (!RHS)
return nullptr; return nullptr;
} }
// Merge LHS/RHS. // Merge LHS/RHS.
LHS = llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS)); LHS = llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS));
} }
@ -544,7 +544,7 @@ static std::unique_ptr<ExprAST> ParseExpression() {
auto LHS = ParseUnary(); auto LHS = ParseUnary();
if (!LHS) if (!LHS)
return nullptr; return nullptr;
return ParseBinOpRHS(0, std::move(LHS)); return ParseBinOpRHS(0, std::move(LHS));
} }
@ -554,10 +554,10 @@ static std::unique_ptr<ExprAST> ParseExpression() {
/// ::= unary LETTER (id) /// ::= unary LETTER (id)
static std::unique_ptr<PrototypeAST> ParsePrototype() { static std::unique_ptr<PrototypeAST> ParsePrototype() {
std::string FnName; std::string FnName;
unsigned Kind = 0; // 0 = identifier, 1 = unary, 2 = binary. unsigned Kind = 0; // 0 = identifier, 1 = unary, 2 = binary.
unsigned BinaryPrecedence = 30; unsigned BinaryPrecedence = 30;
switch (CurTok) { switch (CurTok) {
default: default:
return ErrorU<PrototypeAST>("Expected function name in prototype"); return ErrorU<PrototypeAST>("Expected function name in prototype");
@ -583,7 +583,7 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
FnName += (char)CurTok; FnName += (char)CurTok;
Kind = 2; Kind = 2;
getNextToken(); getNextToken();
// Read the precedence if present. // Read the precedence if present.
if (CurTok == tok_number) { if (CurTok == tok_number) {
if (NumVal < 1 || NumVal > 100) if (NumVal < 1 || NumVal > 100)
@ -593,23 +593,23 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
} }
break; break;
} }
if (CurTok != '(') if (CurTok != '(')
return ErrorU<PrototypeAST>("Expected '(' in prototype"); return ErrorU<PrototypeAST>("Expected '(' in prototype");
std::vector<std::string> ArgNames; std::vector<std::string> ArgNames;
while (getNextToken() == tok_identifier) while (getNextToken() == tok_identifier)
ArgNames.push_back(IdentifierStr); ArgNames.push_back(IdentifierStr);
if (CurTok != ')') if (CurTok != ')')
return ErrorU<PrototypeAST>("Expected ')' in prototype"); return ErrorU<PrototypeAST>("Expected ')' in prototype");
// success. // success.
getNextToken(); // eat ')'. getNextToken(); // eat ')'.
// Verify right number of names for operator. // Verify right number of names for operator.
if (Kind && ArgNames.size() != Kind) if (Kind && ArgNames.size() != Kind)
return ErrorU<PrototypeAST>("Invalid number of operands for operator"); return ErrorU<PrototypeAST>("Invalid number of operands for operator");
return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames), Kind != 0, return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames), Kind != 0,
BinaryPrecedence); BinaryPrecedence);
} }
@ -690,10 +690,10 @@ public:
PrototypeAST* getPrototypeAST(const std::string &Name); PrototypeAST* getPrototypeAST(const std::string &Name);
private: private:
typedef std::map<std::string, std::unique_ptr<PrototypeAST>> PrototypeMap; typedef std::map<std::string, std::unique_ptr<PrototypeAST>> PrototypeMap;
LLVMContext &Context; LLVMContext &Context;
std::unique_ptr<TargetMachine> TM; std::unique_ptr<TargetMachine> TM;
PrototypeMap Prototypes; PrototypeMap Prototypes;
}; };
@ -794,11 +794,11 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
} }
return ErrorP<Value>("Unknown variable name"); return ErrorP<Value>("Unknown variable name");
} }
Value *L = LHS->IRGen(C); Value *L = LHS->IRGen(C);
Value *R = RHS->IRGen(C); Value *R = RHS->IRGen(C);
if (!L || !R) return nullptr; if (!L || !R) return nullptr;
switch (Op) { switch (Op) {
case '+': return C.getBuilder().CreateFAdd(L, R, "addtmp"); case '+': return C.getBuilder().CreateFAdd(L, R, "addtmp");
case '-': return C.getBuilder().CreateFSub(L, R, "subtmp"); case '-': return C.getBuilder().CreateFSub(L, R, "subtmp");
@ -811,7 +811,7 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
"booltmp"); "booltmp");
default: break; default: break;
} }
// If it wasn't a builtin binary operator, it must be a user defined one. Emit // If it wasn't a builtin binary operator, it must be a user defined one. Emit
// a call to it. // a call to it.
std::string FnName = MakeLegalFunctionName(std::string("binary")+Op); std::string FnName = MakeLegalFunctionName(std::string("binary")+Op);
@ -819,7 +819,7 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
Value *Ops[] = { L, R }; Value *Ops[] = { L, R };
return C.getBuilder().CreateCall(F, Ops, "binop"); return C.getBuilder().CreateCall(F, Ops, "binop");
} }
return ErrorP<Value>("Unknown binary operator"); return ErrorP<Value>("Unknown binary operator");
} }
@ -835,7 +835,7 @@ Value *CallExprAST::IRGen(IRGenContext &C) const {
ArgsV.push_back(Args[i]->IRGen(C)); ArgsV.push_back(Args[i]->IRGen(C));
if (!ArgsV.back()) return nullptr; if (!ArgsV.back()) return nullptr;
} }
return C.getBuilder().CreateCall(CalleeF, ArgsV, "calltmp"); return C.getBuilder().CreateCall(CalleeF, ArgsV, "calltmp");
} }
@ -845,49 +845,49 @@ Value *CallExprAST::IRGen(IRGenContext &C) const {
Value *IfExprAST::IRGen(IRGenContext &C) const { Value *IfExprAST::IRGen(IRGenContext &C) const {
Value *CondV = Cond->IRGen(C); Value *CondV = Cond->IRGen(C);
if (!CondV) return nullptr; if (!CondV) return nullptr;
// Convert condition to a bool by comparing equal to 0.0. // Convert condition to a bool by comparing equal to 0.0.
ConstantFP *FPZero = ConstantFP *FPZero =
ConstantFP::get(C.getLLVMContext(), APFloat(0.0)); ConstantFP::get(C.getLLVMContext(), APFloat(0.0));
CondV = C.getBuilder().CreateFCmpONE(CondV, FPZero, "ifcond"); CondV = C.getBuilder().CreateFCmpONE(CondV, FPZero, "ifcond");
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Create blocks for the then and else cases. Insert the 'then' block at the // Create blocks for the then and else cases. Insert the 'then' block at the
// end of the function. // end of the function.
BasicBlock *ThenBB = BasicBlock::Create(C.getLLVMContext(), "then", TheFunction); BasicBlock *ThenBB = BasicBlock::Create(C.getLLVMContext(), "then", TheFunction);
BasicBlock *ElseBB = BasicBlock::Create(C.getLLVMContext(), "else"); BasicBlock *ElseBB = BasicBlock::Create(C.getLLVMContext(), "else");
BasicBlock *MergeBB = BasicBlock::Create(C.getLLVMContext(), "ifcont"); BasicBlock *MergeBB = BasicBlock::Create(C.getLLVMContext(), "ifcont");
C.getBuilder().CreateCondBr(CondV, ThenBB, ElseBB); C.getBuilder().CreateCondBr(CondV, ThenBB, ElseBB);
// Emit then value. // Emit then value.
C.getBuilder().SetInsertPoint(ThenBB); C.getBuilder().SetInsertPoint(ThenBB);
Value *ThenV = Then->IRGen(C); Value *ThenV = Then->IRGen(C);
if (!ThenV) return nullptr; if (!ThenV) return nullptr;
C.getBuilder().CreateBr(MergeBB); C.getBuilder().CreateBr(MergeBB);
// Codegen of 'Then' can change the current block, update ThenBB for the PHI. // Codegen of 'Then' can change the current block, update ThenBB for the PHI.
ThenBB = C.getBuilder().GetInsertBlock(); ThenBB = C.getBuilder().GetInsertBlock();
// Emit else block. // Emit else block.
TheFunction->getBasicBlockList().push_back(ElseBB); TheFunction->getBasicBlockList().push_back(ElseBB);
C.getBuilder().SetInsertPoint(ElseBB); C.getBuilder().SetInsertPoint(ElseBB);
Value *ElseV = Else->IRGen(C); Value *ElseV = Else->IRGen(C);
if (!ElseV) return nullptr; if (!ElseV) return nullptr;
C.getBuilder().CreateBr(MergeBB); C.getBuilder().CreateBr(MergeBB);
// Codegen of 'Else' can change the current block, update ElseBB for the PHI. // Codegen of 'Else' can change the current block, update ElseBB for the PHI.
ElseBB = C.getBuilder().GetInsertBlock(); ElseBB = C.getBuilder().GetInsertBlock();
// Emit merge block. // Emit merge block.
TheFunction->getBasicBlockList().push_back(MergeBB); TheFunction->getBasicBlockList().push_back(MergeBB);
C.getBuilder().SetInsertPoint(MergeBB); C.getBuilder().SetInsertPoint(MergeBB);
PHINode *PN = C.getBuilder().CreatePHI(Type::getDoubleTy(getGlobalContext()), 2, PHINode *PN = C.getBuilder().CreatePHI(Type::getDoubleTy(getGlobalContext()), 2,
"iftmp"); "iftmp");
PN->addIncoming(ThenV, ThenBB); PN->addIncoming(ThenV, ThenBB);
PN->addIncoming(ElseV, ElseBB); PN->addIncoming(ElseV, ElseBB);
return PN; return PN;
@ -900,7 +900,7 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// start = startexpr // start = startexpr
// store start -> var // store start -> var
// goto loop // goto loop
// loop: // loop:
// ... // ...
// bodyexpr // bodyexpr
// ... // ...
@ -913,40 +913,40 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// store nextvar -> var // store nextvar -> var
// br endcond, loop, endloop // br endcond, loop, endloop
// outloop: // outloop:
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Create an alloca for the variable in the entry block. // Create an alloca for the variable in the entry block.
AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName); AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName);
// Emit the start code first, without 'variable' in scope. // Emit the start code first, without 'variable' in scope.
Value *StartVal = Start->IRGen(C); Value *StartVal = Start->IRGen(C);
if (!StartVal) return nullptr; if (!StartVal) return nullptr;
// Store the value into the alloca. // Store the value into the alloca.
C.getBuilder().CreateStore(StartVal, Alloca); C.getBuilder().CreateStore(StartVal, Alloca);
// Make the new basic block for the loop header, inserting after current // Make the new basic block for the loop header, inserting after current
// block. // block.
BasicBlock *LoopBB = BasicBlock::Create(getGlobalContext(), "loop", TheFunction); BasicBlock *LoopBB = BasicBlock::Create(getGlobalContext(), "loop", TheFunction);
// Insert an explicit fall through from the current block to the LoopBB. // Insert an explicit fall through from the current block to the LoopBB.
C.getBuilder().CreateBr(LoopBB); C.getBuilder().CreateBr(LoopBB);
// Start insertion in LoopBB. // Start insertion in LoopBB.
C.getBuilder().SetInsertPoint(LoopBB); C.getBuilder().SetInsertPoint(LoopBB);
// Within the loop, the variable is defined equal to the PHI node. If it // Within the loop, the variable is defined equal to the PHI node. If it
// shadows an existing variable, we have to restore it, so save it now. // shadows an existing variable, we have to restore it, so save it now.
AllocaInst *OldVal = C.NamedValues[VarName]; AllocaInst *OldVal = C.NamedValues[VarName];
C.NamedValues[VarName] = Alloca; C.NamedValues[VarName] = Alloca;
// Emit the body of the loop. This, like any other expr, can change the // Emit the body of the loop. This, like any other expr, can change the
// current BB. Note that we ignore the value computed by the body, but don't // current BB. Note that we ignore the value computed by the body, but don't
// allow an error. // allow an error.
if (!Body->IRGen(C)) if (!Body->IRGen(C))
return nullptr; return nullptr;
// Emit the step value. // Emit the step value.
Value *StepVal; Value *StepVal;
if (Step) { if (Step) {
@ -956,52 +956,52 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// If not specified, use 1.0. // If not specified, use 1.0.
StepVal = ConstantFP::get(getGlobalContext(), APFloat(1.0)); StepVal = ConstantFP::get(getGlobalContext(), APFloat(1.0));
} }
// Compute the end condition. // Compute the end condition.
Value *EndCond = End->IRGen(C); Value *EndCond = End->IRGen(C);
if (EndCond == 0) return EndCond; if (EndCond == 0) return EndCond;
// Reload, increment, and restore the alloca. This handles the case where // Reload, increment, and restore the alloca. This handles the case where
// the body of the loop mutates the variable. // the body of the loop mutates the variable.
Value *CurVar = C.getBuilder().CreateLoad(Alloca, VarName.c_str()); Value *CurVar = C.getBuilder().CreateLoad(Alloca, VarName.c_str());
Value *NextVar = C.getBuilder().CreateFAdd(CurVar, StepVal, "nextvar"); Value *NextVar = C.getBuilder().CreateFAdd(CurVar, StepVal, "nextvar");
C.getBuilder().CreateStore(NextVar, Alloca); C.getBuilder().CreateStore(NextVar, Alloca);
// Convert condition to a bool by comparing equal to 0.0. // Convert condition to a bool by comparing equal to 0.0.
EndCond = C.getBuilder().CreateFCmpONE(EndCond, EndCond = C.getBuilder().CreateFCmpONE(EndCond,
ConstantFP::get(getGlobalContext(), APFloat(0.0)), ConstantFP::get(getGlobalContext(), APFloat(0.0)),
"loopcond"); "loopcond");
// Create the "after loop" block and insert it. // Create the "after loop" block and insert it.
BasicBlock *AfterBB = BasicBlock::Create(getGlobalContext(), "afterloop", TheFunction); BasicBlock *AfterBB = BasicBlock::Create(getGlobalContext(), "afterloop", TheFunction);
// Insert the conditional branch into the end of LoopEndBB. // Insert the conditional branch into the end of LoopEndBB.
C.getBuilder().CreateCondBr(EndCond, LoopBB, AfterBB); C.getBuilder().CreateCondBr(EndCond, LoopBB, AfterBB);
// Any new code will be inserted in AfterBB. // Any new code will be inserted in AfterBB.
C.getBuilder().SetInsertPoint(AfterBB); C.getBuilder().SetInsertPoint(AfterBB);
// Restore the unshadowed variable. // Restore the unshadowed variable.
if (OldVal) if (OldVal)
C.NamedValues[VarName] = OldVal; C.NamedValues[VarName] = OldVal;
else else
C.NamedValues.erase(VarName); C.NamedValues.erase(VarName);
// for expr always returns 0.0. // for expr always returns 0.0.
return Constant::getNullValue(Type::getDoubleTy(getGlobalContext())); return Constant::getNullValue(Type::getDoubleTy(getGlobalContext()));
} }
Value *VarExprAST::IRGen(IRGenContext &C) const { Value *VarExprAST::IRGen(IRGenContext &C) const {
std::vector<AllocaInst *> OldBindings; std::vector<AllocaInst *> OldBindings;
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Register all variables and emit their initializer. // Register all variables and emit their initializer.
for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) { for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) {
auto &VarName = VarBindings[i].first; auto &VarName = VarBindings[i].first;
auto &Init = VarBindings[i].second; auto &Init = VarBindings[i].second;
// Emit the initializer before adding the variable to scope, this prevents // Emit the initializer before adding the variable to scope, this prevents
// the initializer from referencing the variable itself, and permits stuff // the initializer from referencing the variable itself, and permits stuff
// like this: // like this:
@ -1013,22 +1013,22 @@ Value *VarExprAST::IRGen(IRGenContext &C) const {
if (!InitVal) return nullptr; if (!InitVal) return nullptr;
} else // If not specified, use 0.0. } else // If not specified, use 0.0.
InitVal = ConstantFP::get(getGlobalContext(), APFloat(0.0)); InitVal = ConstantFP::get(getGlobalContext(), APFloat(0.0));
AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName); AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName);
C.getBuilder().CreateStore(InitVal, Alloca); C.getBuilder().CreateStore(InitVal, Alloca);
// Remember the old variable binding so that we can restore the binding when // Remember the old variable binding so that we can restore the binding when
// we unrecurse. // we unrecurse.
OldBindings.push_back(C.NamedValues[VarName]); OldBindings.push_back(C.NamedValues[VarName]);
// Remember this binding. // Remember this binding.
C.NamedValues[VarName] = Alloca; C.NamedValues[VarName] = Alloca;
} }
// Codegen the body, now that all vars are in scope. // Codegen the body, now that all vars are in scope.
Value *BodyVal = Body->IRGen(C); Value *BodyVal = Body->IRGen(C);
if (!BodyVal) return nullptr; if (!BodyVal) return nullptr;
// Pop all our variables from scope. // Pop all our variables from scope.
for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) for (unsigned i = 0, e = VarBindings.size(); i != e; ++i)
C.NamedValues[VarBindings[i].first] = OldBindings[i]; C.NamedValues[VarBindings[i].first] = OldBindings[i];
@ -1041,7 +1041,7 @@ Function *PrototypeAST::IRGen(IRGenContext &C) const {
std::string FnName = MakeLegalFunctionName(Name); std::string FnName = MakeLegalFunctionName(Name);
// Make the function type: double(double,double) etc. // Make the function type: double(double,double) etc.
std::vector<Type*> Doubles(Args.size(), std::vector<Type*> Doubles(Args.size(),
Type::getDoubleTy(getGlobalContext())); Type::getDoubleTy(getGlobalContext()));
FunctionType *FT = FunctionType::get(Type::getDoubleTy(getGlobalContext()), FunctionType *FT = FunctionType::get(Type::getDoubleTy(getGlobalContext()),
Doubles, false); Doubles, false);
@ -1054,26 +1054,26 @@ Function *PrototypeAST::IRGen(IRGenContext &C) const {
// Delete the one we just made and get the existing one. // Delete the one we just made and get the existing one.
F->eraseFromParent(); F->eraseFromParent();
F = C.getM().getFunction(Name); F = C.getM().getFunction(Name);
// If F already has a body, reject this. // If F already has a body, reject this.
if (!F->empty()) { if (!F->empty()) {
ErrorP<Function>("redefinition of function"); ErrorP<Function>("redefinition of function");
return nullptr; return nullptr;
} }
// If F took a different number of args, reject. // If F took a different number of args, reject.
if (F->arg_size() != Args.size()) { if (F->arg_size() != Args.size()) {
ErrorP<Function>("redefinition of function with different # args"); ErrorP<Function>("redefinition of function with different # args");
return nullptr; return nullptr;
} }
} }
// Set names for all arguments. // Set names for all arguments.
unsigned Idx = 0; unsigned Idx = 0;
for (Function::arg_iterator AI = F->arg_begin(); Idx != Args.size(); for (Function::arg_iterator AI = F->arg_begin(); Idx != Args.size();
++AI, ++Idx) ++AI, ++Idx)
AI->setName(Args[Idx]); AI->setName(Args[Idx]);
return F; return F;
} }
@ -1095,19 +1095,19 @@ void PrototypeAST::CreateArgumentAllocas(Function *F, IRGenContext &C) {
Function *FunctionAST::IRGen(IRGenContext &C) const { Function *FunctionAST::IRGen(IRGenContext &C) const {
C.NamedValues.clear(); C.NamedValues.clear();
Function *TheFunction = Proto->IRGen(C); Function *TheFunction = Proto->IRGen(C);
if (!TheFunction) if (!TheFunction)
return nullptr; return nullptr;
// If this is an operator, install it. // If this is an operator, install it.
if (Proto->isBinaryOp()) if (Proto->isBinaryOp())
BinopPrecedence[Proto->getOperatorName()] = Proto->Precedence; BinopPrecedence[Proto->getOperatorName()] = Proto->Precedence;
// Create a new basic block to start insertion into. // Create a new basic block to start insertion into.
BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction); BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction);
C.getBuilder().SetInsertPoint(BB); C.getBuilder().SetInsertPoint(BB);
// Add all arguments to the symbol table and create their allocas. // Add all arguments to the symbol table and create their allocas.
Proto->CreateArgumentAllocas(TheFunction, C); Proto->CreateArgumentAllocas(TheFunction, C);
@ -1120,7 +1120,7 @@ Function *FunctionAST::IRGen(IRGenContext &C) const {
return TheFunction; return TheFunction;
} }
// Error reading body, remove function. // Error reading body, remove function.
TheFunction->eraseFromParent(); TheFunction->eraseFromParent();
@ -1242,7 +1242,7 @@ static void HandleTopLevelExpression(SessionContext &S, KaleidoscopeJIT &J) {
// Get the address of the JIT'd function in memory. // Get the address of the JIT'd function in memory.
auto ExprSymbol = J.findUnmangledSymbol("__anon_expr"); auto ExprSymbol = J.findUnmangledSymbol("__anon_expr");
// Cast it to the right type (takes no arguments, returns a double) so we // Cast it to the right type (takes no arguments, returns a double) so we
// can call it as a native function. // can call it as a native function.
double (*FP)() = (double (*)())(intptr_t)ExprSymbol.getAddress(); double (*FP)() = (double (*)())(intptr_t)ExprSymbol.getAddress();
@ -1285,20 +1285,20 @@ static void MainLoop() {
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// putchard - putchar that takes a double and returns 0. /// putchard - putchar that takes a double and returns 0.
extern "C" extern "C"
double putchard(double X) { double putchard(double X) {
putchar((char)X); putchar((char)X);
return 0; return 0;
} }
/// printd - printf that takes a double prints it as "%f\n", returning 0. /// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" extern "C"
double printd(double X) { double printd(double X) {
printf("%f", X); printf("%f", X);
return 0; return 0;
} }
extern "C" extern "C"
double printlf() { double printlf() {
printf("\n"); printf("\n");
return 0; return 0;
@ -1335,4 +1335,3 @@ int main() {
return 0; return 0;
} }

View File

@ -38,14 +38,14 @@ enum Token {
// primary // primary
tok_identifier = -4, tok_number = -5, tok_identifier = -4, tok_number = -5,
// control // control
tok_if = -6, tok_then = -7, tok_else = -8, tok_if = -6, tok_then = -7, tok_else = -8,
tok_for = -9, tok_in = -10, tok_for = -9, tok_in = -10,
// operators // operators
tok_binary = -11, tok_unary = -12, tok_binary = -11, tok_unary = -12,
// var definition // var definition
tok_var = -13 tok_var = -13
}; };
@ -94,11 +94,11 @@ static int gettok() {
// Comment until end of line. // Comment until end of line.
do LastChar = getchar(); do LastChar = getchar();
while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); while (LastChar != EOF && LastChar != '\n' && LastChar != '\r');
if (LastChar != EOF) if (LastChar != EOF)
return gettok(); return gettok();
} }
// Check for end of file. Don't eat the EOF. // Check for end of file. Don't eat the EOF.
if (LastChar == EOF) if (LastChar == EOF)
return tok_eof; return tok_eof;
@ -139,7 +139,7 @@ struct VariableExprAST : public ExprAST {
/// UnaryExprAST - Expression class for a unary operator. /// UnaryExprAST - Expression class for a unary operator.
struct UnaryExprAST : public ExprAST { struct UnaryExprAST : public ExprAST {
UnaryExprAST(char Opcode, std::unique_ptr<ExprAST> Operand) UnaryExprAST(char Opcode, std::unique_ptr<ExprAST> Operand)
: Opcode(std::move(Opcode)), Operand(std::move(Operand)) {} : Opcode(std::move(Opcode)), Operand(std::move(Operand)) {}
Value *IRGen(IRGenContext &C) const override; Value *IRGen(IRGenContext &C) const override;
@ -151,7 +151,7 @@ struct UnaryExprAST : public ExprAST {
/// BinaryExprAST - Expression class for a binary operator. /// BinaryExprAST - Expression class for a binary operator.
struct BinaryExprAST : public ExprAST { struct BinaryExprAST : public ExprAST {
BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS, BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS,
std::unique_ptr<ExprAST> RHS) std::unique_ptr<ExprAST> RHS)
: Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {} : Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {}
Value *IRGen(IRGenContext &C) const override; Value *IRGen(IRGenContext &C) const override;
@ -223,7 +223,7 @@ struct PrototypeAST {
bool isUnaryOp() const { return IsOperator && Args.size() == 1; } bool isUnaryOp() const { return IsOperator && Args.size() == 1; }
bool isBinaryOp() const { return IsOperator && Args.size() == 2; } bool isBinaryOp() const { return IsOperator && Args.size() == 2; }
char getOperatorName() const { char getOperatorName() const {
assert(isUnaryOp() || isBinaryOp()); assert(isUnaryOp() || isBinaryOp());
return Name[Name.size()-1]; return Name[Name.size()-1];
@ -267,7 +267,7 @@ static std::map<char, int> BinopPrecedence;
static int GetTokPrecedence() { static int GetTokPrecedence() {
if (!isascii(CurTok)) if (!isascii(CurTok))
return -1; return -1;
// Make sure it's a declared binop. // Make sure it's a declared binop.
int TokPrec = BinopPrecedence[CurTok]; int TokPrec = BinopPrecedence[CurTok];
if (TokPrec <= 0) return -1; if (TokPrec <= 0) return -1;
@ -293,12 +293,12 @@ static std::unique_ptr<ExprAST> ParseExpression();
/// ::= identifier '(' expression* ')' /// ::= identifier '(' expression* ')'
static std::unique_ptr<ExprAST> ParseIdentifierExpr() { static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
std::string IdName = IdentifierStr; std::string IdName = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
if (CurTok != '(') // Simple variable ref. if (CurTok != '(') // Simple variable ref.
return llvm::make_unique<VariableExprAST>(IdName); return llvm::make_unique<VariableExprAST>(IdName);
// Call. // Call.
getNextToken(); // eat ( getNextToken(); // eat (
std::vector<std::unique_ptr<ExprAST>> Args; std::vector<std::unique_ptr<ExprAST>> Args;
@ -318,7 +318,7 @@ static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
// Eat the ')'. // Eat the ')'.
getNextToken(); getNextToken();
return llvm::make_unique<CallExprAST>(IdName, std::move(Args)); return llvm::make_unique<CallExprAST>(IdName, std::move(Args));
} }
@ -335,7 +335,7 @@ static std::unique_ptr<ExprAST> ParseParenExpr() {
auto V = ParseExpression(); auto V = ParseExpression();
if (!V) if (!V)
return nullptr; return nullptr;
if (CurTok != ')') if (CurTok != ')')
return ErrorU<ExprAST>("expected ')'"); return ErrorU<ExprAST>("expected ')'");
getNextToken(); // eat ). getNextToken(); // eat ).
@ -345,29 +345,29 @@ static std::unique_ptr<ExprAST> ParseParenExpr() {
/// ifexpr ::= 'if' expression 'then' expression 'else' expression /// ifexpr ::= 'if' expression 'then' expression 'else' expression
static std::unique_ptr<ExprAST> ParseIfExpr() { static std::unique_ptr<ExprAST> ParseIfExpr() {
getNextToken(); // eat the if. getNextToken(); // eat the if.
// condition. // condition.
auto Cond = ParseExpression(); auto Cond = ParseExpression();
if (!Cond) if (!Cond)
return nullptr; return nullptr;
if (CurTok != tok_then) if (CurTok != tok_then)
return ErrorU<ExprAST>("expected then"); return ErrorU<ExprAST>("expected then");
getNextToken(); // eat the then getNextToken(); // eat the then
auto Then = ParseExpression(); auto Then = ParseExpression();
if (!Then) if (!Then)
return nullptr; return nullptr;
if (CurTok != tok_else) if (CurTok != tok_else)
return ErrorU<ExprAST>("expected else"); return ErrorU<ExprAST>("expected else");
getNextToken(); getNextToken();
auto Else = ParseExpression(); auto Else = ParseExpression();
if (!Else) if (!Else)
return nullptr; return nullptr;
return llvm::make_unique<IfExprAST>(std::move(Cond), std::move(Then), return llvm::make_unique<IfExprAST>(std::move(Cond), std::move(Then),
std::move(Else)); std::move(Else));
} }
@ -378,26 +378,26 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<ForExprAST>("expected identifier after for"); return ErrorU<ForExprAST>("expected identifier after for");
std::string IdName = IdentifierStr; std::string IdName = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
if (CurTok != '=') if (CurTok != '=')
return ErrorU<ForExprAST>("expected '=' after for"); return ErrorU<ForExprAST>("expected '=' after for");
getNextToken(); // eat '='. getNextToken(); // eat '='.
auto Start = ParseExpression(); auto Start = ParseExpression();
if (!Start) if (!Start)
return nullptr; return nullptr;
if (CurTok != ',') if (CurTok != ',')
return ErrorU<ForExprAST>("expected ',' after for start value"); return ErrorU<ForExprAST>("expected ',' after for start value");
getNextToken(); getNextToken();
auto End = ParseExpression(); auto End = ParseExpression();
if (!End) if (!End)
return nullptr; return nullptr;
// The step value is optional. // The step value is optional.
std::unique_ptr<ExprAST> Step; std::unique_ptr<ExprAST> Step;
if (CurTok == ',') { if (CurTok == ',') {
@ -406,11 +406,11 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
if (!Step) if (!Step)
return nullptr; return nullptr;
} }
if (CurTok != tok_in) if (CurTok != tok_in)
return ErrorU<ForExprAST>("expected 'in' after for"); return ErrorU<ForExprAST>("expected 'in' after for");
getNextToken(); // eat 'in'. getNextToken(); // eat 'in'.
auto Body = ParseExpression(); auto Body = ParseExpression();
if (Body) if (Body)
return nullptr; return nullptr;
@ -419,7 +419,7 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
std::move(Step), std::move(Body)); std::move(Step), std::move(Body));
} }
/// varexpr ::= 'var' identifier ('=' expression)? /// varexpr ::= 'var' identifier ('=' expression)?
// (',' identifier ('=' expression)?)* 'in' expression // (',' identifier ('=' expression)?)* 'in' expression
static std::unique_ptr<VarExprAST> ParseVarExpr() { static std::unique_ptr<VarExprAST> ParseVarExpr() {
getNextToken(); // eat the var. getNextToken(); // eat the var.
@ -429,7 +429,7 @@ static std::unique_ptr<VarExprAST> ParseVarExpr() {
// At least one variable name is required. // At least one variable name is required.
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<VarExprAST>("expected identifier after var"); return ErrorU<VarExprAST>("expected identifier after var");
while (1) { while (1) {
std::string Name = IdentifierStr; std::string Name = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
@ -438,31 +438,31 @@ static std::unique_ptr<VarExprAST> ParseVarExpr() {
std::unique_ptr<ExprAST> Init; std::unique_ptr<ExprAST> Init;
if (CurTok == '=') { if (CurTok == '=') {
getNextToken(); // eat the '='. getNextToken(); // eat the '='.
Init = ParseExpression(); Init = ParseExpression();
if (!Init) if (!Init)
return nullptr; return nullptr;
} }
VarBindings.push_back(VarExprAST::Binding(Name, std::move(Init))); VarBindings.push_back(VarExprAST::Binding(Name, std::move(Init)));
// End of var list, exit loop. // End of var list, exit loop.
if (CurTok != ',') break; if (CurTok != ',') break;
getNextToken(); // eat the ','. getNextToken(); // eat the ','.
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<VarExprAST>("expected identifier list after var"); return ErrorU<VarExprAST>("expected identifier list after var");
} }
// At this point, we have to have 'in'. // At this point, we have to have 'in'.
if (CurTok != tok_in) if (CurTok != tok_in)
return ErrorU<VarExprAST>("expected 'in' keyword after 'var'"); return ErrorU<VarExprAST>("expected 'in' keyword after 'var'");
getNextToken(); // eat 'in'. getNextToken(); // eat 'in'.
auto Body = ParseExpression(); auto Body = ParseExpression();
if (!Body) if (!Body)
return nullptr; return nullptr;
return llvm::make_unique<VarExprAST>(std::move(VarBindings), std::move(Body)); return llvm::make_unique<VarExprAST>(std::move(VarBindings), std::move(Body));
} }
@ -492,7 +492,7 @@ static std::unique_ptr<ExprAST> ParseUnary() {
// If the current token is not an operator, it must be a primary expr. // If the current token is not an operator, it must be a primary expr.
if (!isascii(CurTok) || CurTok == '(' || CurTok == ',') if (!isascii(CurTok) || CurTok == '(' || CurTok == ',')
return ParsePrimary(); return ParsePrimary();
// If this is a unary operator, read it. // If this is a unary operator, read it.
int Opc = CurTok; int Opc = CurTok;
getNextToken(); getNextToken();
@ -508,21 +508,21 @@ static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
// If this is a binop, find its precedence. // If this is a binop, find its precedence.
while (1) { while (1) {
int TokPrec = GetTokPrecedence(); int TokPrec = GetTokPrecedence();
// If this is a binop that binds at least as tightly as the current binop, // If this is a binop that binds at least as tightly as the current binop,
// consume it, otherwise we are done. // consume it, otherwise we are done.
if (TokPrec < ExprPrec) if (TokPrec < ExprPrec)
return LHS; return LHS;
// Okay, we know this is a binop. // Okay, we know this is a binop.
int BinOp = CurTok; int BinOp = CurTok;
getNextToken(); // eat binop getNextToken(); // eat binop
// Parse the unary expression after the binary operator. // Parse the unary expression after the binary operator.
auto RHS = ParseUnary(); auto RHS = ParseUnary();
if (!RHS) if (!RHS)
return nullptr; return nullptr;
// If BinOp binds less tightly with RHS than the operator after RHS, let // If BinOp binds less tightly with RHS than the operator after RHS, let
// the pending operator take RHS as its LHS. // the pending operator take RHS as its LHS.
int NextPrec = GetTokPrecedence(); int NextPrec = GetTokPrecedence();
@ -531,7 +531,7 @@ static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
if (!RHS) if (!RHS)
return nullptr; return nullptr;
} }
// Merge LHS/RHS. // Merge LHS/RHS.
LHS = llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS)); LHS = llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS));
} }
@ -544,7 +544,7 @@ static std::unique_ptr<ExprAST> ParseExpression() {
auto LHS = ParseUnary(); auto LHS = ParseUnary();
if (!LHS) if (!LHS)
return nullptr; return nullptr;
return ParseBinOpRHS(0, std::move(LHS)); return ParseBinOpRHS(0, std::move(LHS));
} }
@ -554,10 +554,10 @@ static std::unique_ptr<ExprAST> ParseExpression() {
/// ::= unary LETTER (id) /// ::= unary LETTER (id)
static std::unique_ptr<PrototypeAST> ParsePrototype() { static std::unique_ptr<PrototypeAST> ParsePrototype() {
std::string FnName; std::string FnName;
unsigned Kind = 0; // 0 = identifier, 1 = unary, 2 = binary. unsigned Kind = 0; // 0 = identifier, 1 = unary, 2 = binary.
unsigned BinaryPrecedence = 30; unsigned BinaryPrecedence = 30;
switch (CurTok) { switch (CurTok) {
default: default:
return ErrorU<PrototypeAST>("Expected function name in prototype"); return ErrorU<PrototypeAST>("Expected function name in prototype");
@ -583,7 +583,7 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
FnName += (char)CurTok; FnName += (char)CurTok;
Kind = 2; Kind = 2;
getNextToken(); getNextToken();
// Read the precedence if present. // Read the precedence if present.
if (CurTok == tok_number) { if (CurTok == tok_number) {
if (NumVal < 1 || NumVal > 100) if (NumVal < 1 || NumVal > 100)
@ -593,23 +593,23 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
} }
break; break;
} }
if (CurTok != '(') if (CurTok != '(')
return ErrorU<PrototypeAST>("Expected '(' in prototype"); return ErrorU<PrototypeAST>("Expected '(' in prototype");
std::vector<std::string> ArgNames; std::vector<std::string> ArgNames;
while (getNextToken() == tok_identifier) while (getNextToken() == tok_identifier)
ArgNames.push_back(IdentifierStr); ArgNames.push_back(IdentifierStr);
if (CurTok != ')') if (CurTok != ')')
return ErrorU<PrototypeAST>("Expected ')' in prototype"); return ErrorU<PrototypeAST>("Expected ')' in prototype");
// success. // success.
getNextToken(); // eat ')'. getNextToken(); // eat ')'.
// Verify right number of names for operator. // Verify right number of names for operator.
if (Kind && ArgNames.size() != Kind) if (Kind && ArgNames.size() != Kind)
return ErrorU<PrototypeAST>("Invalid number of operands for operator"); return ErrorU<PrototypeAST>("Invalid number of operands for operator");
return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames), Kind != 0, return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames), Kind != 0,
BinaryPrecedence); BinaryPrecedence);
} }
@ -690,10 +690,10 @@ public:
PrototypeAST* getPrototypeAST(const std::string &Name); PrototypeAST* getPrototypeAST(const std::string &Name);
private: private:
typedef std::map<std::string, std::unique_ptr<PrototypeAST>> PrototypeMap; typedef std::map<std::string, std::unique_ptr<PrototypeAST>> PrototypeMap;
LLVMContext &Context; LLVMContext &Context;
std::unique_ptr<TargetMachine> TM; std::unique_ptr<TargetMachine> TM;
PrototypeMap Prototypes; PrototypeMap Prototypes;
}; };
@ -794,11 +794,11 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
} }
return ErrorP<Value>("Unknown variable name"); return ErrorP<Value>("Unknown variable name");
} }
Value *L = LHS->IRGen(C); Value *L = LHS->IRGen(C);
Value *R = RHS->IRGen(C); Value *R = RHS->IRGen(C);
if (!L || !R) return nullptr; if (!L || !R) return nullptr;
switch (Op) { switch (Op) {
case '+': return C.getBuilder().CreateFAdd(L, R, "addtmp"); case '+': return C.getBuilder().CreateFAdd(L, R, "addtmp");
case '-': return C.getBuilder().CreateFSub(L, R, "subtmp"); case '-': return C.getBuilder().CreateFSub(L, R, "subtmp");
@ -811,7 +811,7 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
"booltmp"); "booltmp");
default: break; default: break;
} }
// If it wasn't a builtin binary operator, it must be a user defined one. Emit // If it wasn't a builtin binary operator, it must be a user defined one. Emit
// a call to it. // a call to it.
std::string FnName = MakeLegalFunctionName(std::string("binary")+Op); std::string FnName = MakeLegalFunctionName(std::string("binary")+Op);
@ -819,7 +819,7 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
Value *Ops[] = { L, R }; Value *Ops[] = { L, R };
return C.getBuilder().CreateCall(F, Ops, "binop"); return C.getBuilder().CreateCall(F, Ops, "binop");
} }
return ErrorP<Value>("Unknown binary operator"); return ErrorP<Value>("Unknown binary operator");
} }
@ -835,7 +835,7 @@ Value *CallExprAST::IRGen(IRGenContext &C) const {
ArgsV.push_back(Args[i]->IRGen(C)); ArgsV.push_back(Args[i]->IRGen(C));
if (!ArgsV.back()) return nullptr; if (!ArgsV.back()) return nullptr;
} }
return C.getBuilder().CreateCall(CalleeF, ArgsV, "calltmp"); return C.getBuilder().CreateCall(CalleeF, ArgsV, "calltmp");
} }
@ -845,49 +845,49 @@ Value *CallExprAST::IRGen(IRGenContext &C) const {
Value *IfExprAST::IRGen(IRGenContext &C) const { Value *IfExprAST::IRGen(IRGenContext &C) const {
Value *CondV = Cond->IRGen(C); Value *CondV = Cond->IRGen(C);
if (!CondV) return nullptr; if (!CondV) return nullptr;
// Convert condition to a bool by comparing equal to 0.0. // Convert condition to a bool by comparing equal to 0.0.
ConstantFP *FPZero = ConstantFP *FPZero =
ConstantFP::get(C.getLLVMContext(), APFloat(0.0)); ConstantFP::get(C.getLLVMContext(), APFloat(0.0));
CondV = C.getBuilder().CreateFCmpONE(CondV, FPZero, "ifcond"); CondV = C.getBuilder().CreateFCmpONE(CondV, FPZero, "ifcond");
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Create blocks for the then and else cases. Insert the 'then' block at the // Create blocks for the then and else cases. Insert the 'then' block at the
// end of the function. // end of the function.
BasicBlock *ThenBB = BasicBlock::Create(C.getLLVMContext(), "then", TheFunction); BasicBlock *ThenBB = BasicBlock::Create(C.getLLVMContext(), "then", TheFunction);
BasicBlock *ElseBB = BasicBlock::Create(C.getLLVMContext(), "else"); BasicBlock *ElseBB = BasicBlock::Create(C.getLLVMContext(), "else");
BasicBlock *MergeBB = BasicBlock::Create(C.getLLVMContext(), "ifcont"); BasicBlock *MergeBB = BasicBlock::Create(C.getLLVMContext(), "ifcont");
C.getBuilder().CreateCondBr(CondV, ThenBB, ElseBB); C.getBuilder().CreateCondBr(CondV, ThenBB, ElseBB);
// Emit then value. // Emit then value.
C.getBuilder().SetInsertPoint(ThenBB); C.getBuilder().SetInsertPoint(ThenBB);
Value *ThenV = Then->IRGen(C); Value *ThenV = Then->IRGen(C);
if (!ThenV) return nullptr; if (!ThenV) return nullptr;
C.getBuilder().CreateBr(MergeBB); C.getBuilder().CreateBr(MergeBB);
// Codegen of 'Then' can change the current block, update ThenBB for the PHI. // Codegen of 'Then' can change the current block, update ThenBB for the PHI.
ThenBB = C.getBuilder().GetInsertBlock(); ThenBB = C.getBuilder().GetInsertBlock();
// Emit else block. // Emit else block.
TheFunction->getBasicBlockList().push_back(ElseBB); TheFunction->getBasicBlockList().push_back(ElseBB);
C.getBuilder().SetInsertPoint(ElseBB); C.getBuilder().SetInsertPoint(ElseBB);
Value *ElseV = Else->IRGen(C); Value *ElseV = Else->IRGen(C);
if (!ElseV) return nullptr; if (!ElseV) return nullptr;
C.getBuilder().CreateBr(MergeBB); C.getBuilder().CreateBr(MergeBB);
// Codegen of 'Else' can change the current block, update ElseBB for the PHI. // Codegen of 'Else' can change the current block, update ElseBB for the PHI.
ElseBB = C.getBuilder().GetInsertBlock(); ElseBB = C.getBuilder().GetInsertBlock();
// Emit merge block. // Emit merge block.
TheFunction->getBasicBlockList().push_back(MergeBB); TheFunction->getBasicBlockList().push_back(MergeBB);
C.getBuilder().SetInsertPoint(MergeBB); C.getBuilder().SetInsertPoint(MergeBB);
PHINode *PN = C.getBuilder().CreatePHI(Type::getDoubleTy(getGlobalContext()), 2, PHINode *PN = C.getBuilder().CreatePHI(Type::getDoubleTy(getGlobalContext()), 2,
"iftmp"); "iftmp");
PN->addIncoming(ThenV, ThenBB); PN->addIncoming(ThenV, ThenBB);
PN->addIncoming(ElseV, ElseBB); PN->addIncoming(ElseV, ElseBB);
return PN; return PN;
@ -900,7 +900,7 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// start = startexpr // start = startexpr
// store start -> var // store start -> var
// goto loop // goto loop
// loop: // loop:
// ... // ...
// bodyexpr // bodyexpr
// ... // ...
@ -913,40 +913,40 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// store nextvar -> var // store nextvar -> var
// br endcond, loop, endloop // br endcond, loop, endloop
// outloop: // outloop:
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Create an alloca for the variable in the entry block. // Create an alloca for the variable in the entry block.
AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName); AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName);
// Emit the start code first, without 'variable' in scope. // Emit the start code first, without 'variable' in scope.
Value *StartVal = Start->IRGen(C); Value *StartVal = Start->IRGen(C);
if (!StartVal) return nullptr; if (!StartVal) return nullptr;
// Store the value into the alloca. // Store the value into the alloca.
C.getBuilder().CreateStore(StartVal, Alloca); C.getBuilder().CreateStore(StartVal, Alloca);
// Make the new basic block for the loop header, inserting after current // Make the new basic block for the loop header, inserting after current
// block. // block.
BasicBlock *LoopBB = BasicBlock::Create(getGlobalContext(), "loop", TheFunction); BasicBlock *LoopBB = BasicBlock::Create(getGlobalContext(), "loop", TheFunction);
// Insert an explicit fall through from the current block to the LoopBB. // Insert an explicit fall through from the current block to the LoopBB.
C.getBuilder().CreateBr(LoopBB); C.getBuilder().CreateBr(LoopBB);
// Start insertion in LoopBB. // Start insertion in LoopBB.
C.getBuilder().SetInsertPoint(LoopBB); C.getBuilder().SetInsertPoint(LoopBB);
// Within the loop, the variable is defined equal to the PHI node. If it // Within the loop, the variable is defined equal to the PHI node. If it
// shadows an existing variable, we have to restore it, so save it now. // shadows an existing variable, we have to restore it, so save it now.
AllocaInst *OldVal = C.NamedValues[VarName]; AllocaInst *OldVal = C.NamedValues[VarName];
C.NamedValues[VarName] = Alloca; C.NamedValues[VarName] = Alloca;
// Emit the body of the loop. This, like any other expr, can change the // Emit the body of the loop. This, like any other expr, can change the
// current BB. Note that we ignore the value computed by the body, but don't // current BB. Note that we ignore the value computed by the body, but don't
// allow an error. // allow an error.
if (!Body->IRGen(C)) if (!Body->IRGen(C))
return nullptr; return nullptr;
// Emit the step value. // Emit the step value.
Value *StepVal; Value *StepVal;
if (Step) { if (Step) {
@ -956,52 +956,52 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// If not specified, use 1.0. // If not specified, use 1.0.
StepVal = ConstantFP::get(getGlobalContext(), APFloat(1.0)); StepVal = ConstantFP::get(getGlobalContext(), APFloat(1.0));
} }
// Compute the end condition. // Compute the end condition.
Value *EndCond = End->IRGen(C); Value *EndCond = End->IRGen(C);
if (EndCond == 0) return EndCond; if (EndCond == 0) return EndCond;
// Reload, increment, and restore the alloca. This handles the case where // Reload, increment, and restore the alloca. This handles the case where
// the body of the loop mutates the variable. // the body of the loop mutates the variable.
Value *CurVar = C.getBuilder().CreateLoad(Alloca, VarName.c_str()); Value *CurVar = C.getBuilder().CreateLoad(Alloca, VarName.c_str());
Value *NextVar = C.getBuilder().CreateFAdd(CurVar, StepVal, "nextvar"); Value *NextVar = C.getBuilder().CreateFAdd(CurVar, StepVal, "nextvar");
C.getBuilder().CreateStore(NextVar, Alloca); C.getBuilder().CreateStore(NextVar, Alloca);
// Convert condition to a bool by comparing equal to 0.0. // Convert condition to a bool by comparing equal to 0.0.
EndCond = C.getBuilder().CreateFCmpONE(EndCond, EndCond = C.getBuilder().CreateFCmpONE(EndCond,
ConstantFP::get(getGlobalContext(), APFloat(0.0)), ConstantFP::get(getGlobalContext(), APFloat(0.0)),
"loopcond"); "loopcond");
// Create the "after loop" block and insert it. // Create the "after loop" block and insert it.
BasicBlock *AfterBB = BasicBlock::Create(getGlobalContext(), "afterloop", TheFunction); BasicBlock *AfterBB = BasicBlock::Create(getGlobalContext(), "afterloop", TheFunction);
// Insert the conditional branch into the end of LoopEndBB. // Insert the conditional branch into the end of LoopEndBB.
C.getBuilder().CreateCondBr(EndCond, LoopBB, AfterBB); C.getBuilder().CreateCondBr(EndCond, LoopBB, AfterBB);
// Any new code will be inserted in AfterBB. // Any new code will be inserted in AfterBB.
C.getBuilder().SetInsertPoint(AfterBB); C.getBuilder().SetInsertPoint(AfterBB);
// Restore the unshadowed variable. // Restore the unshadowed variable.
if (OldVal) if (OldVal)
C.NamedValues[VarName] = OldVal; C.NamedValues[VarName] = OldVal;
else else
C.NamedValues.erase(VarName); C.NamedValues.erase(VarName);
// for expr always returns 0.0. // for expr always returns 0.0.
return Constant::getNullValue(Type::getDoubleTy(getGlobalContext())); return Constant::getNullValue(Type::getDoubleTy(getGlobalContext()));
} }
Value *VarExprAST::IRGen(IRGenContext &C) const { Value *VarExprAST::IRGen(IRGenContext &C) const {
std::vector<AllocaInst *> OldBindings; std::vector<AllocaInst *> OldBindings;
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Register all variables and emit their initializer. // Register all variables and emit their initializer.
for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) { for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) {
auto &VarName = VarBindings[i].first; auto &VarName = VarBindings[i].first;
auto &Init = VarBindings[i].second; auto &Init = VarBindings[i].second;
// Emit the initializer before adding the variable to scope, this prevents // Emit the initializer before adding the variable to scope, this prevents
// the initializer from referencing the variable itself, and permits stuff // the initializer from referencing the variable itself, and permits stuff
// like this: // like this:
@ -1013,22 +1013,22 @@ Value *VarExprAST::IRGen(IRGenContext &C) const {
if (!InitVal) return nullptr; if (!InitVal) return nullptr;
} else // If not specified, use 0.0. } else // If not specified, use 0.0.
InitVal = ConstantFP::get(getGlobalContext(), APFloat(0.0)); InitVal = ConstantFP::get(getGlobalContext(), APFloat(0.0));
AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName); AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName);
C.getBuilder().CreateStore(InitVal, Alloca); C.getBuilder().CreateStore(InitVal, Alloca);
// Remember the old variable binding so that we can restore the binding when // Remember the old variable binding so that we can restore the binding when
// we unrecurse. // we unrecurse.
OldBindings.push_back(C.NamedValues[VarName]); OldBindings.push_back(C.NamedValues[VarName]);
// Remember this binding. // Remember this binding.
C.NamedValues[VarName] = Alloca; C.NamedValues[VarName] = Alloca;
} }
// Codegen the body, now that all vars are in scope. // Codegen the body, now that all vars are in scope.
Value *BodyVal = Body->IRGen(C); Value *BodyVal = Body->IRGen(C);
if (!BodyVal) return nullptr; if (!BodyVal) return nullptr;
// Pop all our variables from scope. // Pop all our variables from scope.
for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) for (unsigned i = 0, e = VarBindings.size(); i != e; ++i)
C.NamedValues[VarBindings[i].first] = OldBindings[i]; C.NamedValues[VarBindings[i].first] = OldBindings[i];
@ -1041,7 +1041,7 @@ Function *PrototypeAST::IRGen(IRGenContext &C) const {
std::string FnName = MakeLegalFunctionName(Name); std::string FnName = MakeLegalFunctionName(Name);
// Make the function type: double(double,double) etc. // Make the function type: double(double,double) etc.
std::vector<Type*> Doubles(Args.size(), std::vector<Type*> Doubles(Args.size(),
Type::getDoubleTy(getGlobalContext())); Type::getDoubleTy(getGlobalContext()));
FunctionType *FT = FunctionType::get(Type::getDoubleTy(getGlobalContext()), FunctionType *FT = FunctionType::get(Type::getDoubleTy(getGlobalContext()),
Doubles, false); Doubles, false);
@ -1054,26 +1054,26 @@ Function *PrototypeAST::IRGen(IRGenContext &C) const {
// Delete the one we just made and get the existing one. // Delete the one we just made and get the existing one.
F->eraseFromParent(); F->eraseFromParent();
F = C.getM().getFunction(Name); F = C.getM().getFunction(Name);
// If F already has a body, reject this. // If F already has a body, reject this.
if (!F->empty()) { if (!F->empty()) {
ErrorP<Function>("redefinition of function"); ErrorP<Function>("redefinition of function");
return nullptr; return nullptr;
} }
// If F took a different number of args, reject. // If F took a different number of args, reject.
if (F->arg_size() != Args.size()) { if (F->arg_size() != Args.size()) {
ErrorP<Function>("redefinition of function with different # args"); ErrorP<Function>("redefinition of function with different # args");
return nullptr; return nullptr;
} }
} }
// Set names for all arguments. // Set names for all arguments.
unsigned Idx = 0; unsigned Idx = 0;
for (Function::arg_iterator AI = F->arg_begin(); Idx != Args.size(); for (Function::arg_iterator AI = F->arg_begin(); Idx != Args.size();
++AI, ++Idx) ++AI, ++Idx)
AI->setName(Args[Idx]); AI->setName(Args[Idx]);
return F; return F;
} }
@ -1095,19 +1095,19 @@ void PrototypeAST::CreateArgumentAllocas(Function *F, IRGenContext &C) {
Function *FunctionAST::IRGen(IRGenContext &C) const { Function *FunctionAST::IRGen(IRGenContext &C) const {
C.NamedValues.clear(); C.NamedValues.clear();
Function *TheFunction = Proto->IRGen(C); Function *TheFunction = Proto->IRGen(C);
if (!TheFunction) if (!TheFunction)
return nullptr; return nullptr;
// If this is an operator, install it. // If this is an operator, install it.
if (Proto->isBinaryOp()) if (Proto->isBinaryOp())
BinopPrecedence[Proto->getOperatorName()] = Proto->Precedence; BinopPrecedence[Proto->getOperatorName()] = Proto->Precedence;
// Create a new basic block to start insertion into. // Create a new basic block to start insertion into.
BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction); BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction);
C.getBuilder().SetInsertPoint(BB); C.getBuilder().SetInsertPoint(BB);
// Add all arguments to the symbol table and create their allocas. // Add all arguments to the symbol table and create their allocas.
Proto->CreateArgumentAllocas(TheFunction, C); Proto->CreateArgumentAllocas(TheFunction, C);
@ -1120,7 +1120,7 @@ Function *FunctionAST::IRGen(IRGenContext &C) const {
return TheFunction; return TheFunction;
} }
// Error reading body, remove function. // Error reading body, remove function.
TheFunction->eraseFromParent(); TheFunction->eraseFromParent();
@ -1246,7 +1246,7 @@ static void HandleTopLevelExpression(SessionContext &S, KaleidoscopeJIT &J) {
// Get the address of the JIT'd function in memory. // Get the address of the JIT'd function in memory.
auto ExprSymbol = J.findUnmangledSymbol("__anon_expr"); auto ExprSymbol = J.findUnmangledSymbol("__anon_expr");
// Cast it to the right type (takes no arguments, returns a double) so we // Cast it to the right type (takes no arguments, returns a double) so we
// can call it as a native function. // can call it as a native function.
double (*FP)() = (double (*)())(intptr_t)ExprSymbol.getAddress(); double (*FP)() = (double (*)())(intptr_t)ExprSymbol.getAddress();
@ -1289,20 +1289,20 @@ static void MainLoop() {
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// putchard - putchar that takes a double and returns 0. /// putchard - putchar that takes a double and returns 0.
extern "C" extern "C"
double putchard(double X) { double putchard(double X) {
putchar((char)X); putchar((char)X);
return 0; return 0;
} }
/// printd - printf that takes a double prints it as "%f\n", returning 0. /// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" extern "C"
double printd(double X) { double printd(double X) {
printf("%f", X); printf("%f", X);
return 0; return 0;
} }
extern "C" extern "C"
double printlf() { double printlf() {
printf("\n"); printf("\n");
return 0; return 0;
@ -1339,4 +1339,3 @@ int main() {
return 0; return 0;
} }

View File

@ -38,14 +38,14 @@ enum Token {
// primary // primary
tok_identifier = -4, tok_number = -5, tok_identifier = -4, tok_number = -5,
// control // control
tok_if = -6, tok_then = -7, tok_else = -8, tok_if = -6, tok_then = -7, tok_else = -8,
tok_for = -9, tok_in = -10, tok_for = -9, tok_in = -10,
// operators // operators
tok_binary = -11, tok_unary = -12, tok_binary = -11, tok_unary = -12,
// var definition // var definition
tok_var = -13 tok_var = -13
}; };
@ -94,11 +94,11 @@ static int gettok() {
// Comment until end of line. // Comment until end of line.
do LastChar = getchar(); do LastChar = getchar();
while (LastChar != EOF && LastChar != '\n' && LastChar != '\r'); while (LastChar != EOF && LastChar != '\n' && LastChar != '\r');
if (LastChar != EOF) if (LastChar != EOF)
return gettok(); return gettok();
} }
// Check for end of file. Don't eat the EOF. // Check for end of file. Don't eat the EOF.
if (LastChar == EOF) if (LastChar == EOF)
return tok_eof; return tok_eof;
@ -139,7 +139,7 @@ struct VariableExprAST : public ExprAST {
/// UnaryExprAST - Expression class for a unary operator. /// UnaryExprAST - Expression class for a unary operator.
struct UnaryExprAST : public ExprAST { struct UnaryExprAST : public ExprAST {
UnaryExprAST(char Opcode, std::unique_ptr<ExprAST> Operand) UnaryExprAST(char Opcode, std::unique_ptr<ExprAST> Operand)
: Opcode(std::move(Opcode)), Operand(std::move(Operand)) {} : Opcode(std::move(Opcode)), Operand(std::move(Operand)) {}
Value *IRGen(IRGenContext &C) const override; Value *IRGen(IRGenContext &C) const override;
@ -151,7 +151,7 @@ struct UnaryExprAST : public ExprAST {
/// BinaryExprAST - Expression class for a binary operator. /// BinaryExprAST - Expression class for a binary operator.
struct BinaryExprAST : public ExprAST { struct BinaryExprAST : public ExprAST {
BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS, BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS,
std::unique_ptr<ExprAST> RHS) std::unique_ptr<ExprAST> RHS)
: Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {} : Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {}
Value *IRGen(IRGenContext &C) const override; Value *IRGen(IRGenContext &C) const override;
@ -223,7 +223,7 @@ struct PrototypeAST {
bool isUnaryOp() const { return IsOperator && Args.size() == 1; } bool isUnaryOp() const { return IsOperator && Args.size() == 1; }
bool isBinaryOp() const { return IsOperator && Args.size() == 2; } bool isBinaryOp() const { return IsOperator && Args.size() == 2; }
char getOperatorName() const { char getOperatorName() const {
assert(isUnaryOp() || isBinaryOp()); assert(isUnaryOp() || isBinaryOp());
return Name[Name.size()-1]; return Name[Name.size()-1];
@ -267,7 +267,7 @@ static std::map<char, int> BinopPrecedence;
static int GetTokPrecedence() { static int GetTokPrecedence() {
if (!isascii(CurTok)) if (!isascii(CurTok))
return -1; return -1;
// Make sure it's a declared binop. // Make sure it's a declared binop.
int TokPrec = BinopPrecedence[CurTok]; int TokPrec = BinopPrecedence[CurTok];
if (TokPrec <= 0) return -1; if (TokPrec <= 0) return -1;
@ -293,12 +293,12 @@ static std::unique_ptr<ExprAST> ParseExpression();
/// ::= identifier '(' expression* ')' /// ::= identifier '(' expression* ')'
static std::unique_ptr<ExprAST> ParseIdentifierExpr() { static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
std::string IdName = IdentifierStr; std::string IdName = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
if (CurTok != '(') // Simple variable ref. if (CurTok != '(') // Simple variable ref.
return llvm::make_unique<VariableExprAST>(IdName); return llvm::make_unique<VariableExprAST>(IdName);
// Call. // Call.
getNextToken(); // eat ( getNextToken(); // eat (
std::vector<std::unique_ptr<ExprAST>> Args; std::vector<std::unique_ptr<ExprAST>> Args;
@ -318,7 +318,7 @@ static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
// Eat the ')'. // Eat the ')'.
getNextToken(); getNextToken();
return llvm::make_unique<CallExprAST>(IdName, std::move(Args)); return llvm::make_unique<CallExprAST>(IdName, std::move(Args));
} }
@ -335,7 +335,7 @@ static std::unique_ptr<ExprAST> ParseParenExpr() {
auto V = ParseExpression(); auto V = ParseExpression();
if (!V) if (!V)
return nullptr; return nullptr;
if (CurTok != ')') if (CurTok != ')')
return ErrorU<ExprAST>("expected ')'"); return ErrorU<ExprAST>("expected ')'");
getNextToken(); // eat ). getNextToken(); // eat ).
@ -345,29 +345,29 @@ static std::unique_ptr<ExprAST> ParseParenExpr() {
/// ifexpr ::= 'if' expression 'then' expression 'else' expression /// ifexpr ::= 'if' expression 'then' expression 'else' expression
static std::unique_ptr<ExprAST> ParseIfExpr() { static std::unique_ptr<ExprAST> ParseIfExpr() {
getNextToken(); // eat the if. getNextToken(); // eat the if.
// condition. // condition.
auto Cond = ParseExpression(); auto Cond = ParseExpression();
if (!Cond) if (!Cond)
return nullptr; return nullptr;
if (CurTok != tok_then) if (CurTok != tok_then)
return ErrorU<ExprAST>("expected then"); return ErrorU<ExprAST>("expected then");
getNextToken(); // eat the then getNextToken(); // eat the then
auto Then = ParseExpression(); auto Then = ParseExpression();
if (!Then) if (!Then)
return nullptr; return nullptr;
if (CurTok != tok_else) if (CurTok != tok_else)
return ErrorU<ExprAST>("expected else"); return ErrorU<ExprAST>("expected else");
getNextToken(); getNextToken();
auto Else = ParseExpression(); auto Else = ParseExpression();
if (!Else) if (!Else)
return nullptr; return nullptr;
return llvm::make_unique<IfExprAST>(std::move(Cond), std::move(Then), return llvm::make_unique<IfExprAST>(std::move(Cond), std::move(Then),
std::move(Else)); std::move(Else));
} }
@ -378,26 +378,26 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<ForExprAST>("expected identifier after for"); return ErrorU<ForExprAST>("expected identifier after for");
std::string IdName = IdentifierStr; std::string IdName = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
if (CurTok != '=') if (CurTok != '=')
return ErrorU<ForExprAST>("expected '=' after for"); return ErrorU<ForExprAST>("expected '=' after for");
getNextToken(); // eat '='. getNextToken(); // eat '='.
auto Start = ParseExpression(); auto Start = ParseExpression();
if (!Start) if (!Start)
return nullptr; return nullptr;
if (CurTok != ',') if (CurTok != ',')
return ErrorU<ForExprAST>("expected ',' after for start value"); return ErrorU<ForExprAST>("expected ',' after for start value");
getNextToken(); getNextToken();
auto End = ParseExpression(); auto End = ParseExpression();
if (!End) if (!End)
return nullptr; return nullptr;
// The step value is optional. // The step value is optional.
std::unique_ptr<ExprAST> Step; std::unique_ptr<ExprAST> Step;
if (CurTok == ',') { if (CurTok == ',') {
@ -406,11 +406,11 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
if (!Step) if (!Step)
return nullptr; return nullptr;
} }
if (CurTok != tok_in) if (CurTok != tok_in)
return ErrorU<ForExprAST>("expected 'in' after for"); return ErrorU<ForExprAST>("expected 'in' after for");
getNextToken(); // eat 'in'. getNextToken(); // eat 'in'.
auto Body = ParseExpression(); auto Body = ParseExpression();
if (Body) if (Body)
return nullptr; return nullptr;
@ -419,7 +419,7 @@ static std::unique_ptr<ForExprAST> ParseForExpr() {
std::move(Step), std::move(Body)); std::move(Step), std::move(Body));
} }
/// varexpr ::= 'var' identifier ('=' expression)? /// varexpr ::= 'var' identifier ('=' expression)?
// (',' identifier ('=' expression)?)* 'in' expression // (',' identifier ('=' expression)?)* 'in' expression
static std::unique_ptr<VarExprAST> ParseVarExpr() { static std::unique_ptr<VarExprAST> ParseVarExpr() {
getNextToken(); // eat the var. getNextToken(); // eat the var.
@ -429,7 +429,7 @@ static std::unique_ptr<VarExprAST> ParseVarExpr() {
// At least one variable name is required. // At least one variable name is required.
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<VarExprAST>("expected identifier after var"); return ErrorU<VarExprAST>("expected identifier after var");
while (1) { while (1) {
std::string Name = IdentifierStr; std::string Name = IdentifierStr;
getNextToken(); // eat identifier. getNextToken(); // eat identifier.
@ -438,31 +438,31 @@ static std::unique_ptr<VarExprAST> ParseVarExpr() {
std::unique_ptr<ExprAST> Init; std::unique_ptr<ExprAST> Init;
if (CurTok == '=') { if (CurTok == '=') {
getNextToken(); // eat the '='. getNextToken(); // eat the '='.
Init = ParseExpression(); Init = ParseExpression();
if (!Init) if (!Init)
return nullptr; return nullptr;
} }
VarBindings.push_back(VarExprAST::Binding(Name, std::move(Init))); VarBindings.push_back(VarExprAST::Binding(Name, std::move(Init)));
// End of var list, exit loop. // End of var list, exit loop.
if (CurTok != ',') break; if (CurTok != ',') break;
getNextToken(); // eat the ','. getNextToken(); // eat the ','.
if (CurTok != tok_identifier) if (CurTok != tok_identifier)
return ErrorU<VarExprAST>("expected identifier list after var"); return ErrorU<VarExprAST>("expected identifier list after var");
} }
// At this point, we have to have 'in'. // At this point, we have to have 'in'.
if (CurTok != tok_in) if (CurTok != tok_in)
return ErrorU<VarExprAST>("expected 'in' keyword after 'var'"); return ErrorU<VarExprAST>("expected 'in' keyword after 'var'");
getNextToken(); // eat 'in'. getNextToken(); // eat 'in'.
auto Body = ParseExpression(); auto Body = ParseExpression();
if (!Body) if (!Body)
return nullptr; return nullptr;
return llvm::make_unique<VarExprAST>(std::move(VarBindings), std::move(Body)); return llvm::make_unique<VarExprAST>(std::move(VarBindings), std::move(Body));
} }
@ -492,7 +492,7 @@ static std::unique_ptr<ExprAST> ParseUnary() {
// If the current token is not an operator, it must be a primary expr. // If the current token is not an operator, it must be a primary expr.
if (!isascii(CurTok) || CurTok == '(' || CurTok == ',') if (!isascii(CurTok) || CurTok == '(' || CurTok == ',')
return ParsePrimary(); return ParsePrimary();
// If this is a unary operator, read it. // If this is a unary operator, read it.
int Opc = CurTok; int Opc = CurTok;
getNextToken(); getNextToken();
@ -508,21 +508,21 @@ static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
// If this is a binop, find its precedence. // If this is a binop, find its precedence.
while (1) { while (1) {
int TokPrec = GetTokPrecedence(); int TokPrec = GetTokPrecedence();
// If this is a binop that binds at least as tightly as the current binop, // If this is a binop that binds at least as tightly as the current binop,
// consume it, otherwise we are done. // consume it, otherwise we are done.
if (TokPrec < ExprPrec) if (TokPrec < ExprPrec)
return LHS; return LHS;
// Okay, we know this is a binop. // Okay, we know this is a binop.
int BinOp = CurTok; int BinOp = CurTok;
getNextToken(); // eat binop getNextToken(); // eat binop
// Parse the unary expression after the binary operator. // Parse the unary expression after the binary operator.
auto RHS = ParseUnary(); auto RHS = ParseUnary();
if (!RHS) if (!RHS)
return nullptr; return nullptr;
// If BinOp binds less tightly with RHS than the operator after RHS, let // If BinOp binds less tightly with RHS than the operator after RHS, let
// the pending operator take RHS as its LHS. // the pending operator take RHS as its LHS.
int NextPrec = GetTokPrecedence(); int NextPrec = GetTokPrecedence();
@ -531,7 +531,7 @@ static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
if (!RHS) if (!RHS)
return nullptr; return nullptr;
} }
// Merge LHS/RHS. // Merge LHS/RHS.
LHS = llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS)); LHS = llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS));
} }
@ -544,7 +544,7 @@ static std::unique_ptr<ExprAST> ParseExpression() {
auto LHS = ParseUnary(); auto LHS = ParseUnary();
if (!LHS) if (!LHS)
return nullptr; return nullptr;
return ParseBinOpRHS(0, std::move(LHS)); return ParseBinOpRHS(0, std::move(LHS));
} }
@ -554,10 +554,10 @@ static std::unique_ptr<ExprAST> ParseExpression() {
/// ::= unary LETTER (id) /// ::= unary LETTER (id)
static std::unique_ptr<PrototypeAST> ParsePrototype() { static std::unique_ptr<PrototypeAST> ParsePrototype() {
std::string FnName; std::string FnName;
unsigned Kind = 0; // 0 = identifier, 1 = unary, 2 = binary. unsigned Kind = 0; // 0 = identifier, 1 = unary, 2 = binary.
unsigned BinaryPrecedence = 30; unsigned BinaryPrecedence = 30;
switch (CurTok) { switch (CurTok) {
default: default:
return ErrorU<PrototypeAST>("Expected function name in prototype"); return ErrorU<PrototypeAST>("Expected function name in prototype");
@ -583,7 +583,7 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
FnName += (char)CurTok; FnName += (char)CurTok;
Kind = 2; Kind = 2;
getNextToken(); getNextToken();
// Read the precedence if present. // Read the precedence if present.
if (CurTok == tok_number) { if (CurTok == tok_number) {
if (NumVal < 1 || NumVal > 100) if (NumVal < 1 || NumVal > 100)
@ -593,23 +593,23 @@ static std::unique_ptr<PrototypeAST> ParsePrototype() {
} }
break; break;
} }
if (CurTok != '(') if (CurTok != '(')
return ErrorU<PrototypeAST>("Expected '(' in prototype"); return ErrorU<PrototypeAST>("Expected '(' in prototype");
std::vector<std::string> ArgNames; std::vector<std::string> ArgNames;
while (getNextToken() == tok_identifier) while (getNextToken() == tok_identifier)
ArgNames.push_back(IdentifierStr); ArgNames.push_back(IdentifierStr);
if (CurTok != ')') if (CurTok != ')')
return ErrorU<PrototypeAST>("Expected ')' in prototype"); return ErrorU<PrototypeAST>("Expected ')' in prototype");
// success. // success.
getNextToken(); // eat ')'. getNextToken(); // eat ')'.
// Verify right number of names for operator. // Verify right number of names for operator.
if (Kind && ArgNames.size() != Kind) if (Kind && ArgNames.size() != Kind)
return ErrorU<PrototypeAST>("Invalid number of operands for operator"); return ErrorU<PrototypeAST>("Invalid number of operands for operator");
return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames), Kind != 0, return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames), Kind != 0,
BinaryPrecedence); BinaryPrecedence);
} }
@ -690,10 +690,10 @@ public:
PrototypeAST* getPrototypeAST(const std::string &Name); PrototypeAST* getPrototypeAST(const std::string &Name);
private: private:
typedef std::map<std::string, std::unique_ptr<PrototypeAST>> PrototypeMap; typedef std::map<std::string, std::unique_ptr<PrototypeAST>> PrototypeMap;
LLVMContext &Context; LLVMContext &Context;
std::unique_ptr<TargetMachine> TM; std::unique_ptr<TargetMachine> TM;
PrototypeMap Prototypes; PrototypeMap Prototypes;
}; };
@ -794,11 +794,11 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
} }
return ErrorP<Value>("Unknown variable name"); return ErrorP<Value>("Unknown variable name");
} }
Value *L = LHS->IRGen(C); Value *L = LHS->IRGen(C);
Value *R = RHS->IRGen(C); Value *R = RHS->IRGen(C);
if (!L || !R) return nullptr; if (!L || !R) return nullptr;
switch (Op) { switch (Op) {
case '+': return C.getBuilder().CreateFAdd(L, R, "addtmp"); case '+': return C.getBuilder().CreateFAdd(L, R, "addtmp");
case '-': return C.getBuilder().CreateFSub(L, R, "subtmp"); case '-': return C.getBuilder().CreateFSub(L, R, "subtmp");
@ -811,7 +811,7 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
"booltmp"); "booltmp");
default: break; default: break;
} }
// If it wasn't a builtin binary operator, it must be a user defined one. Emit // If it wasn't a builtin binary operator, it must be a user defined one. Emit
// a call to it. // a call to it.
std::string FnName = MakeLegalFunctionName(std::string("binary")+Op); std::string FnName = MakeLegalFunctionName(std::string("binary")+Op);
@ -819,7 +819,7 @@ Value *BinaryExprAST::IRGen(IRGenContext &C) const {
Value *Ops[] = { L, R }; Value *Ops[] = { L, R };
return C.getBuilder().CreateCall(F, Ops, "binop"); return C.getBuilder().CreateCall(F, Ops, "binop");
} }
return ErrorP<Value>("Unknown binary operator"); return ErrorP<Value>("Unknown binary operator");
} }
@ -835,7 +835,7 @@ Value *CallExprAST::IRGen(IRGenContext &C) const {
ArgsV.push_back(Args[i]->IRGen(C)); ArgsV.push_back(Args[i]->IRGen(C));
if (!ArgsV.back()) return nullptr; if (!ArgsV.back()) return nullptr;
} }
return C.getBuilder().CreateCall(CalleeF, ArgsV, "calltmp"); return C.getBuilder().CreateCall(CalleeF, ArgsV, "calltmp");
} }
@ -845,49 +845,49 @@ Value *CallExprAST::IRGen(IRGenContext &C) const {
Value *IfExprAST::IRGen(IRGenContext &C) const { Value *IfExprAST::IRGen(IRGenContext &C) const {
Value *CondV = Cond->IRGen(C); Value *CondV = Cond->IRGen(C);
if (!CondV) return nullptr; if (!CondV) return nullptr;
// Convert condition to a bool by comparing equal to 0.0. // Convert condition to a bool by comparing equal to 0.0.
ConstantFP *FPZero = ConstantFP *FPZero =
ConstantFP::get(C.getLLVMContext(), APFloat(0.0)); ConstantFP::get(C.getLLVMContext(), APFloat(0.0));
CondV = C.getBuilder().CreateFCmpONE(CondV, FPZero, "ifcond"); CondV = C.getBuilder().CreateFCmpONE(CondV, FPZero, "ifcond");
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Create blocks for the then and else cases. Insert the 'then' block at the // Create blocks for the then and else cases. Insert the 'then' block at the
// end of the function. // end of the function.
BasicBlock *ThenBB = BasicBlock::Create(C.getLLVMContext(), "then", TheFunction); BasicBlock *ThenBB = BasicBlock::Create(C.getLLVMContext(), "then", TheFunction);
BasicBlock *ElseBB = BasicBlock::Create(C.getLLVMContext(), "else"); BasicBlock *ElseBB = BasicBlock::Create(C.getLLVMContext(), "else");
BasicBlock *MergeBB = BasicBlock::Create(C.getLLVMContext(), "ifcont"); BasicBlock *MergeBB = BasicBlock::Create(C.getLLVMContext(), "ifcont");
C.getBuilder().CreateCondBr(CondV, ThenBB, ElseBB); C.getBuilder().CreateCondBr(CondV, ThenBB, ElseBB);
// Emit then value. // Emit then value.
C.getBuilder().SetInsertPoint(ThenBB); C.getBuilder().SetInsertPoint(ThenBB);
Value *ThenV = Then->IRGen(C); Value *ThenV = Then->IRGen(C);
if (!ThenV) return nullptr; if (!ThenV) return nullptr;
C.getBuilder().CreateBr(MergeBB); C.getBuilder().CreateBr(MergeBB);
// Codegen of 'Then' can change the current block, update ThenBB for the PHI. // Codegen of 'Then' can change the current block, update ThenBB for the PHI.
ThenBB = C.getBuilder().GetInsertBlock(); ThenBB = C.getBuilder().GetInsertBlock();
// Emit else block. // Emit else block.
TheFunction->getBasicBlockList().push_back(ElseBB); TheFunction->getBasicBlockList().push_back(ElseBB);
C.getBuilder().SetInsertPoint(ElseBB); C.getBuilder().SetInsertPoint(ElseBB);
Value *ElseV = Else->IRGen(C); Value *ElseV = Else->IRGen(C);
if (!ElseV) return nullptr; if (!ElseV) return nullptr;
C.getBuilder().CreateBr(MergeBB); C.getBuilder().CreateBr(MergeBB);
// Codegen of 'Else' can change the current block, update ElseBB for the PHI. // Codegen of 'Else' can change the current block, update ElseBB for the PHI.
ElseBB = C.getBuilder().GetInsertBlock(); ElseBB = C.getBuilder().GetInsertBlock();
// Emit merge block. // Emit merge block.
TheFunction->getBasicBlockList().push_back(MergeBB); TheFunction->getBasicBlockList().push_back(MergeBB);
C.getBuilder().SetInsertPoint(MergeBB); C.getBuilder().SetInsertPoint(MergeBB);
PHINode *PN = C.getBuilder().CreatePHI(Type::getDoubleTy(getGlobalContext()), 2, PHINode *PN = C.getBuilder().CreatePHI(Type::getDoubleTy(getGlobalContext()), 2,
"iftmp"); "iftmp");
PN->addIncoming(ThenV, ThenBB); PN->addIncoming(ThenV, ThenBB);
PN->addIncoming(ElseV, ElseBB); PN->addIncoming(ElseV, ElseBB);
return PN; return PN;
@ -900,7 +900,7 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// start = startexpr // start = startexpr
// store start -> var // store start -> var
// goto loop // goto loop
// loop: // loop:
// ... // ...
// bodyexpr // bodyexpr
// ... // ...
@ -913,40 +913,40 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// store nextvar -> var // store nextvar -> var
// br endcond, loop, endloop // br endcond, loop, endloop
// outloop: // outloop:
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Create an alloca for the variable in the entry block. // Create an alloca for the variable in the entry block.
AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName); AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName);
// Emit the start code first, without 'variable' in scope. // Emit the start code first, without 'variable' in scope.
Value *StartVal = Start->IRGen(C); Value *StartVal = Start->IRGen(C);
if (!StartVal) return nullptr; if (!StartVal) return nullptr;
// Store the value into the alloca. // Store the value into the alloca.
C.getBuilder().CreateStore(StartVal, Alloca); C.getBuilder().CreateStore(StartVal, Alloca);
// Make the new basic block for the loop header, inserting after current // Make the new basic block for the loop header, inserting after current
// block. // block.
BasicBlock *LoopBB = BasicBlock::Create(getGlobalContext(), "loop", TheFunction); BasicBlock *LoopBB = BasicBlock::Create(getGlobalContext(), "loop", TheFunction);
// Insert an explicit fall through from the current block to the LoopBB. // Insert an explicit fall through from the current block to the LoopBB.
C.getBuilder().CreateBr(LoopBB); C.getBuilder().CreateBr(LoopBB);
// Start insertion in LoopBB. // Start insertion in LoopBB.
C.getBuilder().SetInsertPoint(LoopBB); C.getBuilder().SetInsertPoint(LoopBB);
// Within the loop, the variable is defined equal to the PHI node. If it // Within the loop, the variable is defined equal to the PHI node. If it
// shadows an existing variable, we have to restore it, so save it now. // shadows an existing variable, we have to restore it, so save it now.
AllocaInst *OldVal = C.NamedValues[VarName]; AllocaInst *OldVal = C.NamedValues[VarName];
C.NamedValues[VarName] = Alloca; C.NamedValues[VarName] = Alloca;
// Emit the body of the loop. This, like any other expr, can change the // Emit the body of the loop. This, like any other expr, can change the
// current BB. Note that we ignore the value computed by the body, but don't // current BB. Note that we ignore the value computed by the body, but don't
// allow an error. // allow an error.
if (!Body->IRGen(C)) if (!Body->IRGen(C))
return nullptr; return nullptr;
// Emit the step value. // Emit the step value.
Value *StepVal; Value *StepVal;
if (Step) { if (Step) {
@ -956,52 +956,52 @@ Value *ForExprAST::IRGen(IRGenContext &C) const {
// If not specified, use 1.0. // If not specified, use 1.0.
StepVal = ConstantFP::get(getGlobalContext(), APFloat(1.0)); StepVal = ConstantFP::get(getGlobalContext(), APFloat(1.0));
} }
// Compute the end condition. // Compute the end condition.
Value *EndCond = End->IRGen(C); Value *EndCond = End->IRGen(C);
if (EndCond == 0) return EndCond; if (EndCond == 0) return EndCond;
// Reload, increment, and restore the alloca. This handles the case where // Reload, increment, and restore the alloca. This handles the case where
// the body of the loop mutates the variable. // the body of the loop mutates the variable.
Value *CurVar = C.getBuilder().CreateLoad(Alloca, VarName.c_str()); Value *CurVar = C.getBuilder().CreateLoad(Alloca, VarName.c_str());
Value *NextVar = C.getBuilder().CreateFAdd(CurVar, StepVal, "nextvar"); Value *NextVar = C.getBuilder().CreateFAdd(CurVar, StepVal, "nextvar");
C.getBuilder().CreateStore(NextVar, Alloca); C.getBuilder().CreateStore(NextVar, Alloca);
// Convert condition to a bool by comparing equal to 0.0. // Convert condition to a bool by comparing equal to 0.0.
EndCond = C.getBuilder().CreateFCmpONE(EndCond, EndCond = C.getBuilder().CreateFCmpONE(EndCond,
ConstantFP::get(getGlobalContext(), APFloat(0.0)), ConstantFP::get(getGlobalContext(), APFloat(0.0)),
"loopcond"); "loopcond");
// Create the "after loop" block and insert it. // Create the "after loop" block and insert it.
BasicBlock *AfterBB = BasicBlock::Create(getGlobalContext(), "afterloop", TheFunction); BasicBlock *AfterBB = BasicBlock::Create(getGlobalContext(), "afterloop", TheFunction);
// Insert the conditional branch into the end of LoopEndBB. // Insert the conditional branch into the end of LoopEndBB.
C.getBuilder().CreateCondBr(EndCond, LoopBB, AfterBB); C.getBuilder().CreateCondBr(EndCond, LoopBB, AfterBB);
// Any new code will be inserted in AfterBB. // Any new code will be inserted in AfterBB.
C.getBuilder().SetInsertPoint(AfterBB); C.getBuilder().SetInsertPoint(AfterBB);
// Restore the unshadowed variable. // Restore the unshadowed variable.
if (OldVal) if (OldVal)
C.NamedValues[VarName] = OldVal; C.NamedValues[VarName] = OldVal;
else else
C.NamedValues.erase(VarName); C.NamedValues.erase(VarName);
// for expr always returns 0.0. // for expr always returns 0.0.
return Constant::getNullValue(Type::getDoubleTy(getGlobalContext())); return Constant::getNullValue(Type::getDoubleTy(getGlobalContext()));
} }
Value *VarExprAST::IRGen(IRGenContext &C) const { Value *VarExprAST::IRGen(IRGenContext &C) const {
std::vector<AllocaInst *> OldBindings; std::vector<AllocaInst *> OldBindings;
Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent(); Function *TheFunction = C.getBuilder().GetInsertBlock()->getParent();
// Register all variables and emit their initializer. // Register all variables and emit their initializer.
for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) { for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) {
auto &VarName = VarBindings[i].first; auto &VarName = VarBindings[i].first;
auto &Init = VarBindings[i].second; auto &Init = VarBindings[i].second;
// Emit the initializer before adding the variable to scope, this prevents // Emit the initializer before adding the variable to scope, this prevents
// the initializer from referencing the variable itself, and permits stuff // the initializer from referencing the variable itself, and permits stuff
// like this: // like this:
@ -1013,22 +1013,22 @@ Value *VarExprAST::IRGen(IRGenContext &C) const {
if (!InitVal) return nullptr; if (!InitVal) return nullptr;
} else // If not specified, use 0.0. } else // If not specified, use 0.0.
InitVal = ConstantFP::get(getGlobalContext(), APFloat(0.0)); InitVal = ConstantFP::get(getGlobalContext(), APFloat(0.0));
AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName); AllocaInst *Alloca = CreateEntryBlockAlloca(TheFunction, VarName);
C.getBuilder().CreateStore(InitVal, Alloca); C.getBuilder().CreateStore(InitVal, Alloca);
// Remember the old variable binding so that we can restore the binding when // Remember the old variable binding so that we can restore the binding when
// we unrecurse. // we unrecurse.
OldBindings.push_back(C.NamedValues[VarName]); OldBindings.push_back(C.NamedValues[VarName]);
// Remember this binding. // Remember this binding.
C.NamedValues[VarName] = Alloca; C.NamedValues[VarName] = Alloca;
} }
// Codegen the body, now that all vars are in scope. // Codegen the body, now that all vars are in scope.
Value *BodyVal = Body->IRGen(C); Value *BodyVal = Body->IRGen(C);
if (!BodyVal) return nullptr; if (!BodyVal) return nullptr;
// Pop all our variables from scope. // Pop all our variables from scope.
for (unsigned i = 0, e = VarBindings.size(); i != e; ++i) for (unsigned i = 0, e = VarBindings.size(); i != e; ++i)
C.NamedValues[VarBindings[i].first] = OldBindings[i]; C.NamedValues[VarBindings[i].first] = OldBindings[i];
@ -1041,7 +1041,7 @@ Function *PrototypeAST::IRGen(IRGenContext &C) const {
std::string FnName = MakeLegalFunctionName(Name); std::string FnName = MakeLegalFunctionName(Name);
// Make the function type: double(double,double) etc. // Make the function type: double(double,double) etc.
std::vector<Type*> Doubles(Args.size(), std::vector<Type*> Doubles(Args.size(),
Type::getDoubleTy(getGlobalContext())); Type::getDoubleTy(getGlobalContext()));
FunctionType *FT = FunctionType::get(Type::getDoubleTy(getGlobalContext()), FunctionType *FT = FunctionType::get(Type::getDoubleTy(getGlobalContext()),
Doubles, false); Doubles, false);
@ -1054,26 +1054,26 @@ Function *PrototypeAST::IRGen(IRGenContext &C) const {
// Delete the one we just made and get the existing one. // Delete the one we just made and get the existing one.
F->eraseFromParent(); F->eraseFromParent();
F = C.getM().getFunction(Name); F = C.getM().getFunction(Name);
// If F already has a body, reject this. // If F already has a body, reject this.
if (!F->empty()) { if (!F->empty()) {
ErrorP<Function>("redefinition of function"); ErrorP<Function>("redefinition of function");
return nullptr; return nullptr;
} }
// If F took a different number of args, reject. // If F took a different number of args, reject.
if (F->arg_size() != Args.size()) { if (F->arg_size() != Args.size()) {
ErrorP<Function>("redefinition of function with different # args"); ErrorP<Function>("redefinition of function with different # args");
return nullptr; return nullptr;
} }
} }
// Set names for all arguments. // Set names for all arguments.
unsigned Idx = 0; unsigned Idx = 0;
for (Function::arg_iterator AI = F->arg_begin(); Idx != Args.size(); for (Function::arg_iterator AI = F->arg_begin(); Idx != Args.size();
++AI, ++Idx) ++AI, ++Idx)
AI->setName(Args[Idx]); AI->setName(Args[Idx]);
return F; return F;
} }
@ -1095,19 +1095,19 @@ void PrototypeAST::CreateArgumentAllocas(Function *F, IRGenContext &C) {
Function *FunctionAST::IRGen(IRGenContext &C) const { Function *FunctionAST::IRGen(IRGenContext &C) const {
C.NamedValues.clear(); C.NamedValues.clear();
Function *TheFunction = Proto->IRGen(C); Function *TheFunction = Proto->IRGen(C);
if (!TheFunction) if (!TheFunction)
return nullptr; return nullptr;
// If this is an operator, install it. // If this is an operator, install it.
if (Proto->isBinaryOp()) if (Proto->isBinaryOp())
BinopPrecedence[Proto->getOperatorName()] = Proto->Precedence; BinopPrecedence[Proto->getOperatorName()] = Proto->Precedence;
// Create a new basic block to start insertion into. // Create a new basic block to start insertion into.
BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction); BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction);
C.getBuilder().SetInsertPoint(BB); C.getBuilder().SetInsertPoint(BB);
// Add all arguments to the symbol table and create their allocas. // Add all arguments to the symbol table and create their allocas.
Proto->CreateArgumentAllocas(TheFunction, C); Proto->CreateArgumentAllocas(TheFunction, C);
@ -1120,7 +1120,7 @@ Function *FunctionAST::IRGen(IRGenContext &C) const {
return TheFunction; return TheFunction;
} }
// Error reading body, remove function. // Error reading body, remove function.
TheFunction->eraseFromParent(); TheFunction->eraseFromParent();
@ -1277,7 +1277,7 @@ static void HandleTopLevelExpression(SessionContext &S, KaleidoscopeJIT &J) {
// Get the address of the JIT'd function in memory. // Get the address of the JIT'd function in memory.
auto ExprSymbol = J.findUnmangledSymbol("__anon_expr"); auto ExprSymbol = J.findUnmangledSymbol("__anon_expr");
// Cast it to the right type (takes no arguments, returns a double) so we // Cast it to the right type (takes no arguments, returns a double) so we
// can call it as a native function. // can call it as a native function.
double (*FP)() = (double (*)())(intptr_t)ExprSymbol.getAddress(); double (*FP)() = (double (*)())(intptr_t)ExprSymbol.getAddress();
@ -1320,20 +1320,20 @@ static void MainLoop() {
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// putchard - putchar that takes a double and returns 0. /// putchard - putchar that takes a double and returns 0.
extern "C" extern "C"
double putchard(double X) { double putchard(double X) {
putchar((char)X); putchar((char)X);
return 0; return 0;
} }
/// printd - printf that takes a double prints it as "%f\n", returning 0. /// printd - printf that takes a double prints it as "%f\n", returning 0.
extern "C" extern "C"
double printd(double X) { double printd(double X) {
printf("%f", X); printf("%f", X);
return 0; return 0;
} }
extern "C" extern "C"
double printlf() { double printlf() {
printf("\n"); printf("\n");
return 0; return 0;
@ -1370,4 +1370,3 @@ int main() {
return 0; return 0;
} }