Changes in src/AST/Print.cpp [ef9988b:37cdd97]

File:

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

src/AST/Print.cpp

@@ -29 +29 @@
 
 template <typename C, typename... T>
-constexpr array<C,sizeof...(T)> make_array(T&&... values)
+constexpr auto make_array(T&&... values) ->
+        array<C,sizeof...(T)>
 {
         return array<C,sizeof...(T)>{
@@ -128 +129 @@
 
         void print( const ast::Expr::InferUnion & inferred, unsigned level = 0 ) {
-                if (inferred.data.resnSlots && !inferred.data.resnSlots->empty()) {
-                        os << indent << "with " << inferred.data.resnSlots->size()
+                switch ( inferred.mode ) {
+                case ast::Expr::InferUnion::Empty: return;
+                case ast::Expr::InferUnion::Slots: {
+                        os << indent << "with " << inferred.data.resnSlots.size()
                            << " pending inference slots" << endl;
-                }
-                if (inferred.data.inferParams && !inferred.data.inferParams->empty()) {
+                        return;
+                }
+                case ast::Expr::InferUnion::Params: {
                         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( i.second.declptr );
+                                short_print( Decl::fromId( i.second.decl ) );
                                 os << endl;
                                 print( i.second.expr->inferred, level+1 );
                         }
                         --indent;
+                        return;
+                }
                 }
         }
@@ -227 +233 @@
                 }
 
-                if ( ! node->assertions.empty() ) {
+                if ( ! short_mode && ! node->assertions.empty() ) {
                         os << endl << indent << "... with assertions" << endl;
                         ++indent;
@@ -237 +243 @@
         void postprint( const ast::Expr * node ) {
                 print( node->inferred );
-
-                if ( node->result ) {
-                        os << endl << indent << "... with resolved type:" << endl;
-                        ++indent;
-                        os << indent;
-                        node->result->accept( *this );
-                        --indent;
-                }
 
                 if ( node->env ) {
@@ -844 +842 @@
         virtual const ast::Expr * visit( const ast::CastExpr * node ) override final {
                 ++indent;
-                os << (node->isGenerated ? "Generated" : "Explicit") << " Cast of:" << endl << indent;
+                os << (node->isGenerated ? "Generated" : "Explicit") << " cast of:" << endl << indent;
                 safe_print( node->arg );
                 os << endl << indent-1 << "... to:";