Changeset 17c6edeb for src/Parser/DeclarationNode.cc

Timestamp:

Aug 16, 2022, 2:52:24 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

71cf630

Parents:

32d1383 (diff), e116db3 (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 : Wed Jul 14 17:36:57 2021
-// Update Count     : 1154
+// Last Modified On : Mon Aug  8 17:07:00 2022
+// Update Count     : 1185
 //
 
@@ -128 +128 @@
         if ( name ) {
                 os << *name << ": ";
-        } else {
-                os << "unnamed: ";
         } // if
 
@@ -154 +152 @@
                 initializer->printOneLine( os );
                 os << " maybe constructed? " << initializer->get_maybeConstructed();
-
-        } // if
+        } // if
+
+        for ( Attribute * attr: reverseIterate( attributes ) ) {
+                os << string( indent + 2, ' ' ) << "attr " << attr->name.c_str();
+        } // for
 
         os << endl;
@@ -243 +244 @@
         newnode->type = new TypeData( TypeData::Aggregate );
         newnode->type->aggregate.kind = kind;
-        newnode->type->aggregate.name =  name == nullptr ? new string( DeclarationNode::anonymous.newName() ) : name;
+        newnode->type->aggregate.name = name == nullptr ? new string( DeclarationNode::anonymous.newName() ) : name;
         newnode->type->aggregate.actuals = actuals;
         newnode->type->aggregate.fields = fields;
@@ -518 +519 @@
         storageClasses |= q->storageClasses;
 
-        for ( Attribute *attr: reverseIterate( q->attributes ) ) {
+        for ( Attribute * attr: reverseIterate( q->attributes ) ) {
                 attributes.push_front( attr->clone() );
         } // for
@@ -683 +684 @@
         } // if
         delete o;
+
         return this;
 }