Changeset bdfc032 for src

Timestamp:

Feb 4, 2020, 11:35:26 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

eef8dfb

Parents:

aefb247 (diff), 4f7b418 (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 dkobets-vector

Location:

src

Files:

• Common/Stats/Time.h (modified) (3 diffs)
• Concurrency/Keywords.cc (modified) (1 diff)
• Concurrency/Waitfor.cc (modified) (2 diffs)
• ControlStruct/LabelFixer.cc (modified) (5 diffs)
• ControlStruct/MLEMutator.cc (modified) (14 diffs)
• ControlStruct/MLEMutator.h (modified) (4 diffs)
• Parser/lex.ll (modified) (2 diffs)
• Parser/parser.yy (modified) (15 diffs)
• SymTab/Validate.cc (modified) (1 diff)
• SynTree/Statement.cc (modified) (34 diffs)
• SynTree/Statement.h (modified) (3 diffs)
• cfa.make (modified) (3 diffs)

src/Common/Stats/Time.h

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Fri Mar 01 15:14:11 2019
-// Last Modified By :
+// Last Modified By : Andrew Beach
 // Last Modified On :
 // Update Count     :
@@ -41 +41 @@
                                 f();
                         }
+
+                        template<typename ret_t = void, typename func_t, typename... arg_t>
+                        inline ret_t TimeCall(
+                                        const char *, func_t func, arg_t&&... arg) {
+                                return func(std::forward<arg_t>(arg)...);
+                        }
 #               else
                         void StartGlobal();
@@ -59 +65 @@
                                 func();
                         }
+
+                        template<typename ret_t = void, typename func_t, typename... arg_t>
+                        inline ret_t TimeCall(
+                                        const char * name, func_t func, arg_t&&... arg) {
+                                BlockGuard guard(name);
+                                return func(std::forward<arg_t>(arg)...);
+                        }
 #               endif
         }

src/Concurrency/Keywords.cc

@@ -716 +716 @@
                                 new UntypedExpr(
                                         new NameExpr( "__thrd_start" ),
-                                        { new VariableExpr( param ) }
+                                        { new VariableExpr( param ), new NameExpr("main") }
                                 )
                         )

src/Concurrency/Waitfor.cc

@@ -11 +11 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 11
+// Update Count     : 12
 //
 
