Changeset 6180274

Timestamp:

Feb 2, 2022, 9:25:37 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

9dc08363

Parents:

4e7171f

Message:

more cleanup, make more function parameters const, remove more std::

Location:

src

Files:

• AST/Stmt.cpp (modified) (2 diffs)
• AST/Stmt.hpp (modified) (20 diffs)
• CodeGen/CodeGenerator.cc (modified) (2 diffs)
• ControlStruct/MLEMutator.cc (modified) (3 diffs)
• ControlStruct/MultiLevelExit.cpp (modified) (3 diffs)
• Parser/StatementNode.cc (modified) (2 diffs)
• SynTree/Statement.cc (modified) (26 diffs)
• SynTree/Statement.h (modified) (7 diffs)

src/AST/Stmt.cpp ¶

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed May  8 13:00:00 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed May 15 15:53:00 2019
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Feb  2 19:01:20 2022
+// Update Count     : 3
 //
 
@@ -56 +56 @@
 
 // --- BranchStmt
-BranchStmt::BranchStmt( const CodeLocation& loc, Kind kind, Label target, std::vector<Label>&& labels )
-: Stmt(loc, std::move(labels)), originalTarget(target), target(target), kind(kind) {
+BranchStmt::BranchStmt( const CodeLocation& loc, Kind kind, Label target, const std::vector<Label>&& labels )
+                : Stmt(loc, std::move(labels)), originalTarget(target), target(target), kind(kind) {
         // Make sure a syntax error hasn't slipped through.
         assert( Goto != kind || !target.empty() );

src/AST/Stmt.hpp ¶

@@ -10 +10 @@
 // Created On       : Wed May  8 13:00:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 17:44:46 2022
-// Update Count     : 24
+// Last Modified On : Wed Feb  2 20:06:41 2022
+// Update Count     : 34
 //
 
@@ -39 +39 @@
         std::vector<Label> labels;
 
-        Stmt( const CodeLocation & loc, std::vector<Label> && labels = {} )
+        Stmt( const CodeLocation & loc, const std::vector<Label> && labels = {} )
                 : ParseNode(loc), labels(std::move(labels)) {}
 
@@ -55 +55 @@
         std::list<ptr<Stmt>> kids;
 
-        CompoundStmt(const CodeLocation & loc, std::list<ptr<Stmt>> && ks = {},
-                                 std::vector<Label> && labels = {} )
+        CompoundStmt(const CodeLocation & loc, const std::list<ptr<Stmt>> && ks = {}, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), kids(std::move(ks)) {}
 
@@ -74 +73 @@
 class NullStmt final : public Stmt {
   public:
-        NullStmt( const CodeLocation & loc, std::vector<Label> && labels = {} )
+        NullStmt( const CodeLocation & loc, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)) {}
 
@@ -88 +87 @@
         ptr<Expr> expr;
 
-        ExprStmt( const CodeLocation & loc, const Expr* e, std::vector<Label> && labels = {} )
+        ExprStmt( const CodeLocation & loc, const Expr* e, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), expr(e) {}
 
@@ -107 +106 @@
 
         AsmStmt( const CodeLocation & loc, bool isVolatile, const Expr * instruction,
-                         std::vector<ptr<Expr>> && output, std::vector<ptr<Expr>> && input,
-                         std::vector<ptr<ConstantExpr>> && clobber, std::vector<Label> && gotoLabels,
-                         std::vector<Label> && labels = {})
+                         const std::vector<ptr<Expr>> && output, const std::vector<ptr<Expr>> && input,
+                         const std::vector<ptr<ConstantExpr>> && clobber, const std::vector<Label> && gotoLabels,
+                         const std::vector<Label> && labels = {})
                 : Stmt(loc, std::move(labels)), isVolatile(isVolatile), instruction(instruction),
                   output(std::move(output)), input(std::move(input)), clobber(std::move(clobber)),
@@ -144 +143 @@
 
         IfStmt( const CodeLocation & loc, const Expr * cond, const Stmt * then,
-                        const Stmt * else_ = nullptr, std::vector<ptr<Stmt>> && inits = {},
-                        std::vector<Label> && labels = {} )
+                        const Stmt * else_ = nullptr, const std::vector<ptr<Stmt>> && inits = {},
+                        const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), cond(cond), then(then), else_(else_),
                   inits(std::move(inits)) {}
@@ -161 +160 @@
         std::vector<ptr<Stmt>> stmts;
 
