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

File:

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

src/SynTree/Statement.cc

@@ -100 +100 @@
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.empty() ) {
-                throw SemanticError("goto without target");
+                throw SemanticError( target.get_statement()->location, "goto without target");
         }
 }
@@ -107 +107 @@
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
-                throw SemanticError("Computed target not valid in branch statement");
+                throw SemanticError( computedTarget->location, "Computed target not valid in branch statement");
         }
 }
@@ -203 +203 @@
 CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticError ) :
         Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
-        if ( isDefault() && condition != 0 ) throw SemanticError("default case with condition: ", condition);
+        if ( isDefault() && condition != 0 ) throw SemanticError( condition, "default case with condition: " );
 }
 
@@ -456 +456 @@
 }
 
+
+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 statement:" << endl << indent+1;
+        stmt->print( os, indent+1 );
+}
+
+
 NullStmt::NullStmt( const std::list<Label> & labels ) : Statement( labels ) {
 }