@@ -42 +42 @@
 void foo() {
         while( true ) {
-                when( a < 1 ) waitfor( f, a ) { bar(); }
+                when( a < 1 ) waitfor( f : a ) { bar(); }
                 or timeout( swagl() );
-                or waitfor( g, a ) { baz(); }
-                or waitfor( ^?{}, a ) { break; }
+                or waitfor( g : a ) { baz(); }
+                or waitfor( ^?{} : a ) { break; }
                 or waitfor( ^?{} ) { break; }
         }

src/ControlStruct/LabelFixer.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 11 22:26:02 2019
-// Update Count     : 159
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jan 21 10:32:00 2020
+// Update Count     : 160
 //
 
@@ -21 +21 @@
 #include "ControlStruct/LabelGenerator.h"  // for LabelGenerator
 #include "LabelFixer.h"
-#include "MLEMutator.h"                    // for MLEMutator
+#include "MLEMutator.h"                    // for MultiLevelExitMutator
 #include "SynTree/Declaration.h"           // for FunctionDecl
 #include "SynTree/Expression.h"            // for NameExpr, Expression, Unty...
@@ -44 +44 @@
 
         void LabelFixer::postvisit( FunctionDecl * functionDecl ) {
-                PassVisitor<MLEMutator> mlemut( resolveJumps(), generator );
-                functionDecl->acceptMutator( mlemut );
+                PassVisitor<MultiLevelExitMutator> mlem( resolveJumps(), generator );
+                // We start in the body so we can stop when we hit another FunctionDecl.
+                maybeMutate( functionDecl->statements, mlem );
         }
 
@@ -75 +76 @@
 
 
-        // sets the definition of the labelTable entry to be the provided statement for every label in the list
-        // parameter. Happens for every kind of statement
+        // Sets the definition of the labelTable entry to be the provided statement for every label in
+        // the list parameter. Happens for every kind of statement.
         Label LabelFixer::setLabelsDef( std::list< Label > & llabel, Statement * definition ) {
                 assert( definition != 0 );
                 assert( llabel.size() > 0 );
-
-                Entry * e = new Entry( definition );
 
                 for ( std::list< Label >::iterator i = llabel.begin(); i != llabel.end(); i++ ) {
@@ -87 +86 @@
                         l.set_statement( definition ); // attach statement to the label to be used later
                         if ( labelTable.find( l ) == labelTable.end() ) {
-                                // all labels on this statement need to use the same entry, so this should only be created once
+                                // All labels on this statement need to use the same entry,
+                                // so this should only be created once.
                                 // undefined and unused until now, add an entry
-                                labelTable[ l ] =  e;
+                                labelTable[ l ] = new Entry( definition );
                         } else if ( labelTable[ l ]->defined() ) {
                                 // defined twice, error
-                                SemanticError( l.get_statement()->location, "Duplicate definition of label: " + l.get_name() );
-                        }       else {
+                                SemanticError( l.get_statement()->location,
+                                        "Duplicate definition of label: " + l.get_name() );
+                        } else {
                                 // used previously, but undefined until now -> link with this entry
+                                // Question: Is changing objects important?
                                 delete labelTable[ l ];
-                                labelTable[ l ] = e;
+                                labelTable[ l ] = new Entry( definition );
                         } // if
                 } // for
 
-                // produce one of the labels attached to this statement to be temporarily used as the canonical label
+                // Produce one of the labels attached to this statement to be temporarily used as the
+                // canonical label.
                 return labelTable[ llabel.front() ]->get_label();
         }

src/ControlStruct/MLEMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Oct 22 17:22:44 2019
-// Update Count     : 220
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jan 22 11:50:00 2020
+// Update Count     : 223
 //
 
@@ -33 +33 @@
 
 namespace ControlStruct {
-        MLEMutator::~MLEMutator() {
+        MultiLevelExitMutator::~MultiLevelExitMutator() {
                 delete targetTable;
                 targetTable = 0;
         }
         namespace {
-                bool isLoop( const MLEMutator::Entry & e ) { return dynamic_cast< WhileStmt * >( e.get_controlStructure() ) || dynamic_cast< ForStmt * >( e.get_controlStructure() ); }
-                bool isSwitch( const MLEMutator::Entry & e ) { return dynamic_cast< SwitchStmt *>( e.get_controlStructure() ); }
-
-                bool isBreakTarget( const MLEMutator::Entry & e ) { return isLoop( e ) || isSwitch( e ) || dynamic_cast< CompoundStmt *>( e.get_controlStructure() ); }
-                bool isContinueTarget( const MLEMutator::Entry & e ) { return isLoop( e ); }
-                bool isFallthroughTarget( const MLEMutator::Entry & e ) { return dynamic_cast< CaseStmt *>( e.get_controlStructure() );; }
-                bool isFallthroughDefaultTarget( const MLEMutator::Entry & e ) { return isSwitch( e ); }
+                bool isLoop( const MultiLevelExitMutator::Entry & e ) {
+                        return dynamic_cast< WhileStmt * >( e.get_controlStructure() )
+                                || dynamic_cast< ForStmt * >( e.get_controlStructure() );
+                }
+                bool isSwitch( const MultiLevelExitMutator::Entry & e ) {
+                        return dynamic_cast< SwitchStmt *>( e.get_controlStructure() );
+                }
+
+                bool isBreakTarget( const MultiLevelExitMutator::Entry & e ) {
+                        return isLoop( e ) || isSwitch( e )
+                                || dynamic_cast< CompoundStmt *>( e.get_controlStructure() );
+                }
+                bool isContinueTarget( const MultiLevelExitMutator::Entry & e ) {
+                        return isLoop( e );
+                }
+                bool isFallthroughTarget( const MultiLevelExitMutator::Entry & e ) {
+                        return dynamic_cast< CaseStmt *>( e.get_controlStructure() );
+                }
+                bool isFallthroughDefaultTarget( const MultiLevelExitMutator::Entry & e ) {
+                        return isSwitch( e );
+                }
         } // namespace
+
+        void MultiLevelExitMutator::premutate( FunctionDecl * ) {
+                visit_children = false;
+        }
 
         // break labels have to come after the statement they break out of, so mutate a statement, then if they inform us
         // through the breakLabel field tha they need a place to jump to on a break statement, add the break label to the
         // body of statements
-        void MLEMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
+        void MultiLevelExitMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
                 SemanticErrorException errors;
 
@@ -81 +99 @@
         }
 
-        void MLEMutator::premutate( CompoundStmt *cmpndStmt ) {
+        void MultiLevelExitMutator::premutate( CompoundStmt *cmpndStmt ) {
                 visit_children = false;
                 bool labeledBlock = !(cmpndStmt->labels.empty());
@@ -118 +136 @@
                         }
                 }
-                assertf( false, "Could not find label '%s' on statement %s", originalTarget.get_name().c_str(), toString( stmt ).c_str() );
-        }
-
-
-        Statement *MLEMutator::postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException ) {
+                assertf( false, "Could not find label '%s' on statement %s",
+                        originalTarget.get_name().c_str(), toString( stmt ).c_str() );
+        }
+
+
+        Statement *MultiLevelExitMutator::postmutate( BranchStmt *branchStmt )
+                        throw ( SemanticErrorException ) {
                 std::string originalTarget = branchStmt->originalTarget;
 
@@ -230 +250 @@
         }
 
-        Statement *MLEMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
+        Statement *MultiLevelExitMutator::mutateLoop( Statement *bodyLoop, Entry &e ) {
                 // only generate these when needed
                 if( !e.isContUsed() && !e.isBreakUsed() ) return bodyLoop;
@@ -253 +273 @@
 
         template< typename LoopClass >
-        void MLEMutator::prehandleLoopStmt( LoopClass * loopStmt ) {
+        void MultiLevelExitMutator::prehandleLoopStmt( LoopClass * loopStmt ) {
                 // remember this as the most recent enclosing loop, then mutate the body of the loop -- this will determine
                 // whether brkLabel and contLabel are used with branch statements and will recursively do the same to nested
@@ -264 +284 @@
 
         template< typename LoopClass >
-        Statement * MLEMutator::posthandleLoopStmt( LoopClass * loopStmt ) {
+        Statement * MultiLevelExitMutator::posthandleLoopStmt( LoopClass * loopStmt ) {
                 assert( ! enclosingControlStructures.empty() );
                 Entry &e = enclosingControlStructures.back();
@@ -275 +295 @@
         }
 
-        void MLEMutator::premutate( WhileStmt * whileStmt ) {
+        void MultiLevelExitMutator::premutate( WhileStmt * whileStmt ) {
                 return prehandleLoopStmt( whileStmt );
         }
 
-        void MLEMutator::premutate( ForStmt * forStmt ) {
+        void MultiLevelExitMutator::premutate( ForStmt * forStmt ) {
                 return prehandleLoopStmt( forStmt );
         }
 
-        Statement * MLEMutator::postmutate( WhileStmt * whileStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( WhileStmt * whileStmt ) {
                 return posthandleLoopStmt( whileStmt );
         }
 
-        Statement * MLEMutator::postmutate( ForStmt * forStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( ForStmt * forStmt ) {
                 return posthandleLoopStmt( forStmt );
         }
 
-        void MLEMutator::premutate( IfStmt * ifStmt ) {
+        void MultiLevelExitMutator::premutate( IfStmt * ifStmt ) {
                 // generate a label for breaking out of a labeled if
                 bool labeledBlock = !(ifStmt->get_labels().empty());
@@ -301 +321 @@
         }
 
-        Statement * MLEMutator::postmutate( IfStmt * ifStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( IfStmt * ifStmt ) {
                 bool labeledBlock = !(ifStmt->get_labels().empty());
                 if ( labeledBlock ) {
@@ -311 +331 @@
         }
 
-        void MLEMutator::premutate( TryStmt * tryStmt ) {
+        void MultiLevelExitMutator::premutate( TryStmt * tryStmt ) {
                 // generate a label for breaking out of a labeled if
                 bool labeledBlock = !(tryStmt->get_labels().empty());
@@ -321 +341 @@
         }
 
-        Statement * MLEMutator::postmutate( TryStmt * tryStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( TryStmt * tryStmt ) {
                 bool labeledBlock = !(tryStmt->get_labels().empty());
                 if ( labeledBlock ) {
@@ -331 +351 @@
         }
 
-        void MLEMutator::premutate( CaseStmt *caseStmt ) {
+        void MultiLevelExitMutator::premutate( FinallyStmt * ) {
+                GuardAction([this, old = std::move(enclosingControlStructures)]() {
+                        enclosingControlStructures = std::move(old);
+                });
+                enclosingControlStructures = std::list<Entry>();
+                GuardValue( inFinally );
+                inFinally = true;
+        }
+
+        void MultiLevelExitMutator::premutate( ReturnStmt *returnStmt ) {
+                if ( inFinally ) {
+                        SemanticError( returnStmt->location, "'return' may not appear in a finally clause" );
+                }
+        }
+
+        void MultiLevelExitMutator::premutate( CaseStmt *caseStmt ) {
                 visit_children = false;
 
@@ -370 +405 @@
         }
 
-        void MLEMutator::premutate( SwitchStmt *switchStmt ) {
+        void MultiLevelExitMutator::premutate( SwitchStmt *switchStmt ) {
                 // generate a label for breaking out of a labeled switch
                 Label brkLabel = generator->newLabel("switchBreak", switchStmt);
@@ -396 +431 @@
         }
 
-        Statement * MLEMutator::postmutate( SwitchStmt * switchStmt ) {
+        Statement * MultiLevelExitMutator::postmutate( SwitchStmt * switchStmt ) {
                 Entry &e = enclosingControlStructures.back();
                 assert ( e == switchStmt );

src/ControlStruct/MLEMutator.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Oct 22 17:22:47 2019
-// Update Count     : 45
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jan 22 11:50:00 2020
+// Update Count     : 48
 //
 
@@ -30 +30 @@
         class LabelGenerator;
 
-        class MLEMutator : public WithVisitorRef<MLEMutator>, public WithShortCircuiting, public WithGuards {
+        class MultiLevelExitMutator : public WithVisitorRef<MultiLevelExitMutator>,
+                        public WithShortCircuiting, public WithGuards {
           public:
                 class Entry;
-                MLEMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
-                ~MLEMutator();
+                MultiLevelExitMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) :
+                        targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
+                ~MultiLevelExitMutator();
+
+                void premutate( FunctionDecl * );
 
                 void premutate( CompoundStmt *cmpndStmt );
@@ -47 +51 @@
                 void premutate( SwitchStmt *switchStmt );
                 Statement * postmutate( SwitchStmt *switchStmt );
+                void premutate( ReturnStmt *returnStmt );
                 void premutate( TryStmt *tryStmt );
                 Statement * postmutate( TryStmt *tryStmt );
+                void premutate( FinallyStmt *finallyStmt );
 
                 Statement *mutateLoop( Statement *bodyLoop, Entry &e );
@@ -110 +116 @@
                 Label breakLabel;
                 LabelGenerator *generator;
+                bool inFinally = false;
 
                 template< typename LoopClass >

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Sun Aug  4 20:53:47 2019
- * Update Count     : 719
+ * Last Modified On : Sat Feb  1 07:16:44 2020
+ * Update Count     : 724
  */
 
@@ -330 +330 @@
                                 /* identifier */
 {identifier}    { IDENTIFIER_RETURN(); }
-"`"{identifier}"`" {                                                                    // CFA
-        yytext[yyleng - 1] = '\0'; yytext += 1;                         // SKULLDUGGERY: remove backquotes (ok to shorten?)
+"``"{identifier}"``" {                                                                  // CFA
+        yytext[yyleng - 2] = '\0'; yytext += 2;                         // SKULLDUGGERY: remove backquotes (ok to shorten?)
         IDENTIFIER_RETURN();
 }

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Dec 16 15:32:58 2019
-// Update Count     : 4409
+// Last Modified On : Sat Feb  1 10:04:40 2020
+// Update Count     : 4440
 //
 
@@ -323 +323 @@
 %type<op> ptrref_operator                               unary_operator                          assignment_operator
 %type<en> primary_expression                    postfix_expression                      unary_expression
-%type<en> cast_expression                               exponential_expression          multiplicative_expression       additive_expression
+%type<en> cast_expression_list                  cast_expression                         exponential_expression          multiplicative_expression       additive_expression
 %type<en> shift_expression                              relational_expression           equality_expression
 %type<en> AND_expression                                exclusive_OR_expression         inclusive_OR_expression
@@ -579 +579 @@
         | '(' compound_statement ')'                                            // GCC, lambda expression
                 { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); }
-        | constant '`' IDENTIFIER                                                       // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
-        | string_literal '`' IDENTIFIER                                         // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( $1 ) ) ); }
-        | IDENTIFIER '`' IDENTIFIER                                                     // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( build_varref( $1 ) ) ) ); }
-        | tuple '`' IDENTIFIER                                                          // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
-        | '(' comma_expression ')' '`' IDENTIFIER                       // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $5 ) ), $2 ) ); }
         | type_name '.' identifier                                                      // CFA, nested type
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
@@ -642 +632 @@
         | postfix_expression '(' argument_expression_list ')'
                 { $$ = new ExpressionNode( build_func( $1, $3 ) ); }
+        | postfix_expression '`' identifier                                     // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
+        | constant '`' identifier                                                       // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
+        | string_literal '`' identifier                                         // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( $1 ) ) ); }
         | postfix_expression '.' identifier
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
@@ -666 +662 @@
         | '(' type_no_function ')' '@' '{' initializer_list_opt comma_opt '}' // CFA, explicit C compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, (new InitializerNode( $6, true ))->set_maybeConstructed( false ) ) ); }
-        | '^' primary_expression '{' argument_expression_list '}' // CFA
+        | '^' primary_expression '{' argument_expression_list '}' // CFA, destructor call
                 {
                         Token fn;
@@ -679 +675 @@
         | argument_expression
         | argument_expression_list ',' argument_expression
-                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
+                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
 
@@ -691 +687 @@
 field_name_list:                                                                                // CFA, tuple field selector
         field
-        | field_name_list ',' field                                     { $$ = (ExpressionNode *)$1->set_last( $3 ); }
+        | field_name_list ',' field                                     { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
 
@@ -960 +956 @@
                 { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( $3 ) ) ); }
         | '[' push assignment_expression pop ',' tuple_expression_list ']'
-                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)$3->set_last( $6 ) ) ); }
+                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)($3->set_last( $6 ) ) )); }
         ;
 
@@ -966 +962 @@
         assignment_expression_opt
         | tuple_expression_list ',' assignment_expression_opt
-                { $$ = (ExpressionNode *)$1->set_last( $3 ); }
+                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
 
@@ -1307 +1303 @@
         WAITFOR '(' cast_expression ')'
                 { $$ = $3; }
-        | WAITFOR '(' cast_expression ',' argument_expression_list ')'
-                { $$ = (ExpressionNode *)$3->set_last( $5 ); }
+//      | WAITFOR '(' cast_expression ',' argument_expression_list ')'
+//              { $$ = (ExpressionNode *)$3->set_last( $5 ); }
+        | WAITFOR '(' cast_expression_list ':' argument_expression_list ')'
+                { $$ = (ExpressionNode *)($3->set_last( $5 )); }
+        ;
+
+cast_expression_list:
+        cast_expression
+        | cast_expression_list ',' cast_expression
+                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
 
@@ -1419 +1423 @@
         asm_operand
         | asm_operands_list ',' asm_operand
-                { $$ = (ExpressionNode *)$1->set_last( $3 ); }
+                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
 
@@ -1435 +1439 @@
                 { $$ = new ExpressionNode( $1 ); }
         | asm_clobbers_list_opt ',' string_literal
-                // set_last returns ParseNode *
-                { $$ = (ExpressionNode *)$1->set_last( new ExpressionNode( $3 ) ); }
+                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( $3 ) )); }
         ;
 
@@ -2359 +2362 @@
         | initializer_list_opt ',' initializer          { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
         | initializer_list_opt ',' designation initializer
-                { $$ = (InitializerNode *)( $1->set_last( $4->set_designators( $3 ) ) ); }
+                { $$ = (InitializerNode *)($1->set_last( $4->set_designators( $3 ) )); }
         ;
 
@@ -2381 +2384 @@
         designator
         | designator_list designator
-                { $$ = (ExpressionNode *)( $1->set_last( $2 ) ); }
+                { $$ = (ExpressionNode *)($1->set_last( $2 )); }
         //| designator_list designator                                          { $$ = new ExpressionNode( $1, $2 ); }
         ;
@@ -2478 +2481 @@
                 { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $1->build()) ); $$ = nullptr; }
         | type_list ',' type
-                { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) ) ); }
+                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) )); }
         | type_list ',' assignment_expression
                 { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $3->build()) ); $$ = nullptr; }

src/SymTab/Validate.cc

@@ -375 +375 @@
                         Stats::Heap::newPass("validate-F");
                         Stats::Time::BlockGuard guard("validate-F");
-                        Stats::Time::TimeBlock("Fix Object Type", [&]() {
-                                FixObjectType::fix( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Array Length", [&]() {
-                                ArrayLength::computeLength( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Find Special Declarations", [&]() {
-                                Validate::findSpecialDecls( translationUnit );
-                        });
-                        Stats::Time::TimeBlock("Fix Label Address", [&]() {
-                                mutateAll( translationUnit, labelAddrFixer );
-                        });
-                        Stats::Time::TimeBlock("Handle Attributes", [&]() {
-                                Validate::handleAttributes( translationUnit );
-                        });
+                        Stats::Time::TimeCall("Fix Object Type",
+                                FixObjectType::fix, translationUnit);
+                        Stats::Time::TimeCall("Array Length",
+                                ArrayLength::computeLength, translationUnit);
+                        Stats::Time::TimeCall("Find Special Declarations",
+                                Validate::findSpecialDecls, translationUnit);
+                        Stats::Time::TimeCall("Fix Label Address",
+                                mutateAll<LabelAddressFixer>, translationUnit, labelAddrFixer);
+                        Stats::Time::TimeCall("Handle Attributes",
+                                Validate::handleAttributes, translationUnit);
                 }
         }

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Sep  3 20:46:44 2017
-// Update Count     : 68
+// Last Modified By : Andrew Beach
+// Last Modified On : Mon Jan 20 16:03:00 2020
+// Update Count     : 71
 //
 
