Changeset 8d182b1 for src/CodeGen/FixNames.cc

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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

File:

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

src/CodeGen/FixNames.cc

@@ -22 +22 @@
 #include "AST/Expr.hpp"
 #include "AST/Pass.hpp"
-#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "FixMain.h"               // for FixMain
 #include "SymTab/Mangler.h"        // for Mangler
-#include "SynTree/LinkageSpec.h"   // for Cforall, isMangled
-#include "SynTree/Constant.h"      // for Constant
-#include "SynTree/Declaration.h"   // for FunctionDecl, ObjectDecl, Declarat...
-#include "SynTree/Expression.h"    // for ConstantExpr
-#include "SynTree/Label.h"         // for Label, noLabels
-#include "SynTree/Statement.h"     // for ReturnStmt, CompoundStmt
-#include "SynTree/Type.h"          // for Type, BasicType, Type::Qualifiers
-#include "SynTree/Visitor.h"       // for Visitor, acceptAll
 #include "CompilationState.h"
 
 namespace CodeGen {
-        class FixNames : public WithGuards {
-          public:
-                void postvisit( ObjectDecl *objectDecl );
-                void postvisit( FunctionDecl *functionDecl );
 
-                void previsit( CompoundStmt *compoundStmt );
-          private:
-                int scopeLevel = 1;
-
-                void fixDWT( DeclarationWithType *dwt );
-        };
-
-        void fixNames( std::list< Declaration* > & translationUnit ) {
-                PassVisitor<FixNames> fixer;
-                acceptAll( translationUnit, fixer );
-        }
-
-        void FixNames::fixDWT( DeclarationWithType * dwt ) {
-                if ( dwt->get_name() != "" ) {
-                        if ( LinkageSpec::isMangled( dwt->get_linkage() ) ) {
-                                if (!useNewAST) {
-                                        dwt->set_mangleName( SymTab::Mangler::mangle( dwt ) );
-                                }
-                                dwt->set_scopeLevel( scopeLevel );
-                        } // if
-                } // if
-        }
-
-        void FixNames::postvisit( ObjectDecl * objectDecl ) {
-                fixDWT( objectDecl );
-        }
-
-        void FixNames::postvisit( FunctionDecl * functionDecl ) {
-                fixDWT( functionDecl );
-
-                if ( FixMain::isMain( functionDecl ) ) {
-                        int nargs = functionDecl->get_functionType()->get_parameters().size();
-                        if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
-                                SemanticError(functionDecl, "Main expected to have 0, 2 or 3 arguments\n");
-                        }
-                        functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( new ConstantExpr( Constant::from_int( 0 ) ) ) );
-                }
-        }
-
-        void FixNames::previsit( CompoundStmt * ) {
-                scopeLevel++;
-                GuardAction( [this](){ scopeLevel--; } );
-        }
+namespace {
 
 /// Does work with the main function and scopeLevels.
-class FixNames_new final {
+class FixNames final {
         int scopeLevel = 1;
 
@@ -103 +48 @@
 
         const ast::FunctionDecl *postvisit( const ast::FunctionDecl *functionDecl ) {
-                if ( FixMain::isMain( functionDecl ) ) {
+                if ( isMain( functionDecl ) ) {
                         auto mutDecl = ast::mutate( functionDecl );
 
@@ -138 +83 @@
 };
 
+} // namespace
+
 void fixNames( ast::TranslationUnit & translationUnit ) {
-        ast::Pass<FixNames_new>::run( translationUnit );
+        ast::Pass<FixNames>::run( translationUnit );
 }