Changes in src/AST/Print.cpp [3e5dd913:07de76b]

File:

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

src/AST/Print.cpp

@@ -21 +21 @@
 #include "Type.hpp"
 #include "TypeSubstitution.hpp"
-#include "CompilationState.h"
 
 #include "Common/utility.h" // for group_iterate
@@ -30 +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)>{
@@ -129 +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;
-                }
-        }
-
-        void print( const ast::FunctionType::ForallList & forall ) {
+                        return;
+                }
+                }
+        }
+
+        void print( const ast::ParameterizedType::ForallList & forall ) {
                 if ( forall.empty() ) return;
                 os << "forall" << endl;
                 ++indent;
                 printAll( forall );
-                os << indent;
-                --indent;
-        }
-
-        void print( const ast::FunctionType::AssertionList & assts ) {
-                if (assts.empty()) return;
-                os << "with assertions" << endl;
-                ++indent;
-                printAll(assts);
                 os << indent;
                 --indent;
@@ -214 +210 @@
 
         void preprint( const ast::NamedTypeDecl * node ) {
-                if ( ! node->name.empty() ) {
-                        os << node->name << ": ";
-                }
+                if ( ! node->name.empty() ) os << node->name << ": ";
 
                 if ( ! short_mode && node->linkage != Linkage::Cforall ) {
@@ -232 +226 @@
                 }
 
-                if ( ! node->assertions.empty() ) {
+                if ( ! node->params.empty() ) {
+                        os << endl << indent << "... with parameters" << endl;
+                        ++indent;
+                        printAll( node->params );
+                        --indent;
+                }
+
+                if ( ! short_mode && ! node->assertions.empty() ) {
                         os << endl << indent << "... with assertions" << endl;
                         ++indent;
@@ -243 +244 @@
                 print( node->inferred );
 
-                if ( node->result ) {
-                        os << endl << indent << "... with resolved type:" << endl;
-                        ++indent;
-                        os << indent;
-                        node->result->accept( *this );
-                        --indent;
-                }
-
                 if ( node->env ) {
                         os << endl << indent << "... with environment:" << endl;
@@ -267 +260 @@
         }
 
-        void preprint( const ast::FunctionType * node ) {
+        void preprint( const ast::ParameterizedType * node ) {
                 print( node->forall );
-                print( node->assertions );
                 print( node->qualifiers );
         }
 
-        void preprint( const ast::BaseInstType * node ) {
+        void preprint( const ast::ReferenceToType * node ) {
+                print( node->forall );
                 print( node->attributes );
                 print( node->qualifiers );
@@ -685 +678 @@
         }
 
-        virtual const ast::Stmt * visit( const ast::SuspendStmt * node ) override final {
-                os << "Suspend Statement";
-                switch (node->type) {
-                        case ast::SuspendStmt::None     : os << " with implicit target"; break;
-                        case ast::SuspendStmt::Generator: os << " for generator"; break;
-                        case ast::SuspendStmt::Coroutine: os << " for coroutine"; break;
-                }
-                os << endl;
-
-                ++indent;
-                if(node->then) {
-                        os << indent << " with post statement :" << endl;
-                        safe_print( node->then );
-                }
-                ++indent;
-
-                return node;
-        }
-
         virtual const ast::Stmt * visit( const ast::WaitForStmt * node ) override final {
                 os << "Waitfor Statement" << endl;
@@ -849 +823 @@
         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:";
@@ -1384 +1358 @@
         virtual const ast::Type * visit( const ast::TypeInstType * node ) override final {
                 preprint( node );
-                const auto & _name = deterministic_output && isUnboundType(node) ? "[unbound]" : node->typeString();
-                os << "instance of type " << _name
+                os << "instance of type " << node->name
                    << " (" << (node->kind == ast::TypeDecl::Ftype ? "" : "not ") << "function type)";
                 print( node->params );
@@ -1511 +1484 @@
                 os << indent << "Types:" << endl;
                 for ( const auto& i : *node ) {
-                        os << indent+1 << i.first.typeString() << " -> ";
+                        os << indent+1 << i.first << " -> ";
                         indent += 2;
                         safe_print( i.second );
+                        indent -= 2;
+                        os << endl;
+                }
+                os << indent << "Non-types:" << endl;
+                for ( auto i = node->beginVar(); i != node->endVar(); ++i ) {
+                        os << indent+1 << i->first << " -> ";
+                        indent += 2;
+                        safe_print( i->second );
                         indent -= 2;
                         os << endl;