Changeset 6137fbb

Timestamp:

Oct 19, 2017, 11:13:11 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

bd7e609

Parents:

0a22cda

git-author:

Rob Schluntz <rschlunt@…> (10/11/17 15:59:22)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:13:11)

Message:

Print EnumInstType? body flag and other minor cleanup

Location:

src

Files:

• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)
• SynTree/ReferenceToType.cc (modified) (1 diff)
• SynTree/Type.h (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -605 +605 @@
                                 Alternative newerAlt( newAlt );
                                 newerAlt.env = newEnv;
-                                assert( (*candidate)->get_uniqueId() );
+                                assertf( (*candidate)->get_uniqueId(), "Assertion candidate does not have a unique ID: %s", toString( *candidate ).c_str() );
                                 DeclarationWithType *candDecl = static_cast< DeclarationWithType* >( Declaration::declFromId( (*candidate)->get_uniqueId() ) );
 

src/SymTab/Indexer.cc

@@ -571 +571 @@
 
                 if ( doDebug ) {
-                        std::cout << "--- Entering scope " << scope << std::endl;
+                        std::cerr << "--- Entering scope " << scope << std::endl;
                 }
         }
 
         void Indexer::leaveScope() {
-                using std::cout;
+                using std::cerr;
 
                 assert( scope > 0 && "cannot leave initial scope" );
+                if ( doDebug ) {
+                        cerr << "--- Leaving scope " << scope << " containing" << std::endl;
+                }
                 --scope;
 
                 while ( tables && tables->scope > scope ) {
                         if ( doDebug ) {
-                                cout << "--- Leaving scope " << tables->scope << " containing" << std::endl;
-                                dump( tables->idTable, cout );
-                                dump( tables->typeTable, cout );
-                                dump( tables->structTable, cout );
-                                dump( tables->enumTable, cout );
-                                dump( tables->unionTable, cout );
-                                dump( tables->traitTable, cout );
+                                dump( tables->idTable, cerr );
+                                dump( tables->typeTable, cerr );
+                                dump( tables->structTable, cerr );
+                                dump( tables->enumTable, cerr );
+                                dump( tables->unionTable, cerr );
+                                dump( tables->traitTable, cerr );
                         }
 

src/SynTree/ReferenceToType.cc

@@ -129 +129 @@
 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"; }
 

src/SynTree/Type.h

@@ -466 +466 @@
         virtual void accept( Visitor & v ) override { v.visit( this ); }
         virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
   private:
         virtual std::string typeString() const override;