-        SwitchStmt( const CodeLocation & loc, const Expr * cond, std::vector<ptr<Stmt>> && stmts,
-                                std::vector<Label> && labels = {} )
+        SwitchStmt( const CodeLocation & loc, const Expr * cond, const std::vector<ptr<Stmt>> && stmts,
+                                const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), cond(cond), stmts(std::move(stmts)) {}
 
@@ -178 +177 @@
         std::vector<ptr<Stmt>> stmts;
 
-        CaseStmt( const CodeLocation & loc, const Expr * cond, std::vector<ptr<Stmt>> && stmts,
-                          std::vector<Label> && labels = {} )
+        CaseStmt( const CodeLocation & loc, const Expr * cond, const std::vector<ptr<Stmt>> && stmts,
+                          const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), cond(cond), stmts(std::move(stmts)) {}
 
@@ -200 +199 @@
 
         WhileDoStmt( const CodeLocation & loc, const Expr * cond, const Stmt * body,
-                           std::vector<ptr<Stmt>> && inits, bool isDoWhile = false, std::vector<Label> && labels = {} )
+                                 const std::vector<ptr<Stmt>> && inits, bool isDoWhile = false, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), cond(cond), body(body), else_(nullptr), inits(std::move(inits)), isDoWhile(isDoWhile) {}
 
         WhileDoStmt( const CodeLocation & loc, const Expr * cond, const Stmt * body, const Stmt * else_,
-                           std::vector<ptr<Stmt>> && inits, bool isDoWhile = false, std::vector<Label> && labels = {} )
+                                 const std::vector<ptr<Stmt>> && inits, bool isDoWhile = false, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), cond(cond), body(body), else_(else_), inits(std::move(inits)), isDoWhile(isDoWhile) {}
 
@@ -222 +221 @@
         ptr<Stmt> else_;
 
-        ForStmt( const CodeLocation & loc, std::vector<ptr<Stmt>> && inits, const Expr * cond,
-                         const Expr * inc, const Stmt * body, std::vector<Label> && label = {} )
+        ForStmt( const CodeLocation & loc, const std::vector<ptr<Stmt>> && inits, const Expr * cond,
+                         const Expr * inc, const Stmt * body, const std::vector<Label> && label = {} )
                 : Stmt(loc, std::move(label)), inits(std::move(inits)), cond(cond), inc(inc), body(body), else_(nullptr) {}
 
-        ForStmt( const CodeLocation & loc, std::vector<ptr<Stmt>> && inits, const Expr * cond,
-                         const Expr * inc, const Stmt * body, const Stmt * else_, std::vector<Label> && labels = {} )
+        ForStmt( const CodeLocation & loc, const std::vector<ptr<Stmt>> && inits, const Expr * cond,
+                         const Expr * inc, const Stmt * body, const Stmt * else_, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), inits(std::move(inits)), cond(cond), inc(inc), body(body), else_(else_) {}
 
@@ -247 +246 @@
         Kind kind;
 
-        BranchStmt( const CodeLocation & loc, Kind kind, Label target,
-                                std::vector<Label> && labels = {} );
-        BranchStmt( const CodeLocation & loc, const Expr * computedTarget,
-                                std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), originalTarget(loc), target(loc),
-                  computedTarget(computedTarget), kind(Goto) {}
+        BranchStmt( const CodeLocation & loc, Kind kind, Label target, const std::vector<Label> && labels = {} );
+        BranchStmt( const CodeLocation & loc, const Expr * computedTarget, const std::vector<Label> && labels = {} )
+                : Stmt(loc, std::move(labels)), originalTarget(loc), target(loc), computedTarget(computedTarget), kind(Goto) {}
 
         const char * kindName() const { return kindNames[kind]; }
@@ -269 +265 @@
         ptr<Expr> expr;
 
-        ReturnStmt( const CodeLocation & loc, const Expr * expr, std::vector<Label> && labels = {} )
+        ReturnStmt( const CodeLocation & loc, const Expr * expr, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), expr(expr) {}
 
@@ -288 +284 @@
         ExceptionKind kind;
 
-        ThrowStmt(
-                const CodeLocation & loc, ExceptionKind kind, const Expr * expr, const Expr * target,
-                std::vector<Label> && labels = {} )
+        ThrowStmt( const CodeLocation & loc, ExceptionKind kind, const Expr * expr,
+                           const Expr * target, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), expr(expr), target(target), kind(kind) {}
 
