Changes in src/AST/Print.cpp [f6e6a55:4ec9513]

File:

• src/AST/Print.cpp (modified) (1 diff)

src/AST/Print.cpp

@@ -760 +760 @@
                 indent += 2;
                 for( const auto & clause : node->clauses ) {
-                        clause->accept( *this );
-                }
-
-                if ( node->timeout_time ) {
+                        os << indent-1 << "target function: ";
+                        safe_print( clause.target.func );
+
+                        if ( ! clause.target.args.empty() ) {
+                                os << endl << indent-1 << "... with arguments:" << endl;
+                                for( const ast::Expr * arg : clause.target.args ) {
+                                        arg->accept( *this );
+                                }
+                        }
+
+                        if ( clause.stmt ) {
+                                os << indent-1 << "... with statment:" << endl;
+                                clause.stmt->accept( *this );
+                        }
+
+                        if ( clause.cond ) {
+                                os << indent-1 << "... with condition:" << endl;
+                                clause.cond->accept( *this );
+                        }
+                }
+
+                if ( node->timeout.time ) {
                         os << indent-1 << "timeout of:" << endl;
-                        node->timeout_time->accept( *this );
-
-                        if ( node->timeout_stmt ) {
+                        node->timeout.time->accept( *this );
+
+                        if ( node->timeout.stmt ) {
                                 os << indent-1 << "... with statment:" << endl;
-                                node->timeout_stmt->accept( *this );
-                        }
-
-                        if ( node->timeout_cond ) {
+                                node->timeout.stmt->accept( *this );
+                        }
+
+                        if ( node->timeout.cond ) {
                                 os << indent-1 << "... with condition:" << endl;
-                                node->timeout_cond->accept( *this );
-                        }
-                }
-
-                if ( node->else_stmt ) {
+                                node->timeout.cond->accept( *this );
+                        }
+                }
+
+                if ( node->orElse.stmt ) {
                         os << indent-1 << "else:" << endl;
-                        node->else_stmt->accept( *this );
-
-                        if ( node->else_cond ) {
+                        node->orElse.stmt->accept( *this );
+
+                        if ( node->orElse.cond ) {
                                 os << indent-1 << "... with condition:" << endl;
-                                node->else_cond->accept( *this );
-                        }
-                }
-
-                return node;
-        }
-
-        virtual const ast::WaitForClause * visit( const ast::WaitForClause * node ) override final {
-                os << indent-1 << "target function: ";
-                safe_print( node->target_func );
-
-                if ( !node->target_args.empty() ) {
-                        os << endl << indent-1 << "... with arguments:" << endl;
-                        for( const ast::Expr * arg : node->target_args ) {
-                                arg->accept( *this );
-                        }
-                }
-
-                if ( node->stmt ) {
-                        os << indent-1 << "... with statment:" << endl;
-                        node->stmt->accept( *this );
-                }
-
-                if ( node->cond ) {
-                        os << indent-1 << "... with condition:" << endl;
-                        node->cond->accept( *this );
-                }
+                                node->orElse.cond->accept( *this );
+                        }
+                }
+                indent -= 2;
 
                 return node;