mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-25 13:24:46 +00:00
stop accepting begin/end around function bodies in the .ll parser, this isn't pascal anymore.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133244 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -471,7 +471,6 @@ lltok::Kind LLLexer::LexIdentifier() {
|
||||
if (Len == strlen(#STR) && !memcmp(StartChar, #STR, strlen(#STR))) \
|
||||
return lltok::kw_##STR;
|
||||
|
||||
KEYWORD(begin); KEYWORD(end);
|
||||
KEYWORD(true); KEYWORD(false);
|
||||
KEYWORD(declare); KEYWORD(define);
|
||||
KEYWORD(global); KEYWORD(constant);
|
||||
|
@@ -2835,10 +2835,9 @@ bool LLParser::ParseFunctionHeader(Function *&Fn, bool isDefine) {
|
||||
|
||||
/// ParseFunctionBody
|
||||
/// ::= '{' BasicBlock+ '}'
|
||||
/// ::= 'begin' BasicBlock+ 'end' // FIXME: remove in LLVM 3.0
|
||||
///
|
||||
bool LLParser::ParseFunctionBody(Function &Fn) {
|
||||
if (Lex.getKind() != lltok::lbrace && Lex.getKind() != lltok::kw_begin)
|
||||
if (Lex.getKind() != lltok::lbrace)
|
||||
return TokError("expected '{' in function body");
|
||||
Lex.Lex(); // eat the {.
|
||||
|
||||
@@ -2848,10 +2847,10 @@ bool LLParser::ParseFunctionBody(Function &Fn) {
|
||||
PerFunctionState PFS(*this, Fn, FunctionNumber);
|
||||
|
||||
// We need at least one basic block.
|
||||
if (Lex.getKind() == lltok::rbrace || Lex.getKind() == lltok::kw_end)
|
||||
if (Lex.getKind() == lltok::rbrace)
|
||||
return TokError("function body requires at least one basic block");
|
||||
|
||||
while (Lex.getKind() != lltok::rbrace && Lex.getKind() != lltok::kw_end)
|
||||
while (Lex.getKind() != lltok::rbrace)
|
||||
if (ParseBasicBlock(PFS)) return true;
|
||||
|
||||
// Eat the }.
|
||||
|
@@ -32,7 +32,6 @@ namespace lltok {
|
||||
exclaim, // !
|
||||
|
||||
kw_x,
|
||||
kw_begin, kw_end,
|
||||
kw_true, kw_false,
|
||||
kw_declare, kw_define,
|
||||
kw_global, kw_constant,
|
||||
|
Reference in New Issue
Block a user