Changes in src/CodeGen/FixMain.cc [61efa42:c6b4432]

File:

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

src/CodeGen/FixMain.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixMain.cc -- Tools to change a Cforall main into a C main.
+// FixMain.cc --
 //
 // Author           : Thierry Delisle
@@ -33 +33 @@
 namespace {
 
-struct FindMainCore final {
+struct FindMainCore_new {
         ast::FunctionDecl const * main_declaration = nullptr;
 
         void previsit( ast::FunctionDecl const * decl ) {
-                if ( isMain( decl ) ) {
+                if ( FixMain::isMain( decl ) ) {
                         if ( main_declaration ) {
                                 SemanticError( decl, "Multiple definition of main routine\n" );
@@ -106 +106 @@
 }
 
-struct FixLinkageCore final {
-        ast::Linkage::Spec const spec;
-        FixLinkageCore( ast::Linkage::Spec spec ) : spec( spec ) {}
-
-        ast::FunctionDecl const * previsit( ast::FunctionDecl const * decl ) {
-                if ( decl->name != "main" ) return decl;
-                return ast::mutate_field( decl, &ast::FunctionDecl::linkage, spec );
-        }
-};
-
 } // namespace
 
-bool isMain( const ast::FunctionDecl * decl ) {
+bool FixMain::isMain( const ast::FunctionDecl * decl ) {
         if ( std::string("main") != decl->name ) {
                 return false;
@@ -125 +115 @@
 }
 
-void fixMainLinkage( ast::TranslationUnit & translationUnit,
-                bool replace_main ) {
-        ast::Linkage::Spec const spec =
-                ( replace_main ) ? ast::Linkage::Cforall : ast::Linkage::C;
-        ast::Pass<FixLinkageCore>::run( translationUnit, spec );
-}
-
-void fixMainInvoke( ast::TranslationUnit & translationUnit,
+void FixMain::fix( ast::TranslationUnit & translationUnit,
                 std::ostream &os, const char * bootloader_filename ) {
 
-        ast::Pass<FindMainCore> main_finder;
+        ast::Pass<FindMainCore_new> main_finder;
         ast::accept_all( translationUnit, main_finder );
         if ( nullptr == main_finder.core.main_declaration ) return;