summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseExpr.cpp
diff options
context:
space:
mode:
authorAlexis Hunt <alercah@gmail.com>2010-08-29 21:26:48 +0000
committerAlexis Hunt <alercah@gmail.com>2010-08-29 21:26:48 +0000
commit79eb5469e04aa8906262619d1f7a3a71ba5dbd94 (patch)
tree6c9a4252f73fd27626204a4de22602dc8802d849 /clang/lib/Parse/ParseExpr.cpp
parentc843fca2fde772c85010123556d3e3abeb75b9ab (diff)
downloadbcm5719-llvm-79eb5469e04aa8906262619d1f7a3a71ba5dbd94.tar.gz
bcm5719-llvm-79eb5469e04aa8906262619d1f7a3a71ba5dbd94.zip
Implement C++0x user-defined string literals.
The extra data stored on user-defined literal Tokens is stored in extra allocated memory, which is managed by the PreprocessorLexer because there isn't a better place to put it that makes sure it gets deallocated, but only after it's used up. My testing has shown no significant slowdown as a result, but independent testing would be appreciated. llvm-svn: 112458
Diffstat (limited to 'clang/lib/Parse/ParseExpr.cpp')
-rw-r--r--clang/lib/Parse/ParseExpr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index 290b72c4c0d..2ade77a9073 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -1568,7 +1568,8 @@ ExprResult Parser::ParseStringLiteralExpression() {
} while (isTokenStringLiteral());
// Pass the set of string tokens, ready for concatenation, to the actions.
- return Actions.ActOnStringLiteral(&StringToks[0], StringToks.size());
+ return Actions.ActOnStringLiteral(getCurScope(), &StringToks[0],
+ StringToks.size());
}
/// ParseExpressionList - Used for C/C++ (argument-)expression-list.
OpenPOWER on IntegriCloud