Changeset 6840e7c for src/SynTree/ReferenceToType.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (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 cleanup-dtors

File:

• src/SynTree/ReferenceToType.cc (modified) (10 diffs)

src/SynTree/ReferenceToType.cc

@@ -14 +14 @@
 //
 
-#include <stddef.h>          // for NULL
 #include <cassert>           // for assert
 #include <list>              // for list, _List_const_iterator, list<>::cons...
@@ -38 +37 @@
 }
 
-void ReferenceToType::print( std::ostream &os, int indent ) const {
+void ReferenceToType::print( std::ostream &os, Indenter indent ) const {
         using std::endl;
 
@@ -44 +43 @@
         os << "instance of " << typeString() << " " << name << " ";
         if ( ! parameters.empty() ) {
-                os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
-                printAll( parameters, os, indent+2 );
+                os << endl << indent << "... with parameters" << endl;
+                printAll( parameters, os, indent+1 );
         } // if
 }
@@ -65 +64 @@
 
 std::list<TypeDecl*>* StructInstType::get_baseParameters() {
-        if ( ! baseStruct ) return NULL;
+        if ( ! baseStruct ) return nullptr;
         return &baseStruct->get_parameters();
 }
@@ -76 +75 @@
 }
 
-void StructInstType::print( std::ostream &os, int indent ) const {
+void StructInstType::print( std::ostream &os, Indenter indent ) const {
         using std::endl;
 
-        if ( baseStruct == NULL ) ReferenceToType::print( os, indent );
+        if ( baseStruct == nullptr ) ReferenceToType::print( os, indent );
         else {
                 Type::print( os, indent );
                 os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body() << " ";
                 if ( ! parameters.empty() ) {
-                        os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
-                        printAll( parameters, os, indent+2 );
+                        os << endl << indent << "... with parameters" << endl;
+                        printAll( parameters, os, indent+1 );
                 } // if
         } // if
@@ -97 +96 @@
 
 std::list< TypeDecl * > * UnionInstType::get_baseParameters() {
-        if ( ! baseUnion ) return NULL;
+        if ( ! baseUnion ) return nullptr;
         return &baseUnion->get_parameters();
 }
@@ -108 +107 @@
 }
 
-void UnionInstType::print( std::ostream &os, int indent ) const {
+void UnionInstType::print( std::ostream &os, Indenter indent ) const {
         using std::endl;
 
-        if ( baseUnion == NULL ) ReferenceToType::print( os, indent );
+        if ( baseUnion == nullptr ) ReferenceToType::print( os, indent );
         else {
                 Type::print( os, indent );
                 os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body() << " ";
                 if ( ! parameters.empty() ) {
-                        os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
-                        printAll( parameters, os, indent+2 );
+                        os << endl << indent << "... with parameters" << endl;
+                        printAll( parameters, os, indent+1 );
                 } // if
         } // if
@@ -129 +128 @@
 
 bool EnumInstType::isComplete() const { return baseEnum ? baseEnum->has_body() : false; }
+
+void EnumInstType::print( std::ostream &os, Indenter indent ) const {
+        using std::endl;
+
+        if ( baseEnum == nullptr ) ReferenceToType::print( os, indent );
+        else {
+                Type::print( os, indent );
+                os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body() << " ";
+        } // if
+}
+
 
 std::string TraitInstType::typeString() const { return "trait"; }
@@ -166 +176 @@
 bool TypeInstType::isComplete() const { return baseType->isComplete(); }
 
-void TypeInstType::print( std::ostream &os, int indent ) const {
+void TypeInstType::print( std::ostream &os, Indenter indent ) const {
         using std::endl;
 
@@ -172 +182 @@
         os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type) ";
         if ( ! parameters.empty() ) {
-                os << endl << std::string( indent, ' ' ) << "with parameters" << endl;
-                printAll( parameters, os, indent+2 );
+                os << endl << indent << "... with parameters" << endl;
+                printAll( parameters, os, indent+1 );
         } // if
 }