Changes in src/main.cc [ebcc940:d08beee]

File:

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

src/main.cc

@@ -37 +37 @@
 #include "CodeTools/TrackLoc.h"             // for fillLocations
 #include "Common/CompilerError.h"           // for CompilerError
-#include "Common/Stats.h"
+#include "Common/Heap.h"
 #include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"           // for SemanticError
@@ -67 +67 @@
 #define PASS(name, pass)                   \
         if ( errorp ) { cerr << name << endl; } \
-        Stats::Heap::newPass(name);               \
+        HeapStats::newPass(name);               \
         pass;
 
@@ -377 +377 @@
 
         deleteAll( translationUnit );
-        if(!libcfap && !treep) {
-                if(stats_counters) Stats::Counters::print();
-                if(stats_heap) Stats::Heap::print();
-        }
-
+        if(!libcfap && !treep) HeapStats::printStats();
         return 0;
 } // main
 
 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, ResolvProto, Stats, 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[] = {
@@ -406 +402 @@
                 { "resolver", no_argument, 0, Resolver },
                 { "resolv-proto", no_argument, 0, ResolvProto },
-                { "stats", required_argument, 0, Stats },
                 { "symbol", no_argument, 0, Symbol },
                 { "tree", no_argument, 0, Tree },
@@ -494 +489 @@
                   case 'R':                                                                             // dump resolv-proto instance
                         resolvprotop = true;
-                        break;
-                  case Stats:
-                        {
-                                std::stringstream ss(optarg);
-                                while(ss.good()) {
-                                        std::string substr;
-                                        getline( ss, substr, ',' );
-                                        if(substr == "counters") {
-                                                stats_counters = true;
-                                        } else if(substr == "heap") {
-                                                stats_heap = true;
-                                        } else if(substr == "none") {
-                                                stats_counters = false;
-                                                stats_heap = false;
-                                        } else {
-                                                std::cerr << "Ignoring unknown statistic " << substr << std::endl;
-                                        }
-                                }
-
-                        }
                         break;
                   case Symbol: