some refactoring

source/Ast.cpp

@@ -3,9 +3,9 @@
 using namespace ast;
 
 // attributes added from chapter 3 of the tutorial
-std::unique_ptr<Module> AstTree::TheModule = make_unique<Module>("my cool jit", getGlobalContext());;
-IRBuilder<> AstTree::Builder(getGlobalContext());
-std::map<std::string, Value *> AstTree::NamedValues;
+std::unique_ptr<Module> AstObjects::TheModule = make_unique<Module>("my cool jit", getGlobalContext());;
+IRBuilder<> AstObjects::Builder(getGlobalContext());
+std::map<std::string, Value *> AstObjects::NamedValues;
 
 // error method from chapter 3
 // HACK: duplicated function already present in example
@@ -25,9 +25,9 @@ Value *NumberExprAST::codegen() {
 
 Value *VariableExprAST::codegen() {
   // Look this variable up in the function.
-  Value *V = AstTree::NamedValues[Name];
+  Value *V = AstObjects::NamedValues[Name];
   if (!V)
-  ErrorV("Unknown variable name");
+    ErrorV("Unknown variable name");
   return V;
 }
 
@@ -39,15 +39,15 @@ Value *BinaryExprAST::codegen() {
 
   switch (Op) {
     case '+':
-    return AstTree::Builder.CreateFAdd(L, R, "addtmp");
+    return AstObjects::Builder.CreateFAdd(L, R, "addtmp");
     case '-':
-    return AstTree::Builder.CreateFSub(L, R, "subtmp");
+    return AstObjects::Builder.CreateFSub(L, R, "subtmp");
     case '*':
-    return AstTree::Builder.CreateFMul(L, R, "multmp");
+    return AstObjects::Builder.CreateFMul(L, R, "multmp");
     case '<':
-    L = AstTree::Builder.CreateFCmpULT(L, R, "cmptmp");
+    L = AstObjects::Builder.CreateFCmpULT(L, R, "cmptmp");
     // Convert bool 0/1 to double 0.0 or 1.0
-    return AstTree::Builder.CreateUIToFP(L, Type::getDoubleTy(getGlobalContext()),
+    return AstObjects::Builder.CreateUIToFP(L, Type::getDoubleTy(getGlobalContext()),
     "booltmp");
     default:
     return ErrorV("invalid binary operator");
@@ -56,7 +56,7 @@ Value *BinaryExprAST::codegen() {
 
 Value *CallExprAST::codegen() {
   // Look up the name in the global module table.
-  Function *CalleeF = AstTree::TheModule->getFunction(Callee);
+  Function *CalleeF = AstObjects::TheModule->getFunction(Callee);
   if (!CalleeF)
   return ErrorV("Unknown function referenced");
 
@@ -70,7 +70,7 @@ Value *CallExprAST::codegen() {
     if (!ArgsV.back())
     return nullptr;
   }
-  return AstTree::Builder.CreateCall(CalleeF, ArgsV, "calltmp");
+  return AstObjects::Builder.CreateCall(CalleeF, ArgsV, "calltmp");
 }
 
 Function *PrototypeAST::codegen() {
@@ -81,7 +81,7 @@ Function *PrototypeAST::codegen() {
       FunctionType::get(Type::getDoubleTy(getGlobalContext()), Doubles, false);
 
   Function *F =
-      Function::Create(FT, Function::ExternalLinkage, Name, AstTree::TheModule.get());
+      Function::Create(FT, Function::ExternalLinkage, Name, AstObjects::TheModule.get());
 
   // Set names for all arguments.
   unsigned Idx = 0;
@@ -93,7 +93,7 @@ Function *PrototypeAST::codegen() {
 
 Function *FunctionAST::codegen() {
   // First, check for an existing function from a previous 'extern' declaration.
-  Function *TheFunction = AstTree::TheModule->getFunction(Proto->getName());
+  Function *TheFunction = AstObjects::TheModule->getFunction(Proto->getName());
 
   if (!TheFunction)
   TheFunction = Proto->codegen();
@@ -106,16 +106,16 @@ Function *FunctionAST::codegen() {
 
   // Create a new basic block to start insertion into.
   BasicBlock *BB = BasicBlock::Create(getGlobalContext(), "entry", TheFunction);
-  AstTree::Builder.SetInsertPoint(BB);
+  AstObjects::Builder.SetInsertPoint(BB);
 
   // Record the function arguments in the NamedValues map.
-  AstTree::NamedValues.clear();
+  AstObjects::NamedValues.clear();
   for (auto &Arg : TheFunction->args())
-  AstTree::NamedValues[Arg.getName()] = &Arg;
+  AstObjects::NamedValues[Arg.getName()] = &Arg;
 
   if (Value *RetVal = Body->codegen()) {
     // Finish off the function.
-    AstTree::Builder.CreateRet(RetVal);
+    AstObjects::Builder.CreateRet(RetVal);
 
     // Validate the generated code, checking for consistency.
     verifyFunction(*TheFunction);

source/Ast.h

@@ -18,92 +18,82 @@ using namespace llvm;
 // Abstract Syntax Tree (aka Parse Tree)
 //===----------------------------------------------------------------------===//
 namespace ast{
-  // struct instantiated by the 'main' to access data structures if llvm IR.
-  struct AstTree {
-  public:
-    static std::unique_ptr<llvm::Module> TheModule;
-    static llvm::IRBuilder<> Builder;
-    static std::map<std::string, llvm::Value *> NamedValues;
-    static void InitializeModuleAndPassManager();
-  };
-
-  /// ExprAST - Base class for all expression nodes.
-
-  class ExprAST {
-  public:
-    virtual ~ExprAST() {}
-    virtual llvm::Value *codegen() = 0;
-  };
-
-  /// NumberExprAST - Expression class for numeric literals like "1.0".
-  class NumberExprAST : public ExprAST {
-    double Val;
-
-  public:
-    NumberExprAST(double Val) : Val(Val) {}
-    Value *codegen() override;
-  };
-
-  /// VariableExprAST - Expression class for referencing a variable, like "a".
-  class VariableExprAST : public ExprAST {
-    std::string Name;
-
-  public:
-    VariableExprAST(const std::string &Name) : Name(Name) {}
+// struct instantiated by the 'main' to access data structures if llvm IR.
+struct AstObjects {
+public:
+  static std::unique_ptr<Module> TheModule;
+  static IRBuilder<> Builder;
+  static std::map<std::string, Value *> NamedValues;
+};
+
+/// ExprAST - Base class for all expression nodes.
+
+class ExprAST {
+public:
+  virtual ~ExprAST() {}
+  virtual llvm::Value *codegen() = 0;
+};
+
+/// NumberExprAST - Expression class for numeric literals like "1.0".
+class NumberExprAST : public ExprAST {
+  double Val;
+
+public:
+  NumberExprAST(double Val) : Val(Val) {}
+  Value *codegen() override;
+};
+
+/// VariableExprAST - Expression class for referencing a variable, like "a".
+class VariableExprAST : public ExprAST {
+std::string Name;
+
+public:
+  VariableExprAST(const std::string &Name) : Name(Name) {}
+  Value *codegen() override;
+};
+
+/// BinaryExprAST - Expression class for a binary operator.
+class BinaryExprAST : public ExprAST {
+  char Op;
+  std::unique_ptr<ExprAST> LHS, RHS;
+
+public:
+  BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS, std::unique_ptr<ExprAST> RHS) : Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {}
+  Value *codegen() override;
+};
+
+/// ExprAST - Base class for all expression nodes.
+/// CallExprAST - Expression class for function calls.
+class CallExprAST : public ExprAST {
+  std::string Callee;
+  std::vector<std::unique_ptr<ExprAST>> Args;
+
+public:
+  CallExprAST(const std::string &Callee, std::vector<std::unique_ptr<ExprAST>> Args) : Callee(Callee), Args(std::move(Args)) {}
     Value *codegen() override;
   };
 
-  /// BinaryExprAST - Expression class for a binary operator.
-  class BinaryExprAST : public ExprAST {
-    char Op;
-    std::unique_ptr<ExprAST> LHS, RHS;
-
-  public:
-    BinaryExprAST(char Op, std::unique_ptr<ExprAST> LHS,
-      std::unique_ptr<ExprAST> RHS)
-      : Op(Op), LHS(std::move(LHS)), RHS(std::move(RHS)) {}
-      Value *codegen() override;
-    };
-
-    /// CallExprAST - Expression class for function calls.
-    class CallExprAST : public ExprAST {
-      std::string Callee;
-      std::vector<std::unique_ptr<ExprAST>> Args;
-
-    public:
-      CallExprAST(const std::string &Callee,
-        std::vector<std::unique_ptr<ExprAST>> Args)
-        : Callee(Callee), Args(std::move(Args)) {}
-        Value *codegen() override;
-      };
-
-      /// PrototypeAST - This class represents the "prototype" for a function,
-      /// which captures its name, and its argument names (thus implicitly the number
-      /// of arguments the function takes).
-      class PrototypeAST {
-        std::string Name;
-        std::vector<std::string> Args;
-
-      public:
-        PrototypeAST(const std::string &Name, std::vector<std::string> Args)
-        : Name(Name), Args(std::move(Args)) {}
-        Function *codegen();
-        const std::string &getName() const { return Name; }
-      };
-
-      /// FunctionAST - This class represents a function definition itself.
-      class FunctionAST {
-        std::unique_ptr<PrototypeAST> Proto;
-        std::unique_ptr<ExprAST> Body;
-
-      public:
-        FunctionAST(std::unique_ptr<PrototypeAST> Proto,
-          std::unique_ptr<ExprAST> Body)
-          : Proto(std::move(Proto)), Body(std::move(Body)) {}
-          Function *codegen();
-        };
-
-        // method added from chapter 3 of the tutorial
-      } // end anonymous namespace
-
-      #endif
+  /// PrototypeAST - This class represents the "prototype" for a function,
+  /// which captures its name, and its argument names (thus implicitly the number
+  /// of arguments the function takes).
+class PrototypeAST {
+  std::string Name;
+  std::vector<std::string> Args;
+
+public:
+  PrototypeAST(const std::string &Name, std::vector<std::string> Args) : Name(Name), Args(std::move(Args)) {}
+  Function *codegen();
+  const std::string &getName() const { return Name; }
+};
+
+/// FunctionAST - This class represents a function definition itself.
+class FunctionAST {
+  std::unique_ptr<PrototypeAST> Proto;
+  std::unique_ptr<ExprAST> Body;
+
+public:
+  FunctionAST(std::unique_ptr<PrototypeAST> Proto, std::unique_ptr<ExprAST> Body) : Proto(std::move(Proto)), Body(std::move(Body)) {}
+    Function *codegen();
+};
+}
+#endif

source/Lexer.cpp

@@ -2,53 +2,53 @@
 
 /// gettok - Return the next token from standard input.
 namespace lexer{
-  int gettok() {
-    static int LastChar = ' ';
-
-    // Skip any whitespace.
-    while (isspace(LastChar))
-    LastChar = getchar();
+int gettok() {
+  static int LastChar = ' ';
+
+  // Skip any whitespace.
+  while (isspace(LastChar))
+  LastChar = getchar();
+
+  if (isalpha(LastChar)) { // identifier: [a-zA-Z][a-zA-Z0-9]*
+    IdentifierStr = LastChar;
+    while (isalnum((LastChar = getchar())))
+    IdentifierStr += LastChar;
+
+    if (IdentifierStr == "def")
+    return tok_def;
+    if (IdentifierStr == "extern")
+    return tok_extern;
+    return tok_identifier;
+  }
 
-    if (isalpha(LastChar)) { // identifier: [a-zA-Z][a-zA-Z0-9]*
-      IdentifierStr = LastChar;
-      while (isalnum((LastChar = getchar())))
-      IdentifierStr += LastChar;
-
-      if (IdentifierStr == "def")
-      return tok_def;
-      if (IdentifierStr == "extern")
-      return tok_extern;
-      return tok_identifier;
-    }
-
-    if (isdigit(LastChar) || LastChar == '.') { // Number: [0-9.]+
-      std::string NumStr;
-      do {
-        NumStr += LastChar;
-        LastChar = getchar();
-      } while (isdigit(LastChar) || LastChar == '.');
-
-      NumVal = strtod(NumStr.c_str(), nullptr);
-      return tok_number;
-    }
-
-    if (LastChar == '#') {
-      // Comment until end of line.
-      do
+  if (isdigit(LastChar) || LastChar == '.') { // Number: [0-9.]+
+    std::string NumStr;
+    do {
+      NumStr += LastChar;
       LastChar = getchar();
-      while (LastChar != EOF && LastChar != '\n' && LastChar != '\r');
+    } while (isdigit(LastChar) || LastChar == '.');
 
-      if (LastChar != EOF)
-      return gettok();
-    }
-
-    // Check for end of file.  Don't eat the EOF.
-    if (LastChar == EOF)
-    return tok_eof;
+    NumVal = strtod(NumStr.c_str(), nullptr);
+    return tok_number;
+  }
 
-    // Otherwise, just return the character as its ascii value.
-    int ThisChar = LastChar;
+  if (LastChar == '#') {
+    // Comment until end of line.
+    do
     LastChar = getchar();
-    return ThisChar;
+    while (LastChar != EOF && LastChar != '\n' && LastChar != '\r');
+
+    if (LastChar != EOF)
+    return gettok();
   }
+
+  // Check for end of file.  Don't eat the EOF.
+  if (LastChar == EOF)
+  return tok_eof;
+
+  // Otherwise, just return the character as its ascii value.
+  int ThisChar = LastChar;
+  LastChar = getchar();
+  return ThisChar;
+}
 }

source/Main.cpp

@@ -36,16 +36,16 @@ static
 //===----------------------------------------------------------------------===//
 
 int main() {
-  
+
 
   // Prime the first token.
   fprintf(stderr, "ready> ");
   getNextToken();
 
   // Run the main "interpreter loop" now.
-  parser::MainLoop();
+  MainLoop();
 
-  AstTree::TheModule->dump();
+  AstObjects::TheModule->dump();
 
   return 0;
 }

source/Parser.cpp

@@ -2,285 +2,285 @@
 
 using namespace lexer;
 namespace parser{
-  //===----------------------------------------------------------------------===//
-  // Parser
-  //===----------------------------------------------------------------------===//
-
-  /// CurTok/getNextToken - Provide a simple token buffer.  CurTok is the current
-  /// token the parser is looking at.  getNextToken reads another token from the
-  /// lexer and updates CurTok with its results.
-  int getNextToken() { return CurTok = gettok(); }
-
-  /// BinopPrecedence - This holds the precedence for each binary operator that is
-  /// defined.
-
-  /// GetTokPrecedence - Get the precedence of the pending binary operator token.
-  static int GetTokPrecedence() {
-    if (!isascii(CurTok))
-      return -1;
-
-    // Make sure it's a declared binop.
-    int TokPrec = BinopPrecedence[CurTok];
-    if (TokPrec <= 0)
-      return -1;
-    return TokPrec;
-  }
+//===----------------------------------------------------------------------===//
+// Parser
+//===----------------------------------------------------------------------===//
+
+/// CurTok/getNextToken - Provide a simple token buffer.  CurTok is the current
+/// token the parser is looking at.  getNextToken reads another token from the
+/// lexer and updates CurTok with its results.
+int getNextToken() { return CurTok = gettok(); }
+
+/// BinopPrecedence - This holds the precedence for each binary operator that is
+/// defined.
+
+/// GetTokPrecedence - Get the precedence of the pending binary operator token.
+static int GetTokPrecedence() {
+  if (!isascii(CurTok))
+    return -1;
+
+  // Make sure it's a declared binop.
+  int TokPrec = BinopPrecedence[CurTok];
+  if (TokPrec <= 0)
+    return -1;
+  return TokPrec;
+}
 
-  /// Error* - These are little helper functions for error handling.
-  std::unique_ptr<ExprAST> Error(const char *Str) {
-    fprintf(stderr, "Error: %s\n", Str);
-    return nullptr;
-  }
+/// Error* - These are little helper functions for error handling.
+std::unique_ptr<ExprAST> Error(const char *Str) {
+  fprintf(stderr, "Error: %s\n", Str);
+  return nullptr;
+}
 
-  std::unique_ptr<PrototypeAST> ErrorP(const char *Str) {
-    Error(Str);
-    return nullptr;
-  }
+std::unique_ptr<PrototypeAST> ErrorP(const char *Str) {
+  Error(Str);
+  return nullptr;
+}
 
-  static std::unique_ptr<ExprAST> ParseExpression();
+static std::unique_ptr<ExprAST> ParseExpression();
 
-  /// numberexpr ::= number
-  static std::unique_ptr<ExprAST> ParseNumberExpr() {
-    auto Result = llvm::make_unique<NumberExprAST>(NumVal);
-    getNextToken(); // consume the number
-    return std::move(Result);
-  }
+/// numberexpr ::= number
+static std::unique_ptr<ExprAST> ParseNumberExpr() {
+  auto Result = llvm::make_unique<NumberExprAST>(NumVal);
+  getNextToken(); // consume the number
+  return std::move(Result);
+}
 
-  /// parenexpr ::= '(' expression ')'
-  static std::unique_ptr<ExprAST> ParseParenExpr() {
-    getNextToken(); // eat (.
-    auto V = ParseExpression();
-    if (!V)
-      return nullptr;
+/// parenexpr ::= '(' expression ')'
+static std::unique_ptr<ExprAST> ParseParenExpr() {
+  getNextToken(); // eat (.
+  auto V = ParseExpression();
+  if (!V)
+    return nullptr;
 
-    if (CurTok != ')')
-      return Error("expected ')'");
-    getNextToken(); // eat ).
-    return V;
-  }
+  if (CurTok != ')')
+    return Error("expected ')'");
+  getNextToken(); // eat ).
+  return V;
+}
 
-  /// identifierexpr
-  ///   ::= identifier
-  ///   ::= identifier '(' expression* ')'
-  static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
-    std::string IdName = IdentifierStr;
-
-    getNextToken(); // eat identifier.
-
-    if (CurTok != '(') // Simple variable ref.
-      return llvm::make_unique<VariableExprAST>(IdName);
-
-    // Call.
-    getNextToken(); // eat (
-    std::vector<std::unique_ptr<ExprAST>> Args;
-    if (CurTok != ')') {
-      while (1) {
-        if (auto Arg = ParseExpression())
-          Args.push_back(std::move(Arg));
-        else
-          return nullptr;
-
-        if (CurTok == ')')
-          break;
-
-        if (CurTok != ',')
-          return Error("Expected ')' or ',' in argument list");
-        getNextToken();
-      }
-    }
+/// identifierexpr
+///   ::= identifier
+///   ::= identifier '(' expression* ')'
+static std::unique_ptr<ExprAST> ParseIdentifierExpr() {
+  std::string IdName = IdentifierStr;
 
-    // Eat the ')'.
-    getNextToken();
+  getNextToken(); // eat identifier.
 
-    return llvm::make_unique<CallExprAST>(IdName, std::move(Args));
-  }
+  if (CurTok != '(') // Simple variable ref.
+    return llvm::make_unique<VariableExprAST>(IdName);
 
-  /// primary
-  ///   ::= identifierexpr
-  ///   ::= numberexpr
-  ///   ::= parenexpr
-  static std::unique_ptr<ExprAST> ParsePrimary() {
-    switch (CurTok) {
-    default:
-      return Error("unknown token when expecting an expression");
-    case tok_identifier:
-      return ParseIdentifierExpr();
-    case tok_number:
-      return ParseNumberExpr();
-    case '(':
-      return ParseParenExpr();
+  // Call.
+  getNextToken(); // eat (
+  std::vector<std::unique_ptr<ExprAST>> Args;
+  if (CurTok != ')') {
+    while (1) {
+      if (auto Arg = ParseExpression())
+        Args.push_back(std::move(Arg));
+      else
+        return nullptr;
+
+      if (CurTok == ')')
+        break;
+
+      if (CurTok != ',')
+        return Error("Expected ')' or ',' in argument list");
+      getNextToken();
     }
   }
 
-  /// binoprhs
-  ///   ::= ('+' primary)*
-  static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
-                                                std::unique_ptr<ExprAST> LHS) {
-    // If this is a binop, find its precedence.
-    while (1) {
-      int TokPrec = GetTokPrecedence();
+  // Eat the ')'.
+  getNextToken();
 
-      // If this is a binop that binds at least as tightly as the current binop,
-      // consume it, otherwise we are done.
-      if (TokPrec < ExprPrec)
-        return LHS;
+  return llvm::make_unique<CallExprAST>(IdName, std::move(Args));
+}
 
-      // Okay, we know this is a binop.
-      int BinOp = CurTok;
-      getNextToken(); // eat binop
+/// primary
+///   ::= identifierexpr
+///   ::= numberexpr
+///   ::= parenexpr
+static std::unique_ptr<ExprAST> ParsePrimary() {
+  switch (CurTok) {
+  default:
+    return Error("unknown token when expecting an expression");
+  case tok_identifier:
+    return ParseIdentifierExpr();
+  case tok_number:
+    return ParseNumberExpr();
+  case '(':
+    return ParseParenExpr();
+  }
+}
+
+/// binoprhs
+///   ::= ('+' primary)*
+static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
+                                              std::unique_ptr<ExprAST> LHS) {
+  // If this is a binop, find its precedence.
+  while (1) {
+    int TokPrec = GetTokPrecedence();
+
+    // If this is a binop that binds at least as tightly as the current binop,
+    // consume it, otherwise we are done.
+    if (TokPrec < ExprPrec)
+      return LHS;
+
+    // Okay, we know this is a binop.
+    int BinOp = CurTok;
+    getNextToken(); // eat binop
+
+    // Parse the primary expression after the binary operator.
+    auto RHS = ParsePrimary();
+    if (!RHS)
+      return nullptr;
 
-      // Parse the primary expression after the binary operator.
-      auto RHS = ParsePrimary();
+    // If BinOp binds less tightly with RHS than the operator after RHS, let
+    // the pending operator take RHS as its LHS.
+    int NextPrec = GetTokPrecedence();
+    if (TokPrec < NextPrec) {
+      RHS = ParseBinOpRHS(TokPrec + 1, std::move(RHS));
       if (!RHS)
         return nullptr;
-
-      // If BinOp binds less tightly with RHS than the operator after RHS, let
-      // the pending operator take RHS as its LHS.
-      int NextPrec = GetTokPrecedence();
-      if (TokPrec < NextPrec) {
-        RHS = ParseBinOpRHS(TokPrec + 1, std::move(RHS));
-        if (!RHS)
-          return nullptr;
-      }
-
-      // Merge LHS/RHS.
-      LHS =
-          llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS));
     }
-  }
-
-  /// expression
-  ///   ::= primary binoprhs
-  ///
-  static std::unique_ptr<ExprAST> ParseExpression() {
-    auto LHS = ParsePrimary();
-    if (!LHS)
-      return nullptr;
 
-    return ParseBinOpRHS(0, std::move(LHS));
+    // Merge LHS/RHS.
+    LHS =
+        llvm::make_unique<BinaryExprAST>(BinOp, std::move(LHS), std::move(RHS));
   }
+}
 
-  /// prototype
-  ///   ::= id '(' id* ')'
-  static std::unique_ptr<PrototypeAST> ParsePrototype() {
-    if (CurTok != tok_identifier)
-      return ErrorP("Expected function name in prototype");
+/// expression
+///   ::= primary binoprhs
+///
+static std::unique_ptr<ExprAST> ParseExpression() {
+  auto LHS = ParsePrimary();
+  if (!LHS)
+    return nullptr;
 
-    std::string FnName = IdentifierStr;
-    getNextToken();
+  return ParseBinOpRHS(0, std::move(LHS));
+}
 
-    if (CurTok != '(')
-      return ErrorP("Expected '(' in prototype");
+/// prototype
+///   ::= id '(' id* ')'
+static std::unique_ptr<PrototypeAST> ParsePrototype() {
+  if (CurTok != tok_identifier)
+    return ErrorP("Expected function name in prototype");
 
-    std::vector<std::string> ArgNames;
-    while (getNextToken() == tok_identifier)
-      ArgNames.push_back(IdentifierStr);
-    if (CurTok != ')')
-      return ErrorP("Expected ')' in prototype");
+  std::string FnName = IdentifierStr;
+  getNextToken();
 
-    // success.
-    getNextToken(); // eat ')'.
+  if (CurTok != '(')
+    return ErrorP("Expected '(' in prototype");
 
-    return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames));
-  }
+  std::vector<std::string> ArgNames;
+  while (getNextToken() == tok_identifier)
+    ArgNames.push_back(IdentifierStr);
+  if (CurTok != ')')
+    return ErrorP("Expected ')' in prototype");
 
-  /// definition ::= 'def' prototype expression
-  static std::unique_ptr<FunctionAST> ParseDefinition() {
-    getNextToken(); // eat def.
-    auto Proto = ParsePrototype();
-    if (!Proto)
-      return nullptr;
+  // success.
+  getNextToken(); // eat ')'.
 
-    if (auto E = ParseExpression())
-      return llvm::make_unique<FunctionAST>(std::move(Proto), std::move(E));
-    return nullptr;
-  }
+  return llvm::make_unique<PrototypeAST>(FnName, std::move(ArgNames));
+}
 
-  /// toplevelexpr ::= expression
-  static std::unique_ptr<FunctionAST> ParseTopLevelExpr() {
-    if (auto E = ParseExpression()) {
-      // Make an anonymous proto.
-      auto Proto = llvm::make_unique<PrototypeAST>("__anon_expr",
-                                                   std::vector<std::string>());
-      return llvm::make_unique<FunctionAST>(std::move(Proto), std::move(E));
-    }
+/// definition ::= 'def' prototype expression
+static std::unique_ptr<FunctionAST> ParseDefinition() {
+  getNextToken(); // eat def.
+  auto Proto = ParsePrototype();
+  if (!Proto)
     return nullptr;
-  }
 
-  /// external ::= 'extern' prototype
-  static std::unique_ptr<PrototypeAST> ParseExtern() {
-    getNextToken(); // eat extern.
-    return ParsePrototype();
+  if (auto E = ParseExpression())
+    return llvm::make_unique<FunctionAST>(std::move(Proto), std::move(E));
+  return nullptr;
+}
+
+/// toplevelexpr ::= expression
+static std::unique_ptr<FunctionAST> ParseTopLevelExpr() {
+  if (auto E = ParseExpression()) {
+    // Make an anonymous proto.
+    auto Proto = llvm::make_unique<PrototypeAST>("__anon_expr",
+                                                 std::vector<std::string>());
+    return llvm::make_unique<FunctionAST>(std::move(Proto), std::move(E));
   }
-  //===----------------------------------------------------------------------===//
-  // Top-Level parsing and JIT Driver
-  //===----------------------------------------------------------------------===//
-
-  static void HandleDefinition() {
-    if (auto FnAST = ParseDefinition()) {
-      if (auto *FnIR = FnAST->codegen()) {
-        fprintf(stderr, "Read function definition:");
-        FnIR->dump();
-      }
-    } else {
-      // Skip token for error recovery.
-      getNextToken();
+  return nullptr;
+}
+
+/// external ::= 'extern' prototype
+static std::unique_ptr<PrototypeAST> ParseExtern() {
+  getNextToken(); // eat extern.
+  return ParsePrototype();
+}
+//===----------------------------------------------------------------------===//
+// Top-Level parsing and JIT Driver
+//===----------------------------------------------------------------------===//
+
+static void HandleDefinition() {
+  if (auto FnAST = ParseDefinition()) {
+    if (auto *FnIR = FnAST->codegen()) {
+      fprintf(stderr, "Read function definition:");
+      FnIR->dump();
     }
+  } else {
+    // Skip token for error recovery.
+    getNextToken();
   }
+}
 
-  static void HandleExtern() {
-    if (auto ProtoAST = ParseExtern()) {
-      if (auto *FnIR = ProtoAST->codegen()) {
-        fprintf(stderr, "Read extern: ");
-        FnIR->dump();
-      }
-    } else {
-      // Skip token for error recovery.
-      getNextToken();
+static void HandleExtern() {
+  if (auto ProtoAST = ParseExtern()) {
+    if (auto *FnIR = ProtoAST->codegen()) {
+      fprintf(stderr, "Read extern: ");
+      FnIR->dump();
     }
+  } else {
+    // Skip token for error recovery.
+    getNextToken();
   }
+}
 
-  static void HandleTopLevelExpression() {
-    // Evaluate a top-level expression into an anonymous function.
-    if (auto FnAST = ParseTopLevelExpr()) {
-      if (auto *FnIR = FnAST->codegen()) {
-        fprintf(stderr, "Read top-level expression:");
-        FnIR->dump();
-      }
-    } else {
-      // Skip token for error recovery.
-      getNextToken();
+static void HandleTopLevelExpression() {
+  // Evaluate a top-level expression into an anonymous function.
+  if (auto FnAST = ParseTopLevelExpr()) {
+    if (auto *FnIR = FnAST->codegen()) {
+      fprintf(stderr, "Read top-level expression:");
+      FnIR->dump();
     }
+  } else {
+    // Skip token for error recovery.
+    getNextToken();
   }
+}
 
-  /// top ::= definition | external | expression | ';'
-  void MainLoop() {
-    // Install standard binary operators.
-    // 1 is lowest precedence.
-    BinopPrecedence['<'] = 10;
-    BinopPrecedence['+'] = 20;
-    BinopPrecedence['-'] = 20;
-    BinopPrecedence['*'] = 40; // highest.
-    while (1) {
-      fprintf(stderr, "ready> ");
-      switch (CurTok) {
-      case tok_eof:
-        return;
-      case ';': // ignore top-level semicolons.
-        getNextToken();
-        break;
-      case tok_def:
-        HandleDefinition();
-        break;
-      case tok_extern:
-        HandleExtern();
-        break;
-      default:
-        HandleTopLevelExpression();
-        break;
-      }
+/// top ::= definition | external | expression | ';'
+void MainLoop() {
+  // Install standard binary operators.
+  // 1 is lowest precedence.
+  BinopPrecedence['<'] = 10;
+  BinopPrecedence['+'] = 20;
+  BinopPrecedence['-'] = 20;
+  BinopPrecedence['*'] = 40; // highest.
+  while (1) {
+    fprintf(stderr, "ready> ");
+    switch (CurTok) {
+    case tok_eof:
+      return;
+    case ';': // ignore top-level semicolons.
+      getNextToken();
+      break;
+    case tok_def:
+      HandleDefinition();
+      break;
+    case tok_extern:
+      HandleExtern();
+      break;
+    default:
+      HandleTopLevelExpression();
+      break;
     }
   }
+}
 
 
 }

source/Parser.h

@@ -12,28 +12,28 @@ using namespace ast;
 
 namespace parser{
 
-  static int CurTok;
-  static std::map<char, int> BinopPrecedence;
+static int CurTok;
+static std::map<char, int> BinopPrecedence;
 
-  int getNextToken();
-  static int GetTokPrecedence();
-  std::unique_ptr<ExprAST> Error(const char *Str);
-  std::unique_ptr<PrototypeAST> ErrorP(const char *Str);
-  static std::unique_ptr<ExprAST> ParseExpression();
-  static std::unique_ptr<ExprAST> ParseNumberExpr();
-  static std::unique_ptr<ExprAST> ParseParenExpr();
-  static std::unique_ptr<ExprAST> ParseIdentifierExpr();
-  static std::unique_ptr<ExprAST> ParsePrimary();
-  static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
-                                                std::unique_ptr<ExprAST> LHS);
-  static std::unique_ptr<PrototypeAST> ParsePrototype();
-  static std::unique_ptr<FunctionAST> ParseDefinition();
-  static std::unique_ptr<FunctionAST> ParseTopLevelExpr();
-  static std::unique_ptr<PrototypeAST> ParseExtern();
-  static void HandleDefinition();
-  static void HandleExtern();
-  static void HandleTopLevelExpression();
-  void MainLoop();
+int getNextToken();
+static int GetTokPrecedence();
+std::unique_ptr<ExprAST> Error(const char *Str);
+std::unique_ptr<PrototypeAST> ErrorP(const char *Str);
+static std::unique_ptr<ExprAST> ParseExpression();
+static std::unique_ptr<ExprAST> ParseNumberExpr();
+static std::unique_ptr<ExprAST> ParseParenExpr();
+static std::unique_ptr<ExprAST> ParseIdentifierExpr();
+static std::unique_ptr<ExprAST> ParsePrimary();
+static std::unique_ptr<ExprAST> ParseBinOpRHS(int ExprPrec,
+                                              std::unique_ptr<ExprAST> LHS);
+static std::unique_ptr<PrototypeAST> ParsePrototype();
+static std::unique_ptr<FunctionAST> ParseDefinition();
+static std::unique_ptr<FunctionAST> ParseTopLevelExpr();
+static std::unique_ptr<PrototypeAST> ParseExtern();
+static void HandleDefinition();
+static void HandleExtern();
+static void HandleTopLevelExpression();
+void MainLoop();
 
 }