@@ -306 +301 @@
         ptr<FinallyStmt> finally;
 
-        TryStmt(
-                const CodeLocation & loc, const CompoundStmt * body,
-                std::vector<ptr<CatchStmt>> && handlers, const FinallyStmt * finally,
-                std::vector<Label> && labels = {} )
+        TryStmt( const CodeLocation & loc, const CompoundStmt * body,
+                         const std::vector<ptr<CatchStmt>> && handlers, const FinallyStmt * finally,
+                         const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), body(body), handlers(std::move(handlers)), finally(finally) {}
 
@@ -326 +320 @@
         ExceptionKind kind;
 
-        CatchStmt(
-                const CodeLocation & loc, ExceptionKind kind, const Decl * decl, const Expr * cond,
-                const Stmt * body, std::vector<Label> && labels = {} )
+        CatchStmt( const CodeLocation & loc, ExceptionKind kind, const Decl * decl, const Expr * cond,
+                           const Stmt * body, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), decl(decl), cond(cond), body(body), kind(kind) {}
 
@@ -358 +351 @@
         enum Type { None, Coroutine, Generator } type = None;
 
-        SuspendStmt( const CodeLocation & loc, const CompoundStmt * then, Type type, std::vector<Label> && labels = {} )
+        SuspendStmt( const CodeLocation & loc, const CompoundStmt * then, Type type, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), then(then), type(type) {}
 
@@ -396 +389 @@
         OrElse orElse;
 
-        WaitForStmt( const CodeLocation & loc, std::vector<Label> && labels = {} )
+        WaitForStmt( const CodeLocation & loc, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)) {}
 
@@ -410 +403 @@
         ptr<Decl> decl;
 
-        DeclStmt( const CodeLocation & loc, const Decl * decl, std::vector<Label> && labels = {} )
+        DeclStmt( const CodeLocation & loc, const Decl * decl, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), decl(decl) {}
 
@@ -441 +434 @@
 
         MutexStmt( const CodeLocation & loc, const Stmt * stmt, 
-                           std::vector<ptr<Expr>> && mutexes, std::vector<Label> && labels = {} )
+                           const std::vector<ptr<Expr>> && mutexes, const std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), stmt(stmt), mutexObjs(std::move(mutexes)) {}
 

src/CodeGen/CodeGenerator.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 16:29:25 2022
-// Update Count     : 540
+// Last Modified On : Wed Feb  2 20:30:30 2022
+// Update Count     : 541
 //
 #include "CodeGenerator.h"
@@ -1020 +1020 @@
                         output << "fallthru";
                         break;
+                  default: ;                                                                    // prevent warning
                 } // switch
                 // print branch target for labelled break/continue/fallthru in debug mode

src/ControlStruct/MLEMutator.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 09:26:28 2022
-// Update Count     : 225
+// Last Modified On : Wed Feb  2 20:18:57 2022
+// Update Count     : 227
 //
 
@@ -136 +136 @@
                         }
                 }
-                assertf( false, "Could not find label '%s' on statement %s",
+                assertf( false, "CFA internal error: could not find label '%s' on statement %s",
                         originalTarget.get_name().c_str(), toString( stmt ).c_str() );
         }
@@ -395 +395 @@
                 }
                 assert( ! enclosingControlStructures.empty() );
-                assertf( dynamic_cast<SwitchStmt *>( enclosingControlStructures.back().get_controlStructure() ), "Control structure enclosing a case clause must be a switch, but is: %s", toCString( enclosingControlStructures.back().get_controlStructure() ) );
+                assertf( dynamic_cast<SwitchStmt *>( enclosingControlStructures.back().get_controlStructure() ),
+                                 "CFA internal error: control structure enclosing a case clause must be a switch, but is: %s",
+                                 toCString( enclosingControlStructures.back().get_controlStructure() ) );
                 if ( caseStmt->isDefault() ) {
                         if ( enclosingControlStructures.back().isFallDefaultUsed() ) {

src/ControlStruct/MultiLevelExit.cpp ¶

@@ -10 +10 @@
 // Created On       : Mon Nov  1 13:48:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 18:48:47 2022
-// Update Count     : 29
+// Last Modified On : Wed Feb  2 20:19:24 2022
+// Update Count     : 30
 //
 
@@ -206 +206 @@
                 }
         }
