Changes in src/main.cc [37fe352:e523b07]

File:

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

src/main.cc

@@ -28 +28 @@
 #include <string>                           // for char_traits, operator<<
 
+#include "CompilationState.h"
 #include "../config.h"                      // for CFA_LIBDIR
 #include "CodeGen/FixMain.h"                // for FixMain
@@ -33 +34 @@
 #include "CodeGen/Generate.h"               // for generate
 #include "CodeTools/DeclStats.h"            // for printDeclStats
+#include "CodeTools/ResolvProtoDump.h"      // for dumpAsResolvProto
 #include "CodeTools/TrackLoc.h"             // for fillLocations
 #include "Common/CompilerError.h"           // for CompilerError
@@ -72 +74 @@
 DeclarationNode * parseTree = nullptr;                                  // program parse tree
 
-extern int yydebug;                                                                             // set for -g flag (Grammar)
-bool
-        astp = false,
-        bresolvep = false,
-        bboxp = false,
-        bcodegenp = false,
-        ctorinitp = false,
-        declstatsp = false,
-        exprp = false,
-        expraltp = false,
-        genericsp = false,
-        libcfap = false,
-        nopreludep = false,
-        noprotop = false,
-        nomainp = false,
-        parsep = false,
-        resolvep = false,                                                                       // used in AlternativeFinder
-        symtabp = false,
-        treep = false,
-        tuplep = false,
-        validp = false,
-        errorp = false,
-        codegenp = false,
-        prettycodegenp = false,
-        linemarks = false;
-
 std::string PreludeDirector = "";
 
@@ -196 +172 @@
                         if ( filename == nullptr ) filename = argv[ optind ];
                         // prelude filename comes in differently
-                        if ( libcfap ) filename = "prelude.cf";
+                        if ( libcfap ) filename = "prelude.cfa";
                         optind += 1;
                 } else {                                                                                // no input file name
@@ -223 +199 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cf").c_str(), "r" );
-                                assertf( prelude, "cannot open prelude.cf\n" );
+                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cfa").c_str(), "r" );
+                                assertf( prelude, "cannot open prelude.cfa\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );
 
@@ -296 +272 @@
                 CodeTools::fillLocations( translationUnit );
 
+                if ( resolvprotop ) {
+                        CodeTools::dumpAsResolvProto( translationUnit );
+                        return 0;
+                }
+
                 PASS( "resolve", ResolvExpr::resolve( translationUnit ) );
                 if ( exprp ) {
@@ -303 +284 @@
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
+                PASS( "fixInit", InitTweak::fix( translationUnit, buildingLibrary() ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
@@ -401 +382 @@
 
 void parse_cmdline( int argc, char * argv[], const char *& filename ) {
-        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, PreludeDir, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
+        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, PreludeDir, Prototypes, Resolver, ResolvProto, Symbol, Tree, TupleExpansion, Validate, };
 
         static struct option long_opts[] = {
@@ -420 +401 @@
                 { "no-prototypes", no_argument, 0, Prototypes },
                 { "resolver", no_argument, 0, Resolver },
+                { "resolv-proto", no_argument, 0, ResolvProto },
                 { "symbol", no_argument, 0, Symbol },
                 { "tree", no_argument, 0, Tree },
@@ -432 +414 @@
         bool Wsuppress = false, Werror = false;
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrRstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -504 +486 @@
                   case 'r':                                                                             // print resolver steps
                         resolvep = true;
+                        break;
+                        case 'R':                                                                               // dump resolv-proto instance
+                        resolvprotop = true;
                         break;
                   case Symbol: