Revert changes from r170428, as I accidentally changed the line endings of these files to Windows style.

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

33 files changed, 27793 insertions, 28202 deletions

diff --git a/include/clang/AST/ASTContext.h b/include/clang/AST/ASTContext.h
index d750ba948d..86b2c42f85 100644
--- a/include/clang/AST/ASTContext.h
+++ b/include/clang/AST/ASTContext.h
@@ -716,9 +716,6 @@ public:
   CanQualType PseudoObjectTy, ARCUnbridgedCastTy;
   CanQualType ObjCBuiltinIdTy, ObjCBuiltinClassTy, ObjCBuiltinSelTy;
   CanQualType ObjCBuiltinBoolTy;
-  CanQualType OCLImage1dTy, OCLImage1dArrayTy, OCLImage1dBufferTy;
-  CanQualType OCLImage2dTy, OCLImage2dArrayTy;
-  CanQualType OCLImage3dTy;
 
   // Types for deductions in C++0x [stmt.ranged]'s desugaring. Built on demand.
   mutable QualType AutoDeductTy;     // Deduction against 'auto'.
diff --git a/include/clang/AST/BuiltinTypes.def b/include/clang/AST/BuiltinTypes.def
index 75ebb2c5a5..ba322fb326 100644
--- a/include/clang/AST/BuiltinTypes.def
+++ b/include/clang/AST/BuiltinTypes.def
@@ -1,234 +1,226 @@
-//===-- BuiltinTypeNodes.def - Metadata about BuiltinTypes ------*- C++ -*-===//

-//

-//                     The LLVM Compiler Infrastructure

-//

-// This file is distributed under the University of Illinois Open Source

-// License. See LICENSE.TXT for details.

-//

-//===----------------------------------------------------------------------===//

-//

-//  This file defines the database about various builtin singleton types.

-//

-//  BuiltinType::Id is the enumerator defining the type.

-//

-//  Context.SingletonId is the global singleton of this type.  Some global

-//  singletons are shared by multiple types.

-//

-//    BUILTIN_TYPE(Id, SingletonId) - A builtin type that has not been

-//    covered by any other #define.  Defining this macro covers all

-//    the builtins.

-//

-//    SIGNED_TYPE(Id, SingletonId) - A signed integral type.

-//

-//    UNSIGNED_TYPE(Id, SingletonId) - An unsigned integral type.

-//

-//    FLOATING_TYPE(Id, SingletonId) - A floating-point type.

-//

-//    PLACEHOLDER_TYPE(Id, SingletonId) - A placeholder type.  Placeholder

-//    types are used to perform context-sensitive checking of specific

-//    forms of expression.

-//

-//    SHARED_SINGLETON_TYPE(Expansion) - The given expansion corresponds

-//    to a builtin which uses a shared singleton type.

-//

-//===----------------------------------------------------------------------===//

-

-#ifndef SIGNED_TYPE

-#define SIGNED_TYPE(Id, SingletonId) BUILTIN_TYPE(Id, SingletonId)

-#endif

-

-#ifndef UNSIGNED_TYPE

-#define UNSIGNED_TYPE(Id, SingletonId) BUILTIN_TYPE(Id, SingletonId)

-#endif

-

-#ifndef FLOATING_TYPE

-#define FLOATING_TYPE(Id, SingletonId) BUILTIN_TYPE(Id, SingletonId)

-#endif

-

-#ifndef PLACEHOLDER_TYPE

-#define PLACEHOLDER_TYPE(Id, SingletonId) BUILTIN_TYPE(Id, SingletonId)

-#endif

-

-#ifndef SHARED_SINGLETON_TYPE

-#define SHARED_SINGLETON_TYPE(Expansion) Expansion

-#endif

-

-//===- Builtin Types ------------------------------------------------------===//

-

-// void

-BUILTIN_TYPE(Void, VoidTy)

-

-//===- Unsigned Types -----------------------------------------------------===//

-

-// 'bool' in C++, '_Bool' in C99

-UNSIGNED_TYPE(Bool, BoolTy)

