Changeset c13e8dc8 for src/Parser/ParseNode.h

Timestamp:

Dec 5, 2017, 2:35:03 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f9feab8

Parents:

9c35431 (diff), 65197c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• src/Parser/ParseNode.h (modified) (5 diffs)

src/Parser/ParseNode.h

@@ -69 +69 @@
 
         virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
-        virtual void printList( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
+        virtual void printList( std::ostream &os, int indent = 0 ) const {
+                print( os, indent );
+                if ( next ) next->print( os, indent );
+        }
 
         static int indent_by;
@@ -120 +123 @@
         ExpressionNode * set_extension( bool exten ) { extension = exten; return this; }
 
-        virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {}
+        virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
+                os << expr.get() << std::endl;
+        }
         void printOneLine( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const {}
 
@@ -257 +262 @@
         DeclarationNode * addBitfield( ExpressionNode * size );
         DeclarationNode * addVarArgs();
-        DeclarationNode * addFunctionBody( StatementNode * body );
+        DeclarationNode * addFunctionBody( StatementNode * body, StatementNode * with = nullptr );
         DeclarationNode * addOldDeclList( DeclarationNode * list );
         DeclarationNode * setBase( TypeData * newType );
@@ -359 +364 @@
         virtual StatementNode * append_last_case( StatementNode * );
 
-        virtual void print( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {}
-        virtual void printList( __attribute__((unused)) std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {}
+        virtual void print( std::ostream &os, __attribute__((unused)) int indent = 0 ) const override {
+                os << stmt.get() << std::endl;
+        }
   private:
         std::unique_ptr<Statement> stmt;
@@ -408 +414 @@
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when, StatementNode * else_stmt, ExpressionNode * else_when );
+WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt );
 
 //##############################################################################