Changes in src/CodeGen/FixNames.cc [2fd0de0:0c577f7]

File:

• src/CodeGen/FixNames.cc (modified) (4 diffs)

src/CodeGen/FixNames.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.cc -- Adjustments to typed declarations.
+// FixNames.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 20 11:49:00 2022
-// Update Count     : 24
+// Last Modified On : Fri Oct 29 15:49:00 2021
+// Update Count     : 23
 //
 
@@ -87 +87 @@
 
 /// Does work with the main function and scopeLevels.
-class FixNames_new final {
+class FixNames_new : public ast::WithGuards {
         int scopeLevel = 1;
 
@@ -103 +103 @@
 
         const ast::FunctionDecl *postvisit( const ast::FunctionDecl *functionDecl ) {
+                // This store is used to ensure a maximum of one call to mutate.
+                ast::FunctionDecl * mutDecl = nullptr;
+
+                if ( shouldSetScopeLevel( functionDecl ) ) {
+                        mutDecl = ast::mutate( functionDecl );
+                        mutDecl->scopeLevel = scopeLevel;
+                }
+
                 if ( FixMain::isMain( functionDecl ) ) {
-                        auto mutDecl = ast::mutate( functionDecl );
-
-                        if ( shouldSetScopeLevel( mutDecl ) ) {
-                                mutDecl->scopeLevel = scopeLevel;
-                        }
+                        if ( !mutDecl ) { mutDecl = ast::mutate( functionDecl ); }
 
                         int nargs = mutDecl->params.size();
@@ -120 +124 @@
                                 )
                         );
-
-                        return mutDecl;
-                } else if ( shouldSetScopeLevel( functionDecl ) ) {
-                        return ast::mutate_field( functionDecl, &ast::FunctionDecl::scopeLevel, scopeLevel );
-                } else {
-                        return functionDecl;
                 }
+                return mutDecl ? mutDecl : functionDecl;
         }
 
         void previsit( const ast::CompoundStmt * ) {
-                scopeLevel += 1;
-        }
-
-        void postvisit( const ast::CompoundStmt * ) {
-                scopeLevel -= 1;
+                GuardValue( scopeLevel ) += 1;
         }
 };