Changes in src/AST/Print.cpp [c86b08d:561354f]

File:

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

src/AST/Print.cpp

@@ -208 +208 @@
         }
 
-    void print( const ast::WaitStmt * node ) {
-                if ( node->timeout_time ) {
-                        os << indent-1 << "timeout of:" << endl;
-                        node->timeout_time->accept( *this );
-
-                        if ( node->timeout_stmt ) {
-                                os << indent-1 << "... with statment:" << endl;
-                                node->timeout_stmt->accept( *this );
-                        }
-
-                        if ( node->timeout_cond ) {
-                                os << indent-1 << "... with condition:" << endl;
-                                node->timeout_cond->accept( *this );
-                        }
-                }
-
-                if ( node->else_stmt ) {
-                        os << indent-1 << "else:" << endl;
-                        node->else_stmt->accept( *this );
-
-                        if ( node->else_cond ) {
-                                os << indent-1 << "... with condition:" << endl;
-                                node->else_cond->accept( *this );
-                        }
-                }
-        }
-
         void preprint( const ast::NamedTypeDecl * node ) {
                 if ( ! node->name.empty() ) {
@@ -434 +407 @@
 
         virtual const ast::Decl * visit( const ast::EnumDecl * node ) override final {
+                print(node);
+                return node;
+        }
+
+        virtual const ast::Decl * visit( const ast::AdtDecl * node ) override final {
                 print(node);
                 return node;
@@ -766 +744 @@
         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;
+                switch (node->kind) {
+                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;
@@ -779 +757 @@
                 }
                 ++indent;
-
-                return node;
-        }
-
-        virtual const ast::WhenClause * visit( const ast::WhenClause * node ) override final {
-                os << indent-1 << "target: ";
-                safe_print( node->target );
-
-                if ( node->stmt ) {
-                        os << indent-1 << "... with statment:" << endl;
-                        node->stmt->accept( *this );
-                }
-
-                if ( node->when_cond ) {
-                        os << indent-1 << "... with when condition:" << endl;
-                        node->when_cond->accept( *this );
-                }
 
                 return node;
@@ -837 +798 @@
         virtual const ast::WaitForClause * visit( const ast::WaitForClause * node ) override final {
                 os << indent-1 << "target function: ";
-                safe_print( node->target );
+                safe_print( node->target_func );
 
                 if ( !node->target_args.empty() ) {
@@ -851 +812 @@
                 }
 
-                if ( node->when_cond ) {
+                if ( node->cond ) {
                         os << indent-1 << "... with condition:" << endl;
-                        node->when_cond->accept( *this );
-                }
-
-                return node;
-        }
-
-    virtual const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final {
-                os << "Waituntil Statement" << endl;
-                indent += 2;
-                for( const auto & clause : node->clauses ) {
-                        clause->accept( *this );
-                }
-        print(node);    // calls print( const ast::WaitStmt * node )
+                        node->cond->accept( *this );
+                }
+
                 return node;
         }