@@ -46 +46 @@
 Statement::~Statement() {}
 
-ExprStmt::ExprStmt( Expression *expr ) : Statement(), expr( expr ) {}
-
-ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
+ExprStmt::ExprStmt( Expression * expr ) : Statement(), expr( expr ) {}
+
+ExprStmt::ExprStmt( const ExprStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
 
 ExprStmt::~ExprStmt() {
@@ -54 +54 @@
 }
 
-void ExprStmt::print( std::ostream &os, Indenter indent ) const {
+void ExprStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Expression Statement:" << endl << indent+1;
         expr->print( os, indent+1 );
@@ -60 +60 @@
 
 
-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 ) {}
+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 ) {}
 
 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( std::ostream & os, Indenter indent ) const {
         os << "Assembler Statement:" << endl;
         os << indent+1 << "instruction: " << endl << indent;
@@ -96 +96 @@
 DirectiveStmt::DirectiveStmt( const std::string & directive ) : Statement(), directive( directive ) {}
 
-void DirectiveStmt::print( std::ostream &os, Indenter ) const {
+void DirectiveStmt::print( std::ostream & os, Indenter ) const {
         os << "GCC Directive:" << directive << endl;
 }
 
 
-const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
+const char * BranchStmt::brType[] = {
+        "Goto", "Break", "Continue", "Fall Through", "Fall Through Default",
+};
 
 BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticErrorException ) :
@@ -111 +113 @@
 }
 
-BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticErrorException ) :
+BranchStmt::BranchStmt( Expression * computedTarget, Type type ) throw ( SemanticErrorException ) :
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
@@ -118 +120 @@
 }
 
-void BranchStmt::print( std::ostream &os, Indenter indent ) const {
+void BranchStmt::print( std::ostream & os, Indenter indent ) const {
+        assert(type < 5);
         os << "Branch (" << brType[type] << ")" << endl ;
         if ( target != "" ) os << indent+1 << "with target: " << target << endl;
@@ -125 +128 @@
 }
 
-ReturnStmt::ReturnStmt( Expression *expr ) : Statement(), expr( expr ) {}
+ReturnStmt::ReturnStmt( Expression * expr ) : Statement(), expr( expr ) {}
 
 ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -133 +136 @@
 }
 
-void ReturnStmt::print( std::ostream &os, Indenter indent ) const {
+void ReturnStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Return Statement, returning: ";
         if ( expr != nullptr ) {
@@ -142 +145 @@
 }
 
-IfStmt::IfStmt( Expression *condition, Statement *thenPart, Statement *elsePart, std::list<Statement *> initialization ):
+IfStmt::IfStmt( Expression * condition, Statement * thenPart, Statement * elsePart, std::list<Statement *> initialization ):
         Statement(), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {}
 
@@ -157 +160 @@
 }
 
