Changeset f2f595d7

Timestamp:

Feb 16, 2023, 10:49:05 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

cad9edb

Parents:

d3bffdb

Message:

RunParser? now uses AST for its interface everywhere. (Works because LinkageSpec::Spec and ast::Linkage::Spec have the same layout.)

Location:

src

Files:

• Parser/RunParser.cpp (modified) (2 diffs)
• Parser/RunParser.hpp (modified) (3 diffs)
• main.cc (modified) (4 diffs)

src/Parser/RunParser.cpp ¶

@@ -10 +10 @@
 // Created On       : Mon Dec 19 11:00:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Dec 22 10:18:00 2022
-// Update Count     : 1
+// Last Modified On : Thr Feb 16 10:08:00 2023
+// Update Count     : 2
 //
 
@@ -24 +24 @@
 
 // Variables global to the parsing code.
-LinkageSpec::Spec linkage = LinkageSpec::Cforall;
+ast::Linkage::Spec linkage = ast::Linkage::Cforall;
 TypedefTable typedefTable;
 DeclarationNode * parseTree = nullptr;
 
-void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit ) {
+void parse( FILE * input, ast::Linkage::Spec linkage, bool alwaysExit ) {
         extern int yyparse( void );
         extern FILE * yyin;

src/Parser/RunParser.hpp ¶

@@ -10 +10 @@
 // Created On       : Mon Dec 19 10:42:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Dec 22 10:23:00 2022
-// Update Count     : 1
+// Last Modified On : Thr Feb 16 10:08:00 2023
+// Update Count     : 2
 //
 
@@ -18 +18 @@
 #include <iosfwd>                           // for ostream
 
-#include "SynTree/LinkageSpec.h"            // for Spec
+#include "AST/LinkageSpec.hpp"              // for Spec
 namespace ast {
         class TranslationUnit;
@@ -29 +29 @@
 /// The input file is closed when complete. Exits instead of returning on
 /// error or if alwaysExit is true.
-void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit = false );
+void parse( FILE * input, ast::Linkage::Spec linkage, bool alwaysExit = false );
 
 /// Drain the internal accumulator of parsed code and build a translation

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 ) );