Changeset 5e644d3e for src/Parser/DeclarationNode.cc

Timestamp:

Aug 29, 2016, 11:02:37 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

46f6134

Parents:

1e8b02f5 (diff), 6943a987 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

\
Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/DeclarationNode.cc (modified) (6 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 25 20:42:25 2016
-// Update Count     : 232
+// Last Modified On : Sun Aug 28 22:12:44 2016
+// Update Count     : 278
 //
 
@@ -375 +375 @@
 }
 
-void DeclarationNode::checkQualifiers( TypeData *src, TypeData *dst ) {
+void DeclarationNode::checkQualifiers( const TypeData *src, const TypeData *dst ) {
         TypeData::Qualifiers qsrc = src->qualifiers, qdst = dst->qualifiers;
 
@@ -801 +801 @@
 DeclarationNode *DeclarationNode::extractAggregate() const {
         if ( type ) {
-                TypeData *ret = type->extractAggregate();
+                TypeData *ret = typeextractAggregate( type );
                 if ( ret ) {
                         DeclarationNode *newnode = new DeclarationNode;
@@ -896 +896 @@
         if ( ! error.empty() ) throw SemanticError( error, this );
         if ( type ) {
-                return type->buildDecl( name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
+                return buildDecl( type, name, storageClass, maybeBuild< Expression >( bitfieldWidth ), isInline, isNoreturn, linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
         } // if
         if ( ! isInline && ! isNoreturn ) {
@@ -909 +909 @@
         switch ( type->kind ) {
           case TypeData::Enum:
-                return new EnumInstType( type->buildQualifiers(), type->enumeration->name );
+                return new EnumInstType( buildQualifiers( type ), type->enumeration->name );
           case TypeData::Aggregate: {
                   ReferenceToType *ret;
                   switch ( type->aggregate->kind ) {
                         case DeclarationNode::Struct:
-                          ret = new StructInstType( type->buildQualifiers(), type->aggregate->name );
+                          ret = new StructInstType( buildQualifiers( type ), type->aggregate->name );
                           break;
                         case DeclarationNode::Union:
-                          ret = new UnionInstType( type->buildQualifiers(), type->aggregate->name );
+                          ret = new UnionInstType( buildQualifiers( type ), type->aggregate->name );
                           break;
                         case DeclarationNode::Trait:
-                          ret = new TraitInstType( type->buildQualifiers(), type->aggregate->name );
+                          ret = new TraitInstType( buildQualifiers( type ), type->aggregate->name );
                           break;
                         default:
@@ -929 +929 @@
           }
           case TypeData::Symbolic: {
-                  TypeInstType *ret = new TypeInstType( type->buildQualifiers(), type->symbolic->name, false );
+                  TypeInstType *ret = new TypeInstType( buildQualifiers( type ), type->symbolic->name, false );
                   buildList( type->symbolic->actuals, ret->get_parameters() );
                   return ret;
           }
           default:
-                return type->build();
+                return typebuild( type );
         } // switch
 }