-void IfStmt::print( std::ostream &os, Indenter indent ) const {
+void IfStmt::print( std::ostream & os, Indenter indent ) const {
         os << "If on condition: " << endl;
         os << indent+1;
@@ -176 +179 @@
         thenPart->print( os, indent+1 );
 
-        if ( elsePart != 0 ) {
+        if ( elsePart != nullptr ) {
                 os << indent << "... else: " << endl;
                 os << indent+1;
@@ -183 +186 @@
 }
 
-SwitchStmt::SwitchStmt( Expression * condition, const std::list<Statement *> &statements ):
+SwitchStmt::SwitchStmt( Expression * condition, const std::list<Statement *> & statements ):
         Statement(), condition( condition ), statements( statements ) {
 }
@@ -198 +201 @@
 }
 
-void SwitchStmt::print( std::ostream &os, Indenter indent ) const {
+void SwitchStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Switch on condition: ";
         condition->print( os );
@@ -208 +211 @@
 }
 
-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 ( SemanticErrorException ) :
         Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
-        if ( isDefault() && condition != 0 ) SemanticError( condition, "default case with condition: " );
+        if ( isDefault() && condition != nullptr ) SemanticError( condition, "default case with condition: " );
 }
 
@@ -229 +232 @@
 }
 
-void CaseStmt::print( std::ostream &os, Indenter indent ) const {
+void CaseStmt::print( std::ostream & os, Indenter indent ) const {
         if ( isDefault() ) os << indent << "Default ";
         else {
@@ -243 +246 @@
 }
 
-WhileStmt::WhileStmt( Expression *condition, Statement *body, std::list< Statement * > & initialization, bool isDoWhile ):
+WhileStmt::WhileStmt( Expression * condition, Statement * body, std::list< Statement * > & initialization, bool isDoWhile ):
         Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
 }
@@ -256 +259 @@
 }
 
-void WhileStmt::print( std::ostream &os, Indenter indent ) const {
+void WhileStmt::print( std::ostream & os, Indenter indent ) const {
         os << "While on condition: " << endl ;
         condition->print( os, indent+1 );
@@ -262 +265 @@
         os << indent << "... with body: " << endl;
 
-        if ( body != 0 ) body->print( os, indent+1 );
-}
-
-ForStmt::ForStmt( std::list<Statement *> initialization, Expression *condition, Expression *increment, Statement *body ):
+        if ( body != nullptr ) body->print( os, indent+1 );
+}
+
+ForStmt::ForStmt( std::list<Statement *> initialization, Expression * condition, Expression * increment, Statement * body ):
         Statement(), initialization( initialization ), condition( condition ), increment( increment ), body( body ) {
 }
@@ -282 +285 @@
 }
 