-        assertf( false, "Could not find label '%s' on statement %s",
+        assertf( false, "CFA internal error: could not find label '%s' on statement %s",
                          originalTarget.name.c_str(), toString( stmt ).c_str() );
 }
@@ -406 +406 @@
         Entry & entry = enclosing_control_structures.back();
         assertf( dynamic_cast< const SwitchStmt * >( entry.stmt ),
-                         "Control structure enclosing a case clause must be a switch, but is: %s",
+                         "CFA internal error: control structure enclosing a case clause must be a switch, but is: %s",
                          toString( entry.stmt ).c_str() );
         if ( mutStmt->isDefault() ) {

src/Parser/StatementNode.cc ¶

@@ -11 +11 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 12:27:58 2022
-// Update Count     : 424
+// Last Modified On : Wed Feb  2 20:29:30 2022
+// Update Count     : 425
 //
 
@@ -138 +138 @@
 
 Statement * build_case( ExpressionNode * ctl ) {
-        return new CaseStmt( maybeMoveBuild< Expression >(ctl), {} ); // no init
+        return new CaseStmt( maybeMoveBuild< Expression >(ctl), {} ); // stmt starts empty and then added to
 } // build_case
 
 Statement * build_default() {
-        return new CaseStmt( nullptr, {}, true );                       // no init
+        return new CaseStmt( nullptr, {}, true );                       // stmt starts empty and then added to
 } // build_default
 

src/SynTree/Statement.cc ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 11:55:19 2022
-// Update Count     : 80
+// Last Modified On : Wed Feb  2 20:19:33 2022
+// Update Count     : 90
 //
 
@@ -29 +29 @@
 #include "SynTree/Label.h"         // for Label, operator<<
 
-using std::string;
-using std::endl;
-
-Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
-
-void Statement::print( std::ostream & os, Indenter indent ) const {
+using namespace std;
+
+
+Statement::Statement( const list<Label> & labels ) : labels( labels ) {}
+
+void Statement::print( ostream & os, Indenter indent ) const {
         if ( ! labels.empty() ) {
                 os << indent << "... Labels: {";
@@ -54 +54 @@
 }
 
-void ExprStmt::print( std::ostream & os, Indenter indent ) const {
-        os << "Expression Statement:" << endl << indent+1;
-        expr->print( os, indent+1 );
-}
-
-
-AsmStmt::AsmStmt( bool voltile, Expression * instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels ) : Statement(), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
+void ExprStmt::print( ostream & os, Indenter indent ) const {
+        os << "Expression Statement:" << endl << indent + 1;
+        expr->print( os, indent + 1 );
+}
+
+
+AsmStmt::AsmStmt( bool voltile, Expression * instruction, const list<Expression *> output, const list<Expression *> input, const list<ConstantExpr *> clobber, const list<Label> gotolabels ) : Statement(), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ), gotolabels( gotolabels ) {}
 
 AsmStmt::AsmStmt( const AsmStmt & other ) : Statement( other ), voltile( other.voltile ), instruction( maybeClone( other.instruction ) ), gotolabels( other.gotolabels ) {
@@ -75 +75 @@
 }
 
-void AsmStmt::print( std::ostream & os, Indenter indent ) const {
+void AsmStmt::print( ostream & os, Indenter indent ) const {
         os << "Assembler Statement:" << endl;
-        os << indent+1 << "instruction: " << endl << indent;
-        instruction->print( os, indent+1 );
+        os << indent + 1 << "instruction: " << endl << indent;
+        instruction->print( os, indent + 1 );
         if ( ! output.empty() ) {
-                os << endl << indent+1 << "output: " << endl;
-                printAll( output, os, indent+1 );
+                os << endl << indent + 1 << "output: " << endl;
+                printAll( output, os, indent + 1 );
         } // if
         if ( ! input.empty() ) {
-                os << indent+1 << "input: " << endl;
-                printAll( input, os, indent+1 );
+                os << indent + 1 << "input: " << endl;
+                printAll( input, os, indent + 1 );
         } // if
         if ( ! clobber.empty() ) {
-                os << indent+1 << "clobber: " << endl;
-                printAll( clobber, os, indent+1 );
+                os << indent + 1 << "clobber: " << endl;
+                printAll( clobber, os, indent + 1 );
         } // if
 }
 
 
-DirectiveStmt::DirectiveStmt( const std::string & directive ) : Statement(), directive( directive ) {}
-
-void DirectiveStmt::print( std::ostream & os, Indenter ) const {
+DirectiveStmt::DirectiveStmt( const string & directive ) : Statement(), directive( directive ) {}
+
+void DirectiveStmt::print( ostream & os, Indenter ) const {
         os << "GCC Directive:" << directive << endl;
 }
@@ -120 +120 @@
 }
 
-void BranchStmt::print( std::ostream & os, Indenter indent ) const {
-        assert(type < 5);
+void BranchStmt::print( ostream & os, Indenter indent ) const {
+        assertf(type < BranchStmts, "CFA internal error: invalid branch statement" );
         os << "Branch (" << brType[type] << ")" << endl ;
-        if ( target != "" ) os << indent+1 << "with target: " << target << endl;
-        if ( originalTarget != "" ) os << indent+1 << "with original target: " << originalTarget << endl;
-        if ( computedTarget != nullptr ) os << indent+1 << "with computed target: " << computedTarget << endl;
+        if ( target != "" ) os << indent + 1 << "with target: " << target << endl;
+        if ( originalTarget != "" ) os << indent + 1 << "with original target: " << originalTarget << endl;
+        if ( computedTarget != nullptr ) os << indent + 1 << "with computed target: " << computedTarget << endl;
 }
 
@@ -136 +136 @@
 }
 
-void ReturnStmt::print( std::ostream & os, Indenter indent ) const {
+void ReturnStmt::print( ostream & os, Indenter indent ) const {
         os << "Return Statement, returning: ";
         if ( expr != nullptr ) {
-                os << endl << indent+1;
-                expr->print( os, indent+1 );
+                os << endl << indent + 1;
+                expr->print( os, indent + 1 );
         }
         os << endl;
 }
 
-IfStmt::IfStmt( Expression * condition, Statement * then, Statement * else_, std::list<Statement *> initialization ):
+IfStmt::IfStmt( Expression * condition, Statement * then, Statement * else_, const list<Statement *> initialization ):
         Statement(), condition( condition ), then( then ), else_( else_ ), initialization( initialization ) {}
 
@@ -160 +160 @@
 }
 
-void IfStmt::print( std::ostream & os, Indenter indent ) const {
+void IfStmt::print( ostream & os, Indenter indent ) const {
         os << "If on condition: " << endl;
-        os << indent+1;
-        condition->print( os, indent+1 );
+        os << indent + 1;
+        condition->print( os, indent + 1 );
 
         if ( !initialization.empty() ) {
                 os << indent << "... with initialization: \n";
                 for ( const Statement * stmt : initialization ) {
-                        os << indent+1;
-                        stmt->print( os, indent+1 );
+                        os << indent + 1;
+                        stmt->print( os, indent + 1 );
                 }
                 os << endl;
@@ -176 +176 @@
         os << indent << "... then: " << endl;
 
-        os << indent+1;
-        then->print( os, indent+1 );
+        os << indent + 1;
+        then->print( os, indent + 1 );
 
         if ( else_ != nullptr ) {
                 os << indent << "... else: " << endl;
-                os << indent+1;
-                else_->print( os, indent+1 );
+                os << indent + 1;
+                else_->print( os, indent + 1 );
         } // if
 }
 
-SwitchStmt::SwitchStmt( Expression * condition, const std::list<Statement *> & statements ):
+SwitchStmt::SwitchStmt( Expression * condition, const list<Statement *> & statements ):
         Statement(), condition( condition ), statements( statements ) {
 }
@@ -201 +201 @@
 }
 
-void SwitchStmt::print( std::ostream & os, Indenter indent ) const {
+void SwitchStmt::print( ostream & os, Indenter indent ) const {
         os << "Switch on condition: ";
         condition->print( os );
@@ -207 +207 @@
 
         for ( const Statement * stmt : statements ) {
-                stmt->print( os, indent+1 );
-        }
-}
-
-CaseStmt::CaseStmt( Expression * condition, const std::list<Statement *> & statements, bool deflt ) throw ( SemanticErrorException ) :
-        Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
+                stmt->print( os, indent + 1 );
+        }
+}
+
+CaseStmt::CaseStmt( Expression * condition, const list<Statement *> & statements, bool deflt ) throw ( SemanticErrorException ) :
+                Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
         if ( isDefault() && condition != nullptr ) SemanticError( condition, "default case with condition: " );
 }
 
 CaseStmt::CaseStmt( const CaseStmt & other ) :
-        Statement( other ), condition( maybeClone(other.condition ) ), _isDefault( other._isDefault ) {
+                Statement( other ), condition( maybeClone(other.condition ) ), _isDefault( other._isDefault ) {
         cloneAll( other.stmts, stmts );
 }
@@ -226 +226 @@
 }
 
-CaseStmt * CaseStmt::makeDefault( const std::list<Label> & labels, std::list<Statement *> stmts ) {
+CaseStmt * CaseStmt::makeDefault( const list<Label> & labels, list<Statement *> stmts ) {
         CaseStmt * stmt = new CaseStmt( nullptr, stmts, true );
         stmt->labels = labels;
@@ -232 +232 @@
 }
 
-void CaseStmt::print( std::ostream & os, Indenter indent ) const {
+void CaseStmt::print( ostream & os, Indenter indent ) const {
         if ( isDefault() ) os << indent << "Default ";
         else {
@@ -241 +241 @@
 
         for ( Statement * stmt : stmts ) {
-                os << indent+1;
-                stmt->print( os, indent+1 );
-        }
-}
-
-WhileDoStmt::WhileDoStmt( Expression * condition, Statement * body, const std::list< Statement * > & initialization, bool isDoWhile ):
+                os << indent + 1;
+                stmt->print( os, indent + 1 );
+        }
+}
+
+WhileDoStmt::WhileDoStmt( Expression * condition, Statement * body, const list< Statement * > & initialization, bool isDoWhile ):
         Statement(), condition( condition ), body( body ), else_( nullptr ), initialization( initialization ), isDoWhile( isDoWhile) {
 }
 
-WhileDoStmt::WhileDoStmt( Expression * condition, Statement * body, Statement * else_, const std::list< Statement * > & initialization, bool isDoWhile ):
+WhileDoStmt::WhileDoStmt( Expression * condition, Statement * body, Statement * else_, const list< Statement * > & initialization, bool isDoWhile ):
         Statement(), condition( condition), body( body ), else_( else_ ), initialization( initialization ), isDoWhile( isDoWhile) {
 }
@@ -263 +263 @@
 }
 
-void WhileDoStmt::print( std::ostream & os, Indenter indent ) const {
+void WhileDoStmt::print( ostream & os, Indenter indent ) const {
         os << "While on condition: " << endl ;
-        condition->print( os, indent+1 );
+        condition->print( os, indent + 1 );
 
         os << indent << "... with body: " << endl;
 
-        if ( body != nullptr ) body->print( os, indent+1 );
-}
-
-ForStmt::ForStmt( std::list<Statement *> initialization, Expression * condition, Expression * increment, Statement * body, Statement * else_ ):
+        if ( body != nullptr ) body->print( os, indent + 1 );
+}
+
+ForStmt::ForStmt( const list<Statement *> initialization, Expression * condition, Expression * increment, Statement * body, Statement * else_ ):
         Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ), else_( else_ ) {
 }
@@ -290 +290 @@
 }
 
