Changeset 58fe85a for src/SynTree/NamedTypeDecl.cc

Timestamp:

Jan 7, 2021, 3:27:00 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (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' into park_unpark

File:

• src/SynTree/NamedTypeDecl.cc (modified) (6 diffs)

src/SynTree/NamedTypeDecl.cc

@@ -22 +22 @@
 #include "LinkageSpec.h"         // for Spec, Cforall, linkageName
 #include "Type.h"                // for Type, Type::StorageClasses
+#include "CompilationState.h"
 
 NamedTypeDecl::NamedTypeDecl( const std::string &name, Type::StorageClasses scs, Type *base )
@@ -28 +29 @@
 NamedTypeDecl::NamedTypeDecl( const NamedTypeDecl &other )
         : Parent( other ), base( maybeClone( other.base ) ) {
-        cloneAll( other.parameters, parameters );
         cloneAll( other.assertions, assertions );
 }
@@ -34 +34 @@
 NamedTypeDecl::~NamedTypeDecl() {
         delete base;
-        deleteAll( parameters );
         deleteAll( assertions );
 }
@@ -41 +40 @@
         using namespace std;
 
-        if ( name != "" ) os << name << ": ";
+        if ( ! name.empty() ) {
+                if( deterministic_output && isUnboundType(name) ) os << "[unbound]:";
+                else os << name << ": ";
+        }
 
         if ( linkage != LinkageSpec::Cforall ) {
@@ -51 +53 @@
                 os << " for ";
                 base->print( os, indent+1 );
-        } // if
-        if ( ! parameters.empty() ) {
-                os << endl << indent << "... with parameters" << endl;
-                printAll( parameters, os, indent+1 );
         } // if
         if ( ! assertions.empty() ) {
@@ -72 +70 @@
                 base->print( os, indent+1 );
         } // if
-        if ( ! parameters.empty() ) {
-                os << endl << indent << "... with parameters" << endl;
-                printAll( parameters, os, indent+1 );
-        } // if
 }