Changes in src/main.cc [6cf27a07:e497c1d]

File:

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

src/main.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// main.cc --
+// main.cc -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 15:23:11 2016
-// Update Count     : 209
+// Last Modified By : Rob Schluntz
+// Last Modified On : Tue Jul 28 13:05:02 2015
+// Update Count     : 165
 //
 
@@ -40 +40 @@
 #include "MakeLibCfa.h"
 #include "InitTweak/Mutate.h"
-#include "InitTweak/GenInit.h"
-#include "InitTweak/FixInit.h"
+#include "InitTweak/RemoveInit.h"
 //#include "Explain/GenProlog.h"
 //#include "Try/Visit.h"
 
-#include "Common/SemanticError.h"
-#include "Common/UnimplementedError.h"
+#include "SemanticError.h"
+#include "UnimplementedError.h"
 
 #include "../config.h"
@@ -56 +55 @@
 
 static void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
-static void dump( std::list< Declaration * > & translationUnit, std::ostream & out = std::cout );
+static void dump( std::list< Declaration * > & translationUnit );
 
 bool
         astp = false,
         bresolvep = false,
-        bboxp = false,
-        ctorinitp = false,
         exprp = false,
         expraltp = false,
@@ -72 +69 @@
         resolvep = false,                                                                       // used in AlternativeFinder
         symtabp = false,
-        treep = false,
         validp = false,
         errorp = false,
         codegenp = false;
 
-enum { Ast, Bbox, Bresolver, CtorInitFix, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Tree, Validate, };
+enum { Ast, Bresolver, Expr, ExprAlt, Grammar, LibCFA, Nopreamble, Parse, Prototypes, Resolver, Symbol, Validate, };
 
 static struct option long_opts[] = {
         { "ast", no_argument, 0, Ast },
-        { "before-box", no_argument, 0, Bbox },
         { "before-resolver", no_argument, 0, Bresolver },
-        { "ctorinitfix", no_argument, 0, CtorInitFix },
         { "expr", no_argument, 0, Expr },
         { "expralt", no_argument, 0, ExprAlt },
@@ -93 +87 @@
         { "resolver", no_argument, 0, Resolver },
         { "symbol", no_argument, 0, Symbol },
-        { "tree", no_argument, 0, Tree },
         { "validate", no_argument, 0, Validate },
         { 0, 0, 0, 0 }
@@ -102 +95 @@
         std::ostream *output = &std::cout;
         int long_index;
-        std::list< Declaration * > translationUnit;
-        const char *filename = NULL;
+        std::list< Declaration* > translationUnit;
 
         opterr = 0;                                                                                     // prevent getopt from printing error messages
-
+        
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcefglnpqrstvyzD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abefglnpqrsvyzD:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -118 +110 @@
                         bresolvep = true;
                         break;
-                  case 'B':                                                                             // print before resolver steps
-                        bboxp = true;
-                        break;
-                  case CtorInitFix:
-                  case 'c':
-                        ctorinitp = true;
-                        break;
                   case Expr:
                   case 'e':                                                                             // dump AST after expression analysis
@@ -161 +146 @@
                         symtabp = true;
                         break;
-                  case Tree:
-                  case 't':                                                                             // build in tree
-                        treep = true;
-                        break;
                   case 'v':                                                                             // dump AST after decl validation pass
                         validp = true;
@@ -176 +157 @@
                   case 'D':                                                                             // ignore -Dxxx
                         break;
-                  case 'F':                                                                             // source file-name without suffix
-                        filename = optarg;
-                        break;
                   case '?':
                         cout << "Unknown option: '" << (char)optopt << "'" << endl;
-                        exit( EXIT_FAILURE );
+                        exit(1);
                   default:
                         abort();
@@ -192 +170 @@
                         input = fopen( argv[ optind ], "r" );
                         if ( ! input ) {
-                                std::cout << "Error: can't open " << argv[ optind ] << std::endl;
-                                exit( EXIT_FAILURE );
+                                std::cout << "Error: can't open " << argv[optind] << std::endl;
+                                exit( 1 );
                         } // if
-                        // if running cfa-cpp directly, might forget to pass -F option (and really shouldn't have to)
-                        if ( filename == NULL ) filename = argv[ optind ];
-                        // prelude filename comes in differently
-                        if ( libcfap ) filename = "prelude.cf";
                         optind += 1;
                 } else {
                         input = stdin;
-                        // if running cfa-cpp directly, might forget to pass -F option. Since this takes from stdin, pass
-                        // a fake name along
-                        if ( filename == NULL ) filename = "stdin";
                 } // if
 
@@ -210 +181 @@
                         output = new ofstream( argv[ optind ] );
                 } // if
-
+        
                 Parser::get_parser().set_debug( grammarp );
 