-void ForStmt::print( std::ostream & os, Indenter indent ) const {
+void ForStmt::print( ostream & os, Indenter indent ) const {
         Statement::print( os, indent ); // print labels
 
@@ -298 +298 @@
                 os << indent << "... initialization: \n";
                 for ( Statement * stmt : initialization ) {
-                        os << indent+1;
-                        stmt->print( os, indent+1 );
+                        os << indent + 1;
+                        stmt->print( os, indent + 1 );
                 }
         }
 
         if ( condition != nullptr ) {
-                os << indent << "... condition: \n" << indent+1;
-                condition->print( os, indent+1 );
+                os << indent << "... condition: \n" << indent + 1;
+                condition->print( os, indent + 1 );
         }
 
         if ( increment != nullptr ) {
-                os << "\n" << indent << "... increment: \n" << indent+1;
-                increment->print( os, indent+1 );
+                os << "\n" << indent << "... increment: \n" << indent + 1;
+                increment->print( os, indent + 1 );
         }
 
         if ( body != nullptr ) {
-                os << "\n" << indent << "... with body: \n" << indent+1;
-                body->print( os, indent+1 );
+                os << "\n" << indent << "... with body: \n" << indent + 1;
+                body->print( os, indent + 1 );
         }
 
         if ( else_ != nullptr ) {
-                os << "\n" << indent << "... with body: \n" << indent+1;
-                else_->print( os, indent+1 );
+                os << "\n" << indent << "... with body: \n" << indent + 1;
+                else_->print( os, indent + 1 );
         }
         os << endl;
@@ -339 +339 @@
 }
 
