[cfe-commits] r128809 - in /cfe/trunk: include/clang/Basic/TokenKinds.def test/SemaCXX/decltype-98.cpp

[Eli Friedman]

Author: efriedma
Date: Mon Apr  4 02:19:40 2011
New Revision: 128809

URL: http://llvm.org/viewvc/llvm-project?rev=128809&view=rev
Log:
PR9585: add __decltype as a keyword.  While I'm here, alphabetize the list.


Added:
    cfe/trunk/test/SemaCXX/decltype-98.cpp
Modified:
    cfe/trunk/include/clang/Basic/TokenKinds.def

Modified: cfe/trunk/include/clang/Basic/TokenKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TokenKinds.def?rev=128809&r1=128808&r2=128809&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/TokenKinds.def (original)
+++ cfe/trunk/include/clang/Basic/TokenKinds.def Mon Apr  4 02:19:40 2011
@@ -373,18 +373,19 @@
 
 // Alternate spelling for various tokens.  There are GCC extensions in all
 // languages, but should not be disabled in strict conformance mode.
-ALIAS("__attribute__", __attribute, KEYALL)
-ALIAS("__const"      , const      , KEYALL)
-ALIAS("__const__"    , const      , KEYALL)
 ALIAS("__alignof__"  , __alignof  , KEYALL)
 ALIAS("__asm"        , asm        , KEYALL)
 ALIAS("__asm__"      , asm        , KEYALL)
+ALIAS("__attribute__", __attribute, KEYALL)
 ALIAS("__complex"    , _Complex   , KEYALL)
 ALIAS("__complex__"  , _Complex   , KEYALL)
+ALIAS("__const"      , const      , KEYALL)
+ALIAS("__const__"    , const      , KEYALL)
+ALIAS("__decltype"   , decltype   , KEYCXX)
 ALIAS("__imag__"     , __imag     , KEYALL)
 ALIAS("__inline"     , inline     , KEYALL)
 ALIAS("__inline__"   , inline     , KEYALL)
-ALIAS("__nullptr"    , nullptr      , KEYCXX)
+ALIAS("__nullptr"    , nullptr    , KEYCXX)
 ALIAS("__real__"     , __real     , KEYALL)
 ALIAS("__restrict"   , restrict   , KEYALL)
 ALIAS("__restrict__" , restrict   , KEYALL)

Added: cfe/trunk/test/SemaCXX/decltype-98.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/decltype-98.cpp?rev=128809&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/decltype-98.cpp (added)
+++ cfe/trunk/test/SemaCXX/decltype-98.cpp Mon Apr  4 02:19:40 2011
@@ -0,0 +1,3 @@
+// RUN: %clang_cc1 -std=c++98 -fsyntax-only -verify %s
+extern int x;
+__decltype(1) x = 3;