Changeset a758169 for src

Timestamp:

Jul 17, 2024, 1:16:36 PM (6 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

6804f38

Parents:

0097d08

Message:

In main: cleaned up a macro and updated some names.

File:

• src/main.cpp (modified) (11 diffs)

src/main.cpp

@@ -113 +113 @@
 #define DUMP( cond, unit )                  \
         if ( cond ) {                           \
-                dump(unit);                         \
+                dump( std::move( unit ) );          \
                 return EXIT_SUCCESS;                \
         }
@@ -279 +279 @@
                         // Read to gcc builtins, if not generating the cfa library
                         FILE * gcc_builtins = fopen( (PreludeDirector + "/gcc-builtins.cfa").c_str(), "r" );
-                        assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
+                        assertf( gcc_builtins, "cannot open gcc-builtins.cfa\n" );
                         parse( gcc_builtins, ast::Linkage::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
                         FILE * extras = fopen( (PreludeDirector + "/extras.cfa").c_str(), "r" );
-                        assertf( extras, "cannot open extras.cf\n" );
+                        assertf( extras, "cannot open extras.cfa\n" );
                         parse( extras, ast::Linkage::BuiltinC );
                         if ( ! libcfap ) {
@@ -294 +294 @@
                                 // Read to cfa builtins, if not generating the cfa library
                                 FILE * builtins = fopen( (PreludeDirector + "/builtins.cfa").c_str(), "r" );
-                                assertf( builtins, "cannot open builtins.cf\n" );
+                                assertf( builtins, "cannot open builtins.cfa\n" );
                                 parse( builtins, ast::Linkage::BuiltinCFA );
                         } // if
@@ -303 +303 @@
                 transUnit = buildUnit();
 
-                DUMP( astp, std::move( transUnit ) );
+                DUMP( astp, transUnit );
 
                 Stats::Time::StopBlock();
@@ -310 +310 @@
 
                 PASS( "Translate Exception Declarations", ControlStruct::translateExcept, transUnit );
-                DUMP( exdeclp, std::move( transUnit ) );
+                DUMP( exdeclp, transUnit );
                 PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign, transUnit );
                 PASS( "Replace Typedefs", Validate::replaceTypedef, transUnit );
@@ -353 +353 @@
                 } // if
 
-                DUMP( validp, std::move( transUnit ) );
+                DUMP( validp, transUnit );
 
                 PASS( "Translate Throws", ControlStruct::translateThrows, transUnit );
@@ -372 +372 @@
                 } // if
 
-                DUMP( bresolvep, std::move( transUnit ) );
+                DUMP( bresolvep, transUnit );
 
                 if ( resolvprotop ) {
@@ -380 +380 @@
 
                 PASS( "Resolve", ResolvExpr::resolve, transUnit );
-                DUMP( exprp, std::move( transUnit ) );
+                DUMP( exprp, transUnit );
                 PASS( "Fix Init", InitTweak::fix, transUnit, buildingLibrary() ); // Here
                 PASS( "Erase With", ResolvExpr::eraseWith, transUnit );
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                DUMP( ctorinitp, std::move( transUnit ) );
+                DUMP( ctorinitp, transUnit );
 
                 // Currently not working due to unresolved issues with UniqueExpr
@@ -398 +398 @@
 
                 PASS( "Expand Tuples", Tuples::expandTuples, transUnit );
-                DUMP( tuplep, std::move( transUnit ) );
+                DUMP( tuplep, transUnit );
 
                 // Must come after Translate Tries.
@@ -404 +404 @@
 
                 PASS( "Instantiate Generics", GenPoly::instantiateGeneric, transUnit );
-                DUMP( genericsp, std::move( transUnit ) );
+                DUMP( genericsp, transUnit );
 
                 PASS( "Convert L-Value", GenPoly::convertLvalue, transUnit );
-                DUMP( bboxp, std::move( transUnit ) );
+                DUMP( bboxp, transUnit );
                 PASS( "Box", GenPoly::box, transUnit );
                 PASS( "Link-Once", CodeGen::translateLinkOnce, transUnit );
@@ -413 +413 @@
                 // Code has been lowered to C, now we can start generation.
 
-                DUMP( bcodegenp, std::move( transUnit ) );
+                DUMP( bcodegenp, transUnit );
 
                 if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name