Changeset 6726a3a for src/CodeGen

Timestamp:

Jul 20, 2022, 2:37:57 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

6bf35d1, e6662f5

Parents:

d677355 (diff), 2fd0de0 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/CodeGen

Files:

• FixNames.cc (modified) (4 diffs)
• FixNames.h (modified) (2 diffs)

src/CodeGen/FixNames.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.cc --
+// FixNames.cc -- Adjustments to typed declarations.
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct 29 15:49:00 2021
-// Update Count     : 23
+// Last Modified On : Wed Jul 20 11:49:00 2022
+// Update Count     : 24
 //
 
@@ -87 +87 @@
 
 /// Does work with the main function and scopeLevels.
-class FixNames_new : public ast::WithGuards {
+class FixNames_new final {
         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 ( 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;
         }
 
         void previsit( const ast::CompoundStmt * ) {
-                GuardValue( scopeLevel ) += 1;
+                scopeLevel += 1;
+        }
+
+        void postvisit( const ast::CompoundStmt * ) {
+                scopeLevel -= 1;
         }
 };

src/CodeGen/FixNames.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixNames.h --
+// FixNames.h -- Adjustments to typed declarations.
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
         /// mangles object and function names
         void fixNames( std::list< Declaration* > & translationUnit );
-        void fixNames( ast::TranslationUnit & translationUnit );
+/// Sets scope levels and fills in main's default return.
+void fixNames( ast::TranslationUnit & translationUnit );
 } // namespace CodeGen