Changeset 79c907b for src/AST

Timestamp:

Aug 6, 2020, 5:08:11 PM (5 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

0019d77

Parents:

3251b66

Message:

correctly print assertions

File:

• src/AST/Print.cpp (modified) (2 diffs)

src/AST/Print.cpp ¶

@@ -128 +128 @@
 
         void print( const ast::Expr::InferUnion & inferred, unsigned level = 0 ) {
-                switch ( inferred.mode ) {
-                case ast::Expr::InferUnion::Empty: return;
-                case ast::Expr::InferUnion::Slots: {
-                        os << indent << "with " << inferred.data.resnSlots.size()
+                if (inferred.data.resnSlots && !inferred.data.resnSlots->empty()) {
+                        os << indent << "with " << inferred.data.resnSlots->size()
                            << " pending inference slots" << endl;
-                        return;
-                }
-                case ast::Expr::InferUnion::Params: {
+                }
+                if (inferred.data.inferParams && !inferred.data.inferParams->empty()) {
                         os << indent << "with inferred parameters " << level << ":" << endl;
                         ++indent;
-                        for ( const auto & i : inferred.data.inferParams ) {
+                        for ( const auto & i : *inferred.data.inferParams ) {
                                 os << indent;
-                                short_print( Decl::fromId( i.second.decl ) );
+                                short_print( i.second.declptr );
                                 os << endl;
                                 print( i.second.expr->inferred, level+1 );
                         }
                         --indent;
-                        return;
-                }
                 }
         }
@@ -232 +227 @@
                 }
 
-                if ( ! short_mode && ! node->assertions.empty() ) {
+                if ( ! node->assertions.empty() ) {
                         os << endl << indent << "... with assertions" << endl;
                         ++indent;