Changes in src/SynTree/Statement.cc [ee3c93d:ba3706f]

File:

• src/SynTree/Statement.cc (modified) (6 diffs)

src/SynTree/Statement.cc

@@ -34 +34 @@
 Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
 
-void Statement::print( std::ostream & os, Indenter indent ) const {
+void Statement::print( std::ostream & os, Indenter ) const {
         if ( ! labels.empty() ) {
-                os << indent << "... Labels: {";
+                os << "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 ( SemanticErrorException ) :
+BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticError ) :
         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() ) {
-                SemanticError( target.get_statement()->location, "goto without target");
-        }
-}
-
-BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticErrorException ) :
+                throw SemanticError("goto without target");
+        }
+}
+
+BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticError ) :
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
-                SemanticError( computedTarget->location, "Computed target not valid in branch statement");
+                throw SemanticError("Computed target not valid in branch statement");
         }
 }
@@ -208 +201 @@
 }
 
-CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticErrorException ) :
+CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticError ) :
         Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
-        if ( isDefault() && condition != 0 ) SemanticError( condition, "default case with condition: " );
+        if ( isDefault() && condition != 0 ) throw SemanticError("default case with condition: ", condition);
 }
 
@@ -230 +223 @@
 
 void CaseStmt::print( std::ostream &os, Indenter indent ) const {
-        if ( isDefault() ) os << indent << "Default ";
+        if ( isDefault() ) os << "Default ";
         else {
-                os << indent << "Case ";
+                os << "Case ";
                 condition->print( os, indent );
         } // if
@@ -238 +231 @@
 
         for ( Statement * stmt : stmts ) {
-                os << indent+1;
                 stmt->print( os, indent+1 );
         }
 }
 
-WhileStmt::WhileStmt( Expression *condition, Statement *body, std::list< Statement * > & initialization, bool isDoWhile ):
-        Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
+WhileStmt::WhileStmt( Expression *condition, Statement *body, bool isDoWhile ):
+        Statement(), condition( condition), body( body), isDoWhile( isDoWhile) {
 }
 
@@ -460 +452 @@
 void WaitForStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Waitfor Statement" << endl;
-        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); }
-}
-
-
-WithStmt::WithStmt( const std::list< Expression * > & exprs, Statement * stmt ) : Statement(), exprs( exprs ), stmt( stmt ) {}
-WithStmt::WithStmt( const WithStmt & other ) : Statement( other ), stmt( maybeClone( other.stmt ) ) {
-        cloneAll( other.exprs, exprs );
-}
-WithStmt::~WithStmt() {
-        deleteAll( exprs );
-        delete stmt;
-}
-
-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 );
-}
-
+        os << indent << "... with block:" << endl << indent+1;
+        // block->print( os, indent + 4 );
+}
 
 NullStmt::NullStmt( const std::list<Label> & labels ) : Statement( labels ) {
 }
 
-void NullStmt::print( std::ostream &os, Indenter indent ) const {
+void NullStmt::print( std::ostream &os, Indenter ) const {
         os << "Null Statement" << endl;
-        Statement::print( os, indent );
 }