Changeset 3f7e12cb for src/SynTree/Type.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

954908d

Parents:

78315272 (diff), e35f30a (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/SynTree/Type.cc (modified) (5 diffs)

src/SynTree/Type.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 11 13:21:25 2017
-// Update Count     : 37
+// Last Modified On : Mon Sep 25 15:16:32 2017
+// Update Count     : 38
 //
 #include "Type.h"
@@ -45 +45 @@
         "double _Imaginary",
         "long double _Imaginary",
+        "__int128",
+        "unsigned __int128",
 };
 
@@ -73 +75 @@
         Type * type;
         ReferenceType * ref;
-        for ( type = this; (ref = dynamic_cast<ReferenceType *>( type )); type = ref->get_base() );
+        for ( type = this; (ref = dynamic_cast<ReferenceType *>( type )); type = ref->base );
         return type;
 }
@@ -79 +81 @@
 int Type::referenceDepth() const { return 0; }
 
-void Type::print( std::ostream &os, int indent ) const {
+void Type::print( std::ostream &os, Indenter indent ) const {
         if ( ! forall.empty() ) {
                 os << "forall" << std::endl;
-                printAll( forall, os, indent + 4 );
-                os << std::string( indent+2, ' ' );
+                printAll( forall, os, indent+1 );
+                os << ++indent;
         } // if
 
         if ( ! attributes.empty() ) {
-                os << endl << string( indent+2, ' ' ) << "with attributes" << endl;
-                printAll( attributes, os, indent+4 );
+                os << "with attributes" << endl;
+                printAll( attributes, os, indent+1 );
         } // if
 
@@ -99 +101 @@
 const Type::Qualifiers noQualifiers;
 
-std::ostream & operator<<( std::ostream & out, const Type * type ) {
-        if ( type ) {
-                type->print( out );
-        } else {
-                out << "nullptr";
-        } // if
-        return out;
-}
-
 // Local Variables: //
 // tab-width: 4 //