Changeset 2fd0de0 for src/CodeGen/FixNames.cc

Timestamp:

Jul 20, 2022, 12:40:32 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

6726a3a

Parents:

b585593

Message:

Another clean-up pass on fix names since I was in the area. This one is just for readability.

File:

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

src/CodeGen/FixNames.cc

@@ -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 ( FixMain::isMain( functionDecl ) ) {
+                        auto mutDecl = ast::mutate( functionDecl );
 
-                if ( shouldSetScopeLevel( functionDecl ) ) {
-                        mutDecl = ast::mutate( functionDecl );
-                        mutDecl->scopeLevel = scopeLevel;
-                }
-
-                if ( FixMain::isMain( functionDecl ) ) {
-                        if ( !mutDecl ) { mutDecl = ast::mutate( functionDecl ); }
+                        if ( shouldSetScopeLevel( mutDecl ) ) {
+                                mutDecl->scopeLevel = scopeLevel;
+                        }
 
                         int nargs = mutDecl->params.size();
@@ -124 +120 @@
                                 )
                         );
+
+                        return mutDecl;
+                } else if ( shouldSetScopeLevel( functionDecl ) ) {
+                        return ast::mutate_field( functionDecl, &ast::FunctionDecl::scopeLevel, scopeLevel );
+                } else {
+                        return functionDecl;
                 }
-                return mutDecl ? mutDecl : functionDecl;
         }