aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/Parser.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2011-01-16 23:56:42 +0000
committerAnders Carlsson <andersca@mac.com>2011-01-16 23:56:42 +0000
commit1f3b6fdabbb10779a473d6315154d7325ce20aea (patch)
tree1a81fa5cf3af3bf54977a0cbc6a8b225b9b6ae29 /lib/Parse/Parser.cpp
parent0dc5f9aea3597f2ed400dd0c1bf45ebbb4a051f3 (diff)
Begin work on supporting "N3206: Override control: Eliminating Attributes", from
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm This lands support for parsing virt-specifier-seq after member functions, including the contextual keywords 'final', and 'override'. The keywords are not yet used for anything. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@123606 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/Parser.cpp')
-rw-r--r--lib/Parse/Parser.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index aa0ad795ca..473c6ad7b0 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -387,6 +387,12 @@ void Parser::Initialize() {
ObjCTypeQuals[objc_byref] = &PP.getIdentifierTable().get("byref");
}
+ // Initialize C++0x contextual keywords.
+ if (getLang().CPlusPlus0x) {
+ Ident_final = &PP.getIdentifierTable().get("final");
+ Ident_override = &PP.getIdentifierTable().get("override");
+ }
+
Ident_super = &PP.getIdentifierTable().get("super");
if (getLang().AltiVec) {