diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-06 03:21:47 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-06 03:21:47 +0000 |
| commit | 99831e4677a7e2e051af636221694d60ba31fcdb (patch) | |
| tree | 4684bde38a7659db0c97673dcab98cffce576f9b /lib/Parse/ParseStmt.cpp | |
| parent | c1b0f7fa9b755ab59129ae85187d0d4f91379995 (diff) | |
User-defined literals: reject string and character UDLs in all places where the
grammar requires a string-literal and not a user-defined-string-literal. The
two constructs are still represented by the same TokenKind, in order to prevent
a combinatorial explosion of different kinds of token. A flag on Token tracks
whether a ud-suffix is present, in order to prevent clients from needing to look
at the token's spelling.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152098 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseStmt.cpp')
| -rw-r--r-- | lib/Parse/ParseStmt.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp index 0ce73cbeb2..cd80c4c969 100644 --- a/lib/Parse/ParseStmt.cpp +++ b/lib/Parse/ParseStmt.cpp @@ -1797,10 +1797,8 @@ StmtResult Parser::ParseAsmStatement(bool &msAsm) { ExprResult AsmString(ParseAsmStringLiteral()); if (AsmString.isInvalid()) { - // If the reason we are recovering is because of an improper string - // literal, it makes the most sense just to consume to the ')'. - if (isTokenStringLiteral()) - T.skipToEnd(); + // Consume up to and including the closing paren. + T.skipToEnd(); return StmtError(); } |