-                // read in the builtins, extras, and the prelude
+                // read in the builtins and the prelude
                 if ( ! nopreludep ) {                                                   // include gcc builtins
-                        // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
-                        FILE * builtins = fopen( libcfap | treep ? "builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                        FILE * builtins = fopen( CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
-                                std::cerr << "Error: can't open builtins.cf" << std::endl;
-                                exit( EXIT_FAILURE );
+                                std::cerr << "Error: can't open builtins" << std::endl;
+                                exit( 1 );
                         } // if
+
                         parse( builtins, LinkageSpec::Compiler );
 
-                        // read the extra prelude in, if not generating the cfa library
-                        FILE * extras = fopen( libcfap | treep ? "extras.cf" : CFA_LIBDIR "/extras.cf", "r" );
-                        if ( extras == NULL ) {
-                                std::cerr << "Error: can't open extras.cf" << std::endl;
-                                exit( EXIT_FAILURE );
+                        if ( ! libcfap ) {
+                                // read the prelude in, if we're not generating the cfa library
+                                FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
+                                if ( prelude == NULL ) {
+                                        std::cerr << "Error: can't open prelude" << std::endl;
+                                        exit( 1 );
+                                } // if
+                    
+                    parse( prelude, LinkageSpec::Intrinsic );
                         } // if
-                        parse( extras, LinkageSpec::C );
-
-                        if ( ! libcfap ) {
-                                // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( treep ? "prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
-                                if ( prelude == NULL ) {
-                                        std::cerr << "Error: can't open prelude.cf" << std::endl;
-                                        exit( EXIT_FAILURE );
-                                } // if
-
-                                parse( prelude, LinkageSpec::Intrinsic );
-                        } // if
-                } // if
-
-                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );
-
+                } // if
+
+                if ( libcfap ) {
+                        parse( input, LinkageSpec::Intrinsic ); 
+                } else {
+                        parse( input, LinkageSpec::Cforall, grammarp ); 
+                }
+  
                 if ( parsep ) {
                         Parser::get_parser().get_parseTree()->printList( std::cout );
@@ -259 +226 @@
                 } // if
 
-                // add the assignment statement after the initialization of a type parameter
+                // add the assignment statement after the 
+                // initialization of a type parameter
                 OPTPRINT( "validate" )
                 SymTab::validate( translationUnit, symtabp );
@@ -279 +247 @@
                 OPTPRINT( "mutate" )
                 ControlStruct::mutate( translationUnit );
-                OPTPRINT( "fixNames" )
+                OPTPRINT( "fixNames" ) 
                 CodeGen::fixNames( translationUnit );
-                OPTPRINT( "tweakInit" )
-                InitTweak::genInit( translationUnit );
+                OPTPRINT( "tweak" )
+                InitTweak::tweak( translationUnit );
 
                 if ( libcfap ) {
@@ -298 +266 @@
                 if ( exprp ) {
                         dump( translationUnit );
-                        return 0;
-                }
-
-                // fix ObjectDecl - replaces ConstructorInit nodes
-                OPTPRINT( "fixInit" )
-                InitTweak::fix( translationUnit, filename, libcfap || treep );
-                if ( ctorinitp ) {
-                        dump ( translationUnit );
-                        return 0;
                 }
 
@@ -312 +271 @@
                 GenPoly::copyParams( translationUnit );
                 OPTPRINT( "convertSpecializations" )
-                GenPoly::convertSpecializations( translationUnit );
+                GenPoly::convertSpecializations( translationUnit );             
                 OPTPRINT( "convertLvalue" )
                 GenPoly::convertLvalue( translationUnit );
-
-                if ( bboxp ) {
-                        dump( translationUnit );
-                        return 0;
-                }
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
@@ -336 +290 @@
         } catch ( SemanticError &e ) {
                 if ( errorp ) {
-                        std::cerr << "---AST at error:---" << std::endl;
-                        dump( translationUnit, std::cerr );
-                        std::cerr << std::endl << "---End of AST, begin error message:---\n" << std::endl;
+                        dump( translationUnit );
                 }
                 e.print( std::cerr );
@@ -360 +312 @@
         } // try
 
-        deleteAll( translationUnit );
         return 0;
 } // main
@@ -378 +329 @@
 }
 
-static void dump( std::list< Declaration * > & translationUnit, std::ostream & out ) {
+static void dump( std::list< Declaration * > & translationUnit ) {
         std::list< Declaration * > decls;
         if ( noprotop ) {
-                filter( translationUnit.begin(), translationUnit.end(),
+                filter( translationUnit.begin(), translationUnit.end(), 
                                 std::back_inserter( decls ), notPrelude );
         } else {
@@ -387 +338 @@
         }
 
-        printAll( decls, out );
-        deleteAll( translationUnit );
+        printAll( decls, std::cout );
 }