-

-// 'char' for targets where it's unsigned

-SHARED_SINGLETON_TYPE(UNSIGNED_TYPE(Char_U, CharTy))

-

-// 'unsigned char', explicitly qualified

-UNSIGNED_TYPE(UChar, UnsignedCharTy)

-

-// 'wchar_t' for targets where it's unsigned

-SHARED_SINGLETON_TYPE(UNSIGNED_TYPE(WChar_U, WCharTy))

-

-// 'char16_t' in C++

-UNSIGNED_TYPE(Char16, Char16Ty)

-

-// 'char32_t' in C++

-UNSIGNED_TYPE(Char32, Char32Ty)

-

-// 'unsigned short'

-UNSIGNED_TYPE(UShort, UnsignedShortTy)

-

-// 'unsigned int'

-UNSIGNED_TYPE(UInt, UnsignedIntTy)

-

-// 'unsigned long'

-UNSIGNED_TYPE(ULong, UnsignedLongTy)

-

-// 'unsigned long long'

-UNSIGNED_TYPE(ULongLong, UnsignedLongLongTy)

-

-// '__uint128_t'

-UNSIGNED_TYPE(UInt128, UnsignedInt128Ty)

-

-//===- Signed Types -------------------------------------------------------===//

-

-// 'char' for targets where it's signed

-SHARED_SINGLETON_TYPE(SIGNED_TYPE(Char_S, CharTy))

-

-// 'signed char', explicitly qualified

-SIGNED_TYPE(SChar, SignedCharTy)

-

-// 'wchar_t' for targets where it's signed

-SHARED_SINGLETON_TYPE(SIGNED_TYPE(WChar_S, WCharTy))

-

-// 'short' or 'signed short'

-SIGNED_TYPE(Short, ShortTy)

-

-// 'int' or 'signed int'

-SIGNED_TYPE(Int, IntTy)

-

-// 'long' or 'signed long'

-SIGNED_TYPE(Long, LongTy)

-

-// 'long long' or 'signed long long'

-SIGNED_TYPE(LongLong, LongLongTy)

-

-// '__int128_t'

-SIGNED_TYPE(Int128, Int128Ty)

-

-//===- Floating point types -----------------------------------------------===//

-

-// 'half' in OpenCL, '__fp16' in ARM NEON.

-FLOATING_TYPE(Half, HalfTy)

-

-// 'float'

-FLOATING_TYPE(Float, FloatTy)

-

-// 'double'

-FLOATING_TYPE(Double, DoubleTy)

-

-// 'long double'

-FLOATING_TYPE(LongDouble, LongDoubleTy)

-

-//===- Language-specific types --------------------------------------------===//

-

-// This is the type of C++0x 'nullptr'.

-BUILTIN_TYPE(NullPtr, NullPtrTy)

-

-// The primitive Objective C 'id' type.  The user-visible 'id'

-// type is a typedef of an ObjCObjectPointerType to an

-// ObjCObjectType with this as its base.  In fact, this only ever

-// shows up in an AST as the base type of an ObjCObjectType.

-BUILTIN_TYPE(ObjCId, ObjCBuiltinIdTy)

-

-// The primitive Objective C 'Class' type.  The user-visible

-// 'Class' type is a typedef of an ObjCObjectPointerType to an

-// ObjCObjectType with this as its base.  In fact, this only ever

-// shows up in an AST as the base type of an ObjCObjectType.

-BUILTIN_TYPE(ObjCClass, ObjCBuiltinClassTy)

-

-// The primitive Objective C 'SEL' type.  The user-visible 'SEL'

-// type is a typedef of a PointerType to this.

-BUILTIN_TYPE(ObjCSel, ObjCBuiltinSelTy)

-

-// OpenCL image types.

-BUILTIN_TYPE(OCLImage1d, OCLImage1dTy)

-BUILTIN_TYPE(OCLImage1dArray, OCLImage1dArrayTy)

-BUILTIN_TYPE(OCLImage1dBuffer, OCLImage1dBufferTy)

