We can now parse and remember the distinction between:

'unsigned char' and 'unsigned char const'.

-Chris

llvm-svn: 39172

clang/AST/SemaType.cpp

@@ -131,7 +131,6 @@ static TypeRef ConvertDeclSpecToType(const DeclSpec &DS, ASTContext &Ctx) {
     //DeclSpec::TST_union:
     //DeclSpec::TST_struct:
     //DeclSpec::TST_typedef:
-      
   }
 }
 
@@ -140,7 +139,8 @@ static TypeRef ConvertDeclSpecToType(const DeclSpec &DS, ASTContext &Ctx) {
 TypeRef Sema::GetTypeForDeclarator(Declarator &D, Scope *S) {
   TypeRef T = ConvertDeclSpecToType(D.getDeclSpec(), Context);
   
-  // FIXME: Apply const/volatile/restrict qualifiers to T.
+  // Apply const/volatile/restrict qualifiers to T.
+  T = T.getQualifiedType(D.getDeclSpec().TypeQualifiers);
   
   return T;
   return TypeRef();

clang/Sema/SemaType.cpp

@@ -131,7 +131,6 @@ static TypeRef ConvertDeclSpecToType(const DeclSpec &DS, ASTContext &Ctx) {
     //DeclSpec::TST_union:
     //DeclSpec::TST_struct:
     //DeclSpec::TST_typedef:
-      
   }
 }
 
@@ -140,7 +139,8 @@ static TypeRef ConvertDeclSpecToType(const DeclSpec &DS, ASTContext &Ctx) {
 TypeRef Sema::GetTypeForDeclarator(Declarator &D, Scope *S) {
   TypeRef T = ConvertDeclSpecToType(D.getDeclSpec(), Context);
   
-  // FIXME: Apply const/volatile/restrict qualifiers to T.
+  // Apply const/volatile/restrict qualifiers to T.
+  T = T.getQualifiedType(D.getDeclSpec().TypeQualifiers);
   
   return T;
   return TypeRef();

clang/include/clang/AST/Type.h

@@ -51,12 +51,16 @@ public:
     ThePtr |= Quals;
   }
   
+  Type *getTypePtr() const {
+    return reinterpret_cast<Type*>(ThePtr & ~CVRFlags);
+  }
+  
   Type &operator*() const {
-    return *reinterpret_cast<Type*>(ThePtr & ~CVRFlags);
+    return *getTypePtr();
   }
 
   Type *operator->() const {
-    return reinterpret_cast<Type*>(ThePtr & ~CVRFlags);
+    return getTypePtr();
   }
   
   /// isNull - Return true if this TypeRef doesn't point to a type yet.
@@ -77,6 +81,15 @@ public:
     return ThePtr & CVRFlags;
   }
   
+  TypeRef getQualifiedType(unsigned TQs) const {
+    return TypeRef(getTypePtr(), TQs);
+  }
+  
+  TypeRef getUnqualifiedType() const {
+    return TypeRef(getTypePtr());
+  }
+  
+  
   void dump() const;
 };