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

File:

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

src/AST/Print.cpp

@@ -146 +146 @@
         }
 
-        void print( const ast::FunctionType::ForallList & forall ) {
+        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;
@@ -215 +206 @@
         void preprint( const ast::NamedTypeDecl * node ) {
                 if ( ! node->name.empty() ) {
-                        os << node->name << ": ";
+                        if( deterministic_output && isUnboundType(node->name) ) os << "[unbound]:";
+                        else os << node->name << ": ";
                 }
 
@@ -232 +224 @@
                 }
 
+                if ( ! node->params.empty() ) {
+                        os << endl << indent << "... with parameters" << endl;
+                        ++indent;
+                        printAll( node->params );
+                        --indent;
+                }
+
                 if ( ! node->assertions.empty() ) {
                         os << endl << indent << "... with assertions" << endl;
@@ -267 +266 @@
         }
 
-        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 ) {
+                print( node->forall );
                 print( node->attributes );
                 print( node->qualifiers );
@@ -1384 +1383 @@
         virtual const ast::Type * visit( const ast::TypeInstType * node ) override final {
                 preprint( node );
-                const auto & _name = deterministic_output && isUnboundType(node) ? "[unbound]" : node->typeString();
+                const auto & _name = deterministic_output && isUnboundType(node) ? "[unbound]" : node->name;
                 os << "instance of type " << _name
                    << " (" << (node->kind == ast::TypeDecl::Ftype ? "" : "not ") << "function type)";
@@ -1511 +1510 @@
                 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;