-BUILTIN_TYPE(OCLImage2d, OCLImage2dTy)

-BUILTIN_TYPE(OCLImage2dArray, OCLImage2dArrayTy)

-BUILTIN_TYPE(OCLImage3d, OCLImage3dTy)

-

-// This represents the type of an expression whose type is

-// totally unknown, e.g. 'T::foo'.  It is permitted for this to

-// appear in situations where the structure of the type is

-// theoretically deducible.

-BUILTIN_TYPE(Dependent, DependentTy)

-

-// The type of an unresolved overload set.  A placeholder type.

-// Expressions with this type have one of the following basic

-// forms, with parentheses generally permitted:

-//   foo          # possibly qualified, not if an implicit access

-//   foo          # possibly qualified, not if an implicit access

-//   &foo         # possibly qualified, not if an implicit access

-//   x->foo       # only if might be a static member function

-//   &x->foo      # only if might be a static member function

-//   &Class::foo  # when a pointer-to-member; sub-expr also has this type

-// OverloadExpr::find can be used to analyze the expression.

-//

-// Overload should be the first placeholder type, or else change

-// BuiltinType::isNonOverloadPlaceholderType()

-PLACEHOLDER_TYPE(Overload, OverloadTy)

-

-// The type of a bound C++ non-static member function.

-// A placeholder type.  Expressions with this type have one of the

-// following basic forms:

-//   foo          # if an implicit access

-//   x->foo       # if only contains non-static members

-PLACEHOLDER_TYPE(BoundMember, BoundMemberTy)

-

-// The type of an expression which refers to a pseudo-object,

-// such as those introduced by Objective C's @property or

-// VS.NET's __property declarations.  A placeholder type.  The

-// pseudo-object is actually accessed by emitting a call to

-// some sort of function or method;  typically there is a pair

-// of a setter and a getter, with the setter used if the

-// pseudo-object reference is used syntactically as the

-// left-hand-side of an assignment operator.

-//

-// A pseudo-object reference naming an Objective-C @property is

-// always a dot access with a base of object-pointer type,

-// e.g. 'x.foo'.

-//

-// In VS.NET, a __property declaration creates an implicit

-// member with an associated name, which can then be named

-// in any of the normal ways an ordinary member could be.

-PLACEHOLDER_TYPE(PseudoObject, PseudoObjectTy)

-

-// __builtin_any_type.  A placeholder type.  Useful for clients

-// like debuggers that don't know what type to give something.

-// Only a small number of operations are valid on expressions of

-// unknown type, most notably explicit casts.

-PLACEHOLDER_TYPE(UnknownAny, UnknownAnyTy)

-

-PLACEHOLDER_TYPE(BuiltinFn, BuiltinFnTy)

-

-// The type of a cast which, in ARC, would normally require a

-// __bridge, but which might be okay depending on the immediate

-// context.

-PLACEHOLDER_TYPE(ARCUnbridgedCast, ARCUnbridgedCastTy)

-

-#ifdef LAST_BUILTIN_TYPE

-LAST_BUILTIN_TYPE(ARCUnbridgedCast)

-#undef LAST_BUILTIN_TYPE

-#endif

-

-#undef SHARED_SINGLETON_TYPE

-#undef PLACEHOLDER_TYPE

-#undef FLOATING_TYPE

-#undef SIGNED_TYPE

-#undef UNSIGNED_TYPE

-#undef BUILTIN_TYPE

+//===-- BuiltinTypeNodes.def - Metadata about BuiltinTypes ------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//  This file defines the database about various builtin singleton types.
+//
+//  BuiltinType::Id is the enumerator defining the type.
+//
+//  Context.SingletonId is the global singleton of this type.  Some global
+//  singletons are shared by multiple types.
+//
+//    BUILTIN_TYPE(Id, SingletonId) - A builtin type that has not been
+//    covered by any other #define.  Defining this macro covers all
+//    the builtins.
+//
+//    SIGNED_TYPE(Id, SingletonId) - A signed integral type.
+//
+//    UNSIGNED_TYPE(Id, SingletonId) - An unsigned integral type.
+//
+//    FLOATING_TYPE(Id, SingletonId) - A floating-point type.
+//
+//    PLACEHOLDER_TYPE(Id, SingletonId) - A placeholder type.  Placeholder
+//    types are used to perform context-sensitive checking of specific
+//    forms of expression.
+//
+//    SHARED_SINGLETON_TYPE(Expansion) - The given expansion corresponds
+//    to a builtin which uses a shared singleton type.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SIGNED_TYPE
+#define SIGNED_TYPE(Id, SingletonId) BUILTIN_TYPE(Id, SingletonId)
+#endif
+
+#ifndef UNSIGNED_TYPE
+#define UNSIGNED_TYPE(Id, SingletonId) BUILTIN_TYPE(Id, SingletonId)
+#endif
+
+#ifndef FLOATING_TYPE
+#define FLOATING_TYPE(Id, SingletonId) BUILTIN_TYPE(Id, SingletonId)
+#endif
+
+#ifndef PLACEHOLDER_TYPE
+#define PLACEHOLDER_TYPE(Id, SingletonId) BUILTIN_TYPE(Id, SingletonId)
+#endif
+
+#ifndef SHARED_SINGLETON_TYPE
+#define SHARED_SINGLETON_TYPE(Expansion) Expansion
+#endif
+
+//===- Builtin Types ------------------------------------------------------===//
+
+// void
+BUILTIN_TYPE(Void, VoidTy)
+
+//===- Unsigned Types -----------------------------------------------------===//
+
+// 'bool' in C++, '_Bool' in C99
+UNSIGNED_TYPE(Bool, BoolTy)
+
+// 'char' for targets where it's unsigned
+SHARED_SINGLETON_TYPE(UNSIGNED_TYPE(Char_U, CharTy))
+
+// 'unsigned char', explicitly qualified
+UNSIGNED_TYPE(UChar, UnsignedCharTy)
+
+// 'wchar_t' for targets where it's unsigned
+SHARED_SINGLETON_TYPE(UNSIGNED_TYPE(WChar_U, WCharTy))
+
+// 'char16_t' in C++
+UNSIGNED_TYPE(Char16, Char16Ty)
+
+// 'char32_t' in C++
+UNSIGNED_TYPE(Char32, Char32Ty)
+
+// 'unsigned short'
+UNSIGNED_TYPE(UShort, UnsignedShortTy)
+
+// 'unsigned int'
+UNSIGNED_TYPE(UInt, UnsignedIntTy)
+
+// 'unsigned long'
+UNSIGNED_TYPE(ULong, UnsignedLongTy)
+
+// 'unsigned long long'
+UNSIGNED_TYPE(ULongLong, UnsignedLongLongTy)
+
+// '__uint128_t'
+UNSIGNED_TYPE(UInt128, UnsignedInt128Ty)
+
+//===- Signed Types -------------------------------------------------------===//
+
+// 'char' for targets where it's signed
+SHARED_SINGLETON_TYPE(SIGNED_TYPE(Char_S, CharTy))
+
+// 'signed char', explicitly qualified
+SIGNED_TYPE(SChar, SignedCharTy)
+
+// 'wchar_t' for targets where it's signed
+SHARED_SINGLETON_TYPE(SIGNED_TYPE(WChar_S, WCharTy))
+
+// 'short' or 'signed short'
+SIGNED_TYPE(Short, ShortTy)
+
+// 'int' or 'signed int'
+SIGNED_TYPE(Int, IntTy)
+
+// 'long' or 'signed long'
+SIGNED_TYPE(Long, LongTy)
+
+// 'long long' or 'signed long long'
+SIGNED_TYPE(LongLong, LongLongTy)
+
+// '__int128_t'
+SIGNED_TYPE(Int128, Int128Ty)
+
+//===- Floating point types -----------------------------------------------===//
+
+// 'half' in OpenCL, '__fp16' in ARM NEON.
+FLOATING_TYPE(Half, HalfTy)
+
+// 'float'
+FLOATING_TYPE(Float, FloatTy)
+
+// 'double'
+FLOATING_TYPE(Double, DoubleTy)
+
+// 'long double'
+FLOATING_TYPE(LongDouble, LongDoubleTy)
+
+//===- Language-specific types --------------------------------------------===//
+
+// This is the type of C++0x 'nullptr'.
+BUILTIN_TYPE(NullPtr, NullPtrTy)
+
+// The primitive Objective C 'id' type.  The user-visible 'id'
+// type is a typedef of an ObjCObjectPointerType to an
+// ObjCObjectType with this as its base.  In fact, this only ever
+// shows up in an AST as the base type of an ObjCObjectType.
+BUILTIN_TYPE(ObjCId, ObjCBuiltinIdTy)
+
+// The primitive Objective C 'Class' type.  The user-visible
+// 'Class' type is a typedef of an ObjCObjectPointerType to an
+// ObjCObjectType with this as its base.  In fact, this only ever
+// shows up in an AST as the base type of an ObjCObjectType.
+BUILTIN_TYPE(ObjCClass, ObjCBuiltinClassTy)
+
+// The primitive Objective C 'SEL' type.  The user-visible 'SEL'
+// type is a typedef of a PointerType to this.
+BUILTIN_TYPE(ObjCSel, ObjCBuiltinSelTy)
+
+// This represents the type of an expression whose type is
+// totally unknown, e.g. 'T::foo'.  It is permitted for this to
+// appear in situations where the structure of the type is
+// theoretically deducible.
+BUILTIN_TYPE(Dependent, DependentTy)
+
+// The type of an unresolved overload set.  A placeholder type.
+// Expressions with this type have one of the following basic
+// forms, with parentheses generally permitted:
+//   foo          # possibly qualified, not if an implicit access
+//   foo          # possibly qualified, not if an implicit access
+//   &foo         # possibly qualified, not if an implicit access
+//   x->foo       # only if might be a static member function
+//   &x->foo      # only if might be a static member function
+//   &Class::foo  # when a pointer-to-member; sub-expr also has this type
+// OverloadExpr::find can be used to analyze the expression.
+//
+// Overload should be the first placeholder type, or else change
+// BuiltinType::isNonOverloadPlaceholderType()
+PLACEHOLDER_TYPE(Overload, OverloadTy)
+
+// The type of a bound C++ non-static member function.
+// A placeholder type.  Expressions with this type have one of the
+// following basic forms:
+//   foo          # if an implicit access
+//   x->foo       # if only contains non-static members
+PLACEHOLDER_TYPE(BoundMember, BoundMemberTy)
+
+// The type of an expression which refers to a pseudo-object,
+// such as those introduced by Objective C's @property or
+// VS.NET's __property declarations.  A placeholder type.  The
+// pseudo-object is actually accessed by emitting a call to
+// some sort of function or method;  typically there is a pair
+// of a setter and a getter, with the setter used if the
+// pseudo-object reference is used syntactically as the
+// left-hand-side of an assignment operator.
+//
+// A pseudo-object reference naming an Objective-C @property is
+// always a dot access with a base of object-pointer type,
+// e.g. 'x.foo'.
+//
+// In VS.NET, a __property declaration creates an implicit
+// member with an associated name, which can then be named
+// in any of the normal ways an ordinary member could be.
+PLACEHOLDER_TYPE(PseudoObject, PseudoObjectTy)
+
+// __builtin_any_type.  A placeholder type.  Useful for clients
+// like debuggers that don't know what type to give something.
+// Only a small number of operations are valid on expressions of
+// unknown type, most notably explicit casts.
+PLACEHOLDER_TYPE(UnknownAny, UnknownAnyTy)
+
+PLACEHOLDER_TYPE(BuiltinFn, BuiltinFnTy)
+
+// The type of a cast which, in ARC, would normally require a
+// __bridge, but which might be okay depending on the immediate
+// context.
+PLACEHOLDER_TYPE(ARCUnbridgedCast, ARCUnbridgedCastTy)
+
+#ifdef LAST_BUILTIN_TYPE
+LAST_BUILTIN_TYPE(ARCUnbridgedCast)
+#undef LAST_BUILTIN_TYPE
+#endif
+
+#undef SHARED_SINGLETON_TYPE
+#undef PLACEHOLDER_TYPE
+#undef FLOATING_TYPE
+#undef SIGNED_TYPE
+#undef UNSIGNED_TYPE
+#undef BUILTIN_TYPE
diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h
index cf3b565fc3..368be8d6b0 100644
--- a/include/clang/AST/Type.h
+++ b/include/clang/AST/Type.h
@@ -1580,17 +1580,6 @@ public:
   bool isNullPtrType() const;                   // C++0x nullptr_t
   bool isAtomicType() const;                    // C11 _Atomic()
 
