Changeset 1c80f20 for src/main.cc

Timestamp:

Feb 16, 2023, 3:10:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

f5f2768

Parents:

abcb393 (diff), 4b60b28 (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/main.cc (modified) (4 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Oct  5 12:06:00 2022
-// Update Count     : 679
+// Last Modified On : Thr Feb 16 10:08:00 2023
+// Update Count     : 680
 //
 
@@ -272 +272 @@
                         FILE * gcc_builtins = fopen( (PreludeDirector + "/gcc-builtins.cf").c_str(), "r" );
                         assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
-                        parse( gcc_builtins, LinkageSpec::Compiler );
+                        parse( gcc_builtins, ast::Linkage::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
                         FILE * extras = fopen( (PreludeDirector + "/extras.cf").c_str(), "r" );
                         assertf( extras, "cannot open extras.cf\n" );
-                        parse( extras, LinkageSpec::BuiltinC );
+                        parse( extras, ast::Linkage::BuiltinC );
 
                         if ( ! libcfap ) {
@@ -283 +283 @@
                                 FILE * prelude = fopen( (PreludeDirector + "/prelude.cfa").c_str(), "r" );
                                 assertf( prelude, "cannot open prelude.cfa\n" );
-                                parse( prelude, LinkageSpec::Intrinsic );
+                                parse( prelude, ast::Linkage::Intrinsic );
 
                                 // Read to cfa builtins, if not generating the cfa library
                                 FILE * builtins = fopen( (PreludeDirector + "/builtins.cf").c_str(), "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
-                                parse( builtins, LinkageSpec::BuiltinCFA );
-                        } // if
-                } // if
-
-                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, yydebug );
+                                parse( builtins, ast::Linkage::BuiltinCFA );
+                        } // if
+                } // if
+
+                parse( input, libcfap ? ast::Linkage::Intrinsic : ast::Linkage::Cforall, yydebug );
 
                 transUnit = buildUnit();
@@ -340 +340 @@
                 PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) );
 
-        PASS( "Implement Actors", Concurrency::implementActors( transUnit ) );
-
+                PASS( "Implement Actors", Concurrency::implementActors( transUnit ) );
                 PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) );
                 PASS( "Implement Thread Start", Concurrency::implementThreadStarter( transUnit ) );