-void ForStmt::print( std::ostream &os, Indenter indent ) const {
+void ForStmt::print( std::ostream & os, Indenter indent ) const {
         Statement::print( os, indent ); // print labels
 
@@ -305 +308 @@
         }
 
-        if ( body != 0 ) {
+        if ( body != nullptr ) {
                 os << "\n" << indent << "... with body: \n" << indent+1;
                 body->print( os, indent+1 );
@@ -317 +320 @@
 }
 
-ThrowStmt::ThrowStmt( const ThrowStmt &other ) :
+ThrowStmt::ThrowStmt( const ThrowStmt & other ) :
         Statement ( other ), kind( other.kind ), expr( maybeClone( other.expr ) ), target( maybeClone( other.target ) ) {
 }
@@ -326 +329 @@
 }
 
-void ThrowStmt::print( std::ostream &os, Indenter indent) const {
+void ThrowStmt::print( std::ostream & os, Indenter indent) const {
         if ( target ) os << "Non-Local ";
         os << "Throw Statement, raising: ";
@@ -336 +339 @@
 }
 
-TryStmt::TryStmt( CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock ) :
+TryStmt::TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock ) :
         Statement(), block( tryBlock ),  handlers( handlers ), finallyBlock( finallyBlock ) {
 }
 
-TryStmt::TryStmt( const TryStmt &other ) : Statement( other ), block( maybeClone( other.block ) ), finallyBlock( maybeClone( other.finallyBlock ) ) {
+TryStmt::TryStmt( const TryStmt & other ) : Statement( other ), block( maybeClone( other.block ) ), finallyBlock( maybeClone( other.finallyBlock ) ) {
         cloneAll( other.handlers, handlers );
 }
@@ -350 +353 @@
 }
 
-void TryStmt::print( std::ostream &os, Indenter indent ) const {
+void TryStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Try Statement" << endl;
         os << indent << "... with block:" << endl << indent+1;
@@ -363 +366 @@
 
         // finally block
-        if ( finallyBlock != 0 ) {
+        if ( finallyBlock != nullptr ) {
                 os << indent << "... and finally:" << endl << indent+1;
                 finallyBlock->print( os, indent+1 );
@@ -369 +372 @@
 }
 
-CatchStmt::CatchStmt( Kind kind, Declaration *decl, Expression *cond, Statement *body ) :
+CatchStmt::CatchStmt( Kind kind, Declaration * decl, Expression * cond, Statement * body ) :
         Statement(), kind ( kind ), decl ( decl ), cond ( cond ), body( body ) {
                 assertf( decl, "Catch clause must have a declaration." );
@@ -383 +386 @@
 }
 
-void CatchStmt::print( std::ostream &os, Indenter indent ) const {
+void CatchStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Catch " << ((Terminate == kind) ? "Terminate" : "Resume") << " Statement" << endl;
 
@@ -401 +404 @@
 
 
-FinallyStmt::FinallyStmt( CompoundStmt *block ) : Statement(), block( block ) {
+FinallyStmt::FinallyStmt( CompoundStmt * block ) : Statement(), block( block ) {
 }
 
@@ -411 +414 @@
 }
 
-void FinallyStmt::print( std::ostream &os, Indenter indent ) const {
+void FinallyStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Finally Statement" << endl;
         os << indent << "... with block:" << endl << indent+1;
@@ -458 +461 @@
 }
 
-void WaitForStmt::print( std::ostream &os, Indenter indent ) const {
+void WaitForStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Waitfor Statement" << endl;
         indent += 1;
@@ -514 +517 @@
 }
 
-void NullStmt::print( std::ostream &os, Indenter indent ) const {
+void NullStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Null Statement" << endl;
         Statement::print( os, indent );
@@ -530 +533 @@
 }
 
-void ImplicitCtorDtorStmt::print( std::ostream &os, Indenter indent ) const {
+void ImplicitCtorDtorStmt::print( std::ostream & os, Indenter indent ) const {
         os << "Implicit Ctor Dtor Statement" << endl;
         os << indent << "... with Ctor/Dtor: ";

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 12 09:01:53 2019
-// Update Count     : 83
+// Last Modified On : Fri Jan 10 14:13:24 2020
+// Update Count     : 85
 //
 
@@ -257 +257 @@
         Statement * body;
 
-        ForStmt( std::list<Statement *> initialization, Expression * condition = 0, Expression * increment = 0, Statement * body = 0 );
+        ForStmt( std::list<Statement *> initialization, Expression * condition = nullptr, Expression * increment = nullptr, Statement * body = nullptr );
         ForStmt( const ForStmt & other );
         virtual ~ForStmt();
@@ -357 +357 @@
         FinallyStmt * finallyBlock;
 
-        TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = 0 );
+        TryStmt( CompoundStmt * tryBlock, std::list<CatchStmt *> & handlers, FinallyStmt * finallyBlock = nullptr );
         TryStmt( const TryStmt & other );
         virtual ~TryStmt();

src/cfa.make

@@ -1 @@
-
-
 CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -21 +19 @@
         $(am__mv) $$depbase.Tpo $$depbase.Plo
 
-AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
-am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
-am__v_JAVAC_0 = @echo "  JAVAC   " $@;
-am__v_JAVAC_1 =
-
-AM_V_GOC = $(am__v_GOC_@AM_V@)
-am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
-am__v_GOC_0 = @echo "  GOC     " $@;
-am__v_GOC_1 =
-
 UPPCC = u++
 UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -38 +26 @@
 am__v_UPP_0 = @echo "  UPP     " $@;
 am__v_UPP_1 =
+
+AM_V_GOC = $(am__v_GOC_@AM_V@)
+am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
+am__v_GOC_0 = @echo "  GOC     " $@;
+am__v_GOC_1 =
+
+AM_V_RUST = $(am__v_RUST_@AM_V@)
+am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
+am__v_RUST_0 = @echo "  RUST     " $@;
+am__v_RUST_1 =
+
+AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
+am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
+am__v_NODEJS_0 = @echo "  NODEJS     " $@;
+am__v_NODEJS_1 =
+
+AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
+am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
+am__v_JAVAC_0 = @echo "  JAVAC   " $@;
+am__v_JAVAC_1 =