commit 64c438a4be2a871fa43c78264663ba1e9788b94d
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Sat Aug 09 16:51:54 2008 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Sat Aug 09 16:51:54 2008 +0000
tree d88760d32970f7715de5fc0d8aa444fa8857628f
parent 907747b3a67a41420ead8ef1fc5e6bd9dc9e0ad9

Implement support for the 'wchar_t' C++ type.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54585 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/DeclSpec.cpp

diff --git a/lib/Parse/DeclSpec.cpp b/lib/Parse/DeclSpec.cpp
index 8e6dacb..d97dcfa 100644
--- a/lib/Parse/DeclSpec.cpp
+++ b/lib/Parse/DeclSpec.cpp
@@ -87,6 +87,7 @@
   case DeclSpec::TST_unspecified: return "unspecified";
   case DeclSpec::TST_void:        return "void";
   case DeclSpec::TST_char:        return "char";
+  case DeclSpec::TST_wchar:       return "wchar_t";
   case DeclSpec::TST_int:         return "int";
   case DeclSpec::TST_float:       return "float";
   case DeclSpec::TST_double:      return "double";
@@ -214,11 +215,12 @@
                       const LangOptions &Lang) {
   // Check the type specifier components first.
 
-  // signed/unsigned are only valid with int/char.
+  // signed/unsigned are only valid with int/char/wchar_t.
   if (TypeSpecSign != TSS_unspecified) {
     if (TypeSpecType == TST_unspecified)
       TypeSpecType = TST_int; // unsigned -> unsigned int, signed -> signed int.
-    else if (TypeSpecType != TST_int && TypeSpecType != TST_char) {
+    else if (TypeSpecType != TST_int  &&
+             TypeSpecType != TST_char && TypeSpecType != TST_wchar) {
       Diag(D, TSSLoc, SrcMgr, diag::err_invalid_sign_spec,
            getSpecifierName( (TST)TypeSpecType));
       // signed double -> double.

lib/Parse/ParseDecl.cpp

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index 1cf3317..5b4473e 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -376,6 +376,7 @@
 ///         struct-or-union-specifier
 ///         enum-specifier
 ///         typedef-name
+/// [C++]   'wchar_t'
 /// [C++]   'bool'
 /// [C99]   '_Bool'
 /// [C99]   '_Complex'
@@ -517,6 +518,9 @@
     case tok::kw_double:
       isInvalid = DS.SetTypeSpecType(DeclSpec::TST_double, Loc, PrevSpec);
       break;
+    case tok::kw_wchar_t:       // [C++ 2.11p1]
+      isInvalid = DS.SetTypeSpecType(DeclSpec::TST_wchar, Loc, PrevSpec);
+      break;
     case tok::kw_bool:          // [C++ 2.11p1]
     case tok::kw__Bool:
       isInvalid = DS.SetTypeSpecType(DeclSpec::TST_bool, Loc, PrevSpec);
@@ -941,6 +945,7 @@
   case tok::kw__Imaginary:
   case tok::kw_void:
   case tok::kw_char:
+  case tok::kw_wchar_t:
   case tok::kw_int:
   case tok::kw_float:
   case tok::kw_double:
@@ -992,6 +997,7 @@
   case tok::kw__Imaginary:
   case tok::kw_void:
   case tok::kw_char:
+  case tok::kw_wchar_t:
   case tok::kw_int:
   case tok::kw_float:
   case tok::kw_double: