diff options
| -rw-r--r-- | lib/AsmParser/Lexer.l | 2 | ||||
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/AsmParser/Lexer.l b/lib/AsmParser/Lexer.l index 9cfe9fd78e..faddcb16d5 100644 --- a/lib/AsmParser/Lexer.l +++ b/lib/AsmParser/Lexer.l @@ -147,7 +147,7 @@ HexFPConstant 0x[0-9A-Fa-f]+ {Comment} { /* Ignore comments for now */ } begin { return BEGINTOK; } -end { return END; } +end { return ENDTOK; } true { return TRUE; } false { return FALSE; } declare { return DECLARE; } diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index 697609a3fa..d1feec81e1 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -671,7 +671,7 @@ Module *RunVMAsmParser(const string &Filename, FILE *F) { %type <StrVal> OptVAR_ID OptAssign -%token IMPLEMENTATION TRUE FALSE BEGINTOK END DECLARE GLOBAL CONSTANT UNINIT +%token IMPLEMENTATION TRUE FALSE BEGINTOK ENDTOK DECLARE GLOBAL CONSTANT UNINIT %token TO EXCEPT DOTDOTDOT STRING NULL_TOK CONST INTERNAL OPAQUE // Basic Block Terminating Operators @@ -1205,13 +1205,17 @@ FunctionHeaderH : OptInternal TypesV STRINGCONSTANT '(' ArgList ')' { } } -FunctionHeader : FunctionHeaderH ConstPool BEGINTOK { +BEGIN : BEGINTOK | '{'; // Allow BEGIN or '{' to start a function + +FunctionHeader : FunctionHeaderH BEGIN { $$ = CurMeth.CurrentFunction; // Resolve circular types before we parse the body of the method. ResolveTypes(CurMeth.LateResolveTypes); } +END : ENDTOK | '}'; // Allow end of '}' to end a function + Function : BasicBlockList END { $$ = $1; } |