-  bool isImage1dT() const;                      // OpenCL image1d_t
-  bool isImage1dArrayT() const;                 // OpenCL image1d_array_t
-  bool isImage1dBufferT() const;                // OpenCL image1d_buffer_t
-  bool isImage2dT() const;                      // OpenCL image2d_t
-  bool isImage2dArrayT() const;                 // OpenCL image2d_array_t
-  bool isImage3dT() const;                      // OpenCL image3d_t
-
-  bool isImageType() const;                     // Any OpenCL image type
-
-  bool isOpenCLSpecificType() const;            // Any OpenCL specific type
-
   /// Determines if this type, which must satisfy
   /// isObjCLifetimeType(), is implicitly __unsafe_unretained rather
   /// than implicitly __strong.
@@ -4894,40 +4883,6 @@ inline bool Type::isObjCSelType() const {
 inline bool Type::isObjCBuiltinType() const {
   return isObjCIdType() || isObjCClassType() || isObjCSelType();
 }
-
-inline bool Type::isImage1dT() const {
-  return isSpecificBuiltinType(BuiltinType::OCLImage1d);
-}
-
-inline bool Type::isImage1dArrayT() const {
-  return isSpecificBuiltinType(BuiltinType::OCLImage1dArray);
-}
-
-inline bool Type::isImage1dBufferT() const {
-  return isSpecificBuiltinType(BuiltinType::OCLImage1dBuffer);
-}
-
-inline bool Type::isImage2dT() const {
-  return isSpecificBuiltinType(BuiltinType::OCLImage2d);
-}
-
-inline bool Type::isImage2dArrayT() const {
-  return isSpecificBuiltinType(BuiltinType::OCLImage2dArray);
-}
-
-inline bool Type::isImage3dT() const {
-  return isSpecificBuiltinType(BuiltinType::OCLImage3d);
-}
-inline bool Type::isImageType() const {
-  return isImage3dT() ||
-         isImage2dT() || isImage2dArrayT() ||
-         isImage1dT() || isImage1dArrayT() || isImage1dBufferT();
-}
-
-inline bool Type::isOpenCLSpecificType() const {
-  return isImageType();
-}
-
 inline bool Type::isTemplateTypeParmType() const {
   return isa<TemplateTypeParmType>(CanonicalType);
 }
diff --git a/include/clang/Basic/Specifiers.h b/include/clang/Basic/Specifiers.h
index 8a6c62933c..c82b8cb918 100644
--- a/include/clang/Basic/Specifiers.h
+++ b/include/clang/Basic/Specifiers.h
@@ -1,200 +1,194 @@
-//===--- Specifiers.h - Declaration and Type Specifiers ---------*- C++ -*-===//

-//

-//                     The LLVM Compiler Infrastructure

-//

-// This file is distributed under the University of Illinois Open Source

-// License. See LICENSE.TXT for details.

-//

-//===----------------------------------------------------------------------===//

-///

-/// \file

-/// \brief Defines various enumerations that describe declaration and

-/// type specifiers.

-///

-//===----------------------------------------------------------------------===//

-

-#ifndef LLVM_CLANG_BASIC_SPECIFIERS_H

-#define LLVM_CLANG_BASIC_SPECIFIERS_H

-

-namespace clang {

-  /// \brief Specifies the width of a type, e.g., short, long, or long long.

-  enum TypeSpecifierWidth {

-    TSW_unspecified,

-    TSW_short,

-    TSW_long,

-    TSW_longlong

-  };

-  

-  /// \brief Specifies the signedness of a type, e.g., signed or unsigned.

-  enum TypeSpecifierSign {

-    TSS_unspecified,

-    TSS_signed,

-    TSS_unsigned

-  };

-  

-  /// \brief Specifies the kind of type.

-  enum TypeSpecifierType {

-    TST_unspecified,

-    TST_void,

-    TST_char,

-    TST_wchar,        // C++ wchar_t

-    TST_char16,       // C++0x char16_t

-    TST_char32,       // C++0x char32_t

-    TST_int,

-    TST_int128,

-    TST_half,         // OpenCL half, ARM NEON __fp16

-    TST_float,

-    TST_double,

-    TST_bool,         // _Bool

-    TST_decimal32,    // _Decimal32

-    TST_decimal64,    // _Decimal64

-    TST_decimal128,   // _Decimal128

-    TST_enum,

-    TST_union,

-    TST_struct,

-    TST_class,        // C++ class type

-    TST_interface,    // C++ (Microsoft-specific) __interface type

-    TST_typename,     // Typedef, C++ class-name or enum name, etc.

-    TST_typeofType,

-    TST_typeofExpr,

-    TST_decltype,     // C++0x decltype

-    TST_underlyingType, // __underlying_type for C++0x

-    TST_auto,         // C++0x auto

-    TST_unknown_anytype, // __unknown_anytype extension

-    TST_atomic,       // C11 _Atomic

-    TST_image1d_t,        // OpenCL image1d_t

-    TST_image1d_array_t,  // OpenCL image1d_array_t

-    TST_image1d_buffer_t, // OpenCL image1d_buffer_t

-    TST_image2d_t,        // OpenCL image2d_t

-    TST_image2d_array_t,  // OpenCL image2d_array_t

-    TST_image3d_t,        // OpenCL image3d_t

-    TST_error         // erroneous type

-  };

-  

-  /// \brief Structure that packs information about the type specifiers that

-  /// were written in a particular type specifier sequence.

-  struct WrittenBuiltinSpecs {

-    /*DeclSpec::TST*/ unsigned Type  : 6;

-    /*DeclSpec::TSS*/ unsigned Sign  : 2;

-    /*DeclSpec::TSW*/ unsigned Width : 2;

-    bool ModeAttr : 1;

-  };  

-

-  /// \brief A C++ access specifier (public, private, protected), plus the

-  /// special value "none" which means different things in different contexts.

-  enum AccessSpecifier {

-    AS_public,

-    AS_protected,

-    AS_private,

-    AS_none

-  };

-

-  /// \brief The categorization of expression values, currently following the

-  /// C++11 scheme.

-  enum ExprValueKind {

-    /// \brief An r-value expression (a pr-value in the C++11 taxonomy)

-    /// produces a temporary value.

-    VK_RValue,

-

-    /// \brief An l-value expression is a reference to an object with

-    /// independent storage.

-    VK_LValue,

-

-    /// \brief An x-value expression is a reference to an object with

-    /// independent storage but which can be "moved", i.e.

-    /// efficiently cannibalized for its resources.

-    VK_XValue

-  };

-

-  /// \brief A further classification of the kind of object referenced by an

-  /// l-value or x-value.

-  enum ExprObjectKind {

-    /// An ordinary object is located at an address in memory.

-    OK_Ordinary,

-

-    /// A bitfield object is a bitfield on a C or C++ record.

-    OK_BitField,

-

-    /// A vector component is an element or range of elements on a vector.

-    OK_VectorComponent,

-

-    /// An Objective-C property is a logical field of an Objective-C

-    /// object which is read and written via Objective-C method calls.

-    OK_ObjCProperty,

-    

-    /// An Objective-C array/dictionary subscripting which reads an

-    /// object or writes at the subscripted array/dictionary element via

-    /// Objective-C method calls.

-    OK_ObjCSubscript

-  };

-

-  // \brief Describes the kind of template specialization that a

-  // particular template specialization declaration represents.

-  enum TemplateSpecializationKind {

-    /// This template specialization was formed from a template-id but

-    /// has not yet been declared, defined, or instantiated.

-    TSK_Undeclared = 0,

-    /// This template specialization was implicitly instantiated from a

-    /// template. (C++ [temp.inst]).

-    TSK_ImplicitInstantiation,

-    /// This template specialization was declared or defined by an

-    /// explicit specialization (C++ [temp.expl.spec]) or partial

-    /// specialization (C++ [temp.class.spec]).

-    TSK_ExplicitSpecialization,

-    /// This template specialization was instantiated from a template

-    /// due to an explicit instantiation declaration request

-    /// (C++0x [temp.explicit]).

-    TSK_ExplicitInstantiationDeclaration,

-    /// This template specialization was instantiated from a template

-    /// due to an explicit instantiation definition request

-    /// (C++ [temp.explicit]).

-    TSK_ExplicitInstantiationDefinition

-  };

-

-  /// \brief Storage classes.

-  enum StorageClass {

-    // These are legal on both functions and variables.

-    SC_None,

-    SC_Extern,

-    SC_Static,

-    SC_PrivateExtern,

-

-    // These are only legal on variables.

-    SC_OpenCLWorkGroupLocal,

-    SC_Auto,

-    SC_Register

-  };

-

-  /// \brief Checks whether the given storage class is legal for functions.

-  inline bool isLegalForFunction(StorageClass SC) {

-    return SC <= SC_PrivateExtern;

-  }

-

-  /// \brief Checks whether the given storage class is legal for variables.

-  inline bool isLegalForVariable(StorageClass SC) {

-    return true;

-  }

-

-  /// \brief In-class initialization styles for non-static data members.

-  enum InClassInitStyle {

-    ICIS_NoInit,   ///< No in-class initializer.

-    ICIS_CopyInit, ///< Copy initialization.

-    ICIS_ListInit  ///< Direct list-initialization.

-  };

-

-  /// \brief CallingConv - Specifies the calling convention that a function uses.

-  enum CallingConv {

-    CC_Default,

-    CC_C,           // __attribute__((cdecl))

-    CC_X86StdCall,  // __attribute__((stdcall))

-    CC_X86FastCall, // __attribute__((fastcall))

-    CC_X86ThisCall, // __attribute__((thiscall))

-    CC_X86Pascal,   // __attribute__((pascal))

-    CC_AAPCS,       // __attribute__((pcs("aapcs")))

-    CC_AAPCS_VFP,   // __attribute__((pcs("aapcs-vfp")))

-    CC_PnaclCall    // __attribute__((pnaclcall))

-  };

-

-} // end namespace clang

-

-#endif // LLVM_CLANG_BASIC_SPECIFIERS_H

+//===--- Specifiers.h - Declaration and Type Specifiers ---------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// \brief Defines various enumerations that describe declaration and
+/// type specifiers.
+///
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_BASIC_SPECIFIERS_H
+#define LLVM_CLANG_BASIC_SPECIFIERS_H
+
+namespace clang {
+  /// \brief Specifies the width of a type, e.g., short, long, or long long.
+  enum TypeSpecifierWidth {
+    TSW_unspecified,
+    TSW_short,
+    TSW_long,
+    TSW_longlong
+  };
+  
+  /// \brief Specifies the signedness of a type, e.g., signed or unsigned.
+  enum TypeSpecifierSign {
+    TSS_unspecified,
+    TSS_signed,
+    TSS_unsigned
+  };
+  
+  /// \brief Specifies the kind of type.
+  enum TypeSpecifierType {
+    TST_unspecified,
+    TST_void,
+    TST_char,
+