Changeset 90152a4 for src/SynTree/Statement.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 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:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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/SynTree/Statement.cc (modified) (8 diffs)

src/SynTree/Statement.cc

@@ -34 +34 @@
 Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
 
-void Statement::print( std::ostream & os, Indenter ) const {
+void Statement::print( std::ostream & os, Indenter indent ) const {
         if ( ! labels.empty() ) {
-                os << "Labels: {";
+                os << indent << "... Labels: {";
                 for ( const Label & l : labels ) {
                         os << l << ",";
@@ -94 +94 @@
 
 
+DirectiveStmt::DirectiveStmt( const std::string & directive ) : Statement(), directive( directive ) {}
+
+void DirectiveStmt::print( std::ostream &os, Indenter ) const {
+        os << "GCC Directive:" << directive << endl;
+}
+
+
 const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 
-BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticError ) :
+BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticErrorException ) :
         Statement(), originalTarget( target ), target( target ), computedTarget( nullptr ), type( type ) {
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.empty() ) {
-                throw SemanticError("goto without target");
-        }
-}
-
-BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticError ) :
+                SemanticError( target.get_statement()->location, "goto without target");
+        }
+}
+
+BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticErrorException ) :
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
-                throw SemanticError("Computed target not valid in branch statement");
+                SemanticError( computedTarget->location, "Computed target not valid in branch statement");
         }
 }
@@ -201 +208 @@
 }
 
-CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticError ) :
+CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticErrorException ) :
         Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
-        if ( isDefault() && condition != 0 ) throw SemanticError("default case with condition: ", condition);
+        if ( isDefault() && condition != 0 ) SemanticError( condition, "default case with condition: " );
 }
 
@@ -223 +230 @@
 
 void CaseStmt::print( std::ostream &os, Indenter indent ) const {
-        if ( isDefault() ) os << "Default ";
+        if ( isDefault() ) os << indent << "Default ";
         else {
-                os << "Case ";
+                os << indent << "Case ";
                 condition->print( os, indent );
         } // if
@@ -231 +238 @@
 
         for ( Statement * stmt : stmts ) {
+                os << indent+1;
                 stmt->print( os, indent+1 );
         }
 }
 
-WhileStmt::WhileStmt( Expression *condition, Statement *body, bool isDoWhile ):
-        Statement(), condition( condition), body( body), isDoWhile( isDoWhile) {
+WhileStmt::WhileStmt( Expression *condition, Statement *body, std::list< Statement * > & initialization, bool isDoWhile ):
+        Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
 }
 
@@ -452 +460 @@
 void WaitForStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Waitfor Statement" << endl;
-        os << indent << "... with block:" << endl << indent+1;
-        // block->print( os, indent + 4 );
+        indent += 1;
+        for( auto & clause : clauses ) {
+                os << indent << "target function :";
+                if(clause.target.function) { clause.target.function->print(os, indent + 1); }
+                os << endl << indent << "with arguments :" << endl;
+                for( auto & thing : clause.target.arguments) {
+                        if(thing) { thing->print(os, indent + 1); }
+                }
+                os << indent << " with statment :" << endl;
+                if(clause.statement) { clause.statement->print(os, indent + 1); }
+
+                os << indent << " with condition :" << endl;
+                if(clause.condition) { clause.condition->print(os, indent + 1); }
+        }
+
+        os << indent << " timeout of :" << endl;
+        if(timeout.time) { timeout.time->print(os, indent + 1); }
+
+        os << indent << " with statment :" << endl;
+        if(timeout.statement) { timeout.statement->print(os, indent + 1); }
+
+        os << indent << " with condition :" << endl;
+        if(timeout.condition) { timeout.condition->print(os, indent + 1); }
+
+
+        os << indent << " else :" << endl;
+        if(orelse.statement) { orelse.statement->print(os, indent + 1); }
+
+        os << indent << " with condition :" << endl;
+        if(orelse.condition) { orelse.condition->print(os, indent + 1); }
 }
 
@@ -468 +504 @@
 void WithStmt::print( std::ostream & os, Indenter indent ) const {
         os << "With statement" << endl;
+        os << indent << "... with expressions: " << endl;
+        printAll( exprs, os, indent+1 );
         os << indent << "... with statement:" << endl << indent+1;
         stmt->print( os, indent+1 );
@@ -476 +514 @@
 }
 
-void NullStmt::print( std::ostream &os, Indenter ) const {
+void NullStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Null Statement" << endl;
+        Statement::print( os, indent );
 }