Changes in src/main.cc [d3b7937:faf8857]

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jan 27 22:20:20 2016
-// Update Count     : 199
+// Last Modified On : Thu Dec 17 12:59:06 2015
+// Update Count     : 179
 //
 
@@ -45 +45 @@
 //#include "Try/Visit.h"
 
-#include "Common/SemanticError.h"
-#include "Common/UnimplementedError.h"
+#include "SemanticError.h"
+#include "UnimplementedError.h"
 
 #include "../config.h"
@@ -70 +70 @@
         resolvep = false,                                                                       // used in AlternativeFinder
         symtabp = false,
-        treep = false,
         validp = false,
         errorp = false,
         codegenp = false;
 
-enum { Ast, Bresolver, 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[] = {
@@ -89 +88 @@
         { "resolver", no_argument, 0, Resolver },
         { "symbol", no_argument, 0, Symbol },
-        { "tree", no_argument, 0, Tree },
         { "validate", no_argument, 0, Validate },
         { 0, 0, 0, 0 }
@@ -103 +101 @@
         
         int c;
-        while ( (c = getopt_long( argc, argv, "abefglnpqrstvyzD:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abefglnpqrsvyzD:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -148 +146 @@
                   case 's':                                                                             // print symbol table events
                         symtabp = true;
-                        break;
-                  case Tree:
-                  case 't':                                                                             // build in tree
-                        treep = true;
                         break;
                   case 'v':                                                                             // dump AST after decl validation pass
@@ -194 +188 @@
                 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( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
-                                std::cerr << "Error: can't open builtins.cf" << std::endl;
+                                std::cerr << "Error: can't open builtins" << std::endl;
                                 exit( 1 );
                         } // if
@@ -204 +198 @@
                         if ( ! libcfap ) {
                                 // read the prelude in, if not generating the cfa library
-                                FILE * prelude = fopen( treep ? "prelude.cf" : CFA_LIBDIR "/prelude.cf", "r" );
+                                FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
                                 if ( prelude == NULL ) {
-                                        std::cerr << "Error: can't open prelude.cf" << std::endl;
+                                        std::cerr << "Error: can't open prelude" << std::endl;
                                         exit( 1 );
                                 } // if