-void ThrowStmt::print( std::ostream & os, Indenter indent) const {
+void ThrowStmt::print( ostream & os, Indenter indent) const {
         if ( target ) os << "Non-Local ";
         os << "Throw Statement, raising: ";
-        expr->print(os, indent+1);
+        expr->print(os, indent + 1);
         if ( target ) {
                 os << "... at: ";
-                target->print(os, indent+1);
-        }
-}
-
-TryStmt::TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock ) :
+                target->print(os, indent + 1);
+        }
+}
+
+TryStmt::TryStmt( CompoundStmt * tryBlock, const list<CatchStmt *> & handlers, FinallyStmt * finallyBlock ) :
         Statement(), block( tryBlock ),  handlers( handlers ), finallyBlock( finallyBlock ) {
 }
@@ -363 +363 @@
 }
 
-void TryStmt::print( std::ostream & os, Indenter indent ) const {
+void TryStmt::print( ostream & os, Indenter indent ) const {
         os << "Try Statement" << endl;
-        os << indent << "... with block:" << endl << indent+1;
-        block->print( os, indent+1 );
+        os << indent << "... with block:" << endl << indent + 1;
+        block->print( os, indent + 1 );
 
         // handlers
         os << indent << "... and handlers:" << endl;
         for ( const CatchStmt * stmt : handlers ) {
-                os << indent+1;
-                stmt->print( os, indent+1 );
+                os << indent + 1;
+                stmt->print( os, indent + 1 );
         }
 
         // finally block
         if ( finallyBlock != nullptr ) {
-                os << indent << "... and finally:" << endl << indent+1;
-                finallyBlock->print( os, indent+1 );
+                os << indent << "... and finally:" << endl << indent + 1;
+                finallyBlock->print( os, indent + 1 );
         } // if
 }
@@ -396 +396 @@
 }
 
