[Parse][Reflection] Parse constexpr declarations in C++1z mode only

This resolves #15.
asutton · Apr 21, 2017 · 0a1eb43 · 0a1eb43
1 parent 2275d88
commit 0a1eb43
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
@@ -1539,7 +1539,7 @@ Parser::DeclGroupPtrTy Parser::ParseDeclaration(unsigned Context,
     break;
 
   case tok::kw_constexpr: // [Meta]: constexpr-declaration
-    if (NextToken().is(tok::l_brace))
+    if (getLangOpts().CPlusPlus1z && NextToken().is(tok::l_brace))
       return ParseConstexprDeclaration();
 
   default:

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
@@ -2518,7 +2518,8 @@ Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS,
   }
 
   // constexpr-declaration
-  if (Tok.is(tok::kw_constexpr) && NextToken().is(tok::l_brace))
+  if (getLangOpts().CPlusPlus1z && Tok.is(tok::kw_constexpr) &&
+      NextToken().is(tok::l_brace))
     return ParseConstexprDeclaration();
 
   // Hold late-parsed attributes so we can attach a Decl to them later.

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
@@ -852,7 +852,7 @@ Parser::ParseExternalDeclaration(ParsedAttributesWithRange &attrs,
     goto dont_know;
 
   case tok::kw_constexpr: // [Meta] constexpr-declaration
-    if (NextToken().is(tok::l_brace))
+    if (getLangOpts().CPlusPlus1z && NextToken().is(tok::l_brace))
       return ParseConstexprDeclaration();
     goto dont_know;