-void CatchStmt::print( std::ostream & os, Indenter indent ) const {
+void CatchStmt::print( ostream & os, Indenter indent ) const {
         os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
 
         os << indent << "... catching: ";
-        decl->printShort( os, indent+1 );
+        decl->printShort( os, indent + 1 );
         os << endl;
 
         if ( cond ) {
-                os << indent << "... with conditional:" << endl << indent+1;
-                cond->print( os, indent+1 );
+                os << indent << "... with conditional:" << endl << indent + 1;
+                cond->print( os, indent + 1 );
         }
 
         os << indent << "... with block:" << endl;
-        os << indent+1;
-        body->print( os, indent+1 );
+        os << indent + 1;
+        body->print( os, indent + 1 );
 }
 
@@ -424 +424 @@
 }
 
-void FinallyStmt::print( std::ostream & os, Indenter indent ) const {
+void FinallyStmt::print( ostream & os, Indenter indent ) const {
         os << "Finally Statement" << endl;
-        os << indent << "... with block:" << endl << indent+1;
-        block->print( os, indent+1 );
+        os << indent << "... with block:" << endl << indent + 1;
+        block->print( os, indent + 1 );
 }
 
@@ -439 +439 @@
 }
 
-void SuspendStmt::print( std::ostream & os, Indenter indent ) const {
+void SuspendStmt::print( ostream & os, Indenter indent ) const {
         os << "Suspend Statement";
         switch (type) {
@@ -496 +496 @@
 }
 
-void WaitForStmt::print( std::ostream & os, Indenter indent ) const {
+void WaitForStmt::print( ostream & os, Indenter indent ) const {
         os << "Waitfor Statement" << endl;
         indent += 1;
@@ -531 +531 @@
 
 
-WithStmt::WithStmt( const std::list< Expression * > & exprs, Statement * stmt ) : Declaration("", noStorageClasses, LinkageSpec::Cforall), exprs( exprs ), stmt( stmt ) {}
+WithStmt::WithStmt( const list< Expression * > & exprs, Statement * stmt ) : Declaration("", noStorageClasses, LinkageSpec::Cforall), exprs( exprs ), stmt( stmt ) {}
 WithStmt::WithStmt( const WithStmt & other ) : Declaration( other ), stmt( maybeClone( other.stmt ) ) {
         cloneAll( other.exprs, exprs );
@@ -540 +540 @@
 }
 
-void WithStmt::print( std::ostream & os, Indenter indent ) const {
+void WithStmt::print( 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 );
-}
-
-
-NullStmt::NullStmt( const std::list<Label> & labels ) : Statement( labels ) {
-}
-
-void NullStmt::print( std::ostream & os, Indenter indent ) const {
+        printAll( exprs, os, indent + 1 );
+        os << indent << "... with statement:" << endl << indent + 1;
+        stmt->print( os, indent + 1 );
+}
+
+
+NullStmt::NullStmt( const list<Label> & labels ) : Statement( labels ) {
+}
+
+void NullStmt::print( ostream & os, Indenter indent ) const {
         os << "Null Statement" << endl;
         Statement::print( os, indent );
@@ -568 +568 @@
 }
 
-void ImplicitCtorDtorStmt::print( std::ostream & os, Indenter indent ) const {
+void ImplicitCtorDtorStmt::print( ostream & os, Indenter indent ) const {
         os << "Implicit Ctor Dtor Statement" << endl;
         os << indent << "... with Ctor/Dtor: ";
-        callStmt->print( os, indent+1);
+        callStmt->print( os, indent + 1);
         os << endl;
 }
 
-MutexStmt::MutexStmt( Statement * stmt, std::list<Expression *> mutexObjs ) 
+MutexStmt::MutexStmt( Statement * stmt, const list<Expression *> mutexObjs ) 
         : Statement(), stmt( stmt ), mutexObjs( mutexObjs ) { }
 
@@ -587 +587 @@
 }
 
-void MutexStmt::print( std::ostream & os, Indenter indent ) const {
+void MutexStmt::print( ostream & os, Indenter indent ) const {
         os << "Mutex Statement" << endl;
         os << indent << "... with Expressions: " << endl;
         for (auto * obj : mutexObjs) {
-                os << indent+1;
-                obj->print( os, indent+1);
+                os << indent + 1;
+                obj->print( os, indent + 1);
                 os << endl;
         }
-        os << indent << "... with Statement: " << endl << indent+1;
-        stmt->print( os, indent+1 );
+        os << indent << "... with Statement: " << endl << indent + 1;
+        stmt->print( os, indent + 1 );
 }
 

src/SynTree/Statement.h ¶

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 11:49:17 2022
-// Update Count     : 94
+// Last Modified On : Wed Feb  2 20:15:30 2022
+// Update Count     : 98
 //
 
@@ -107 +107 @@
         std::list<Label> gotolabels;
 
-        AsmStmt( bool voltile, Expression * instruction, std::list<Expression *> output, std::list<Expression *> input, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
+        AsmStmt( bool voltile, Expression * instruction, const std::list<Expression *> output, const std::list<Expression *> input, const std::list<ConstantExpr *> clobber, const std::list<Label> gotolabels );
         AsmStmt( const AsmStmt & other );
         virtual ~AsmStmt();
@@ -153 +153 @@
 
         IfStmt( Expression * condition, Statement * then, Statement * else_,
-                        std::list<Statement *> initialization = std::list<Statement *>() );
+                        const std::list<Statement *> initialization = std::list<Statement *>() );
         IfStmt( const IfStmt & other );
         virtual ~IfStmt();
@@ -260 +260 @@
         Statement * else_;
 
-        ForStmt( std::list<Statement *> initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr, Statement * else_ = nullptr );
+        ForStmt( const std::list<Statement *> initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr, Statement * else_ = nullptr );
         ForStmt( const ForStmt & other );
         virtual ~ForStmt();
@@ -281 +281 @@
 class BranchStmt : public Statement {
   public:
-        enum Type { Goto = 0, Break, Continue, FallThrough, FallThroughDefault };
+        enum Type { Goto, Break, Continue, FallThrough, FallThroughDefault, BranchStmts };
 
         // originalTarget kept for error messages.
@@ -360 +360 @@
         FinallyStmt * finallyBlock;
 
-        TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = nullptr );
+        TryStmt( CompoundStmt * tryBlock, const std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = nullptr );
         TryStmt( const TryStmt & other );
         virtual ~TryStmt();
@@ -543 +543 @@
         std::list<Expression *> mutexObjs; // list of mutex objects to acquire
 
-        MutexStmt( Statement * stmt, std::list<Expression *> mutexObjs );
+        MutexStmt( Statement * stmt, const std::list<Expression *> mutexObjs );
         MutexStmt( const MutexStmt & other );
         virtual ~MutexStmt();