6 files changed, 26 insertions, 17 deletions
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 3b2ccb05a..8f400241b 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall
+AM_CXXFLAGS = -Wall -fvisibility=hidden
 
 bin_PROGRAMS = cvc4
 
diff --git a/src/main/about.h b/src/main/about.h
index f582debf0..e02183ba7 100644
--- a/src/main/about.h
+++ b/src/main/about.h
@@ -1,8 +1,8 @@
-#ifndef __CVC4_ABOUT_H
-#define __CVC4_ABOUT_H
+#ifndef __CVC4__MAIN__ABOUT_H
+#define __CVC4__MAIN__ABOUT_H
 
 namespace CVC4 {
-namespace Main {
+namespace main {
 
 const char about[] = "\
 This is a pre-release of CVC4.\n\
@@ -11,7 +11,7 @@ Copyright (C) 2009 The ACSys Group\n\
                    New York University\n\
 ";
 
-}/* CVC4::Main namespace */
+}/* CVC4::main namespace */
 }/* CVC4 namespace */
 
 #endif /* __CVC4_MAIN_H */
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 4850d475f..d2c6cb26d 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -36,6 +36,15 @@ int main(int argc, char *argv[]) {
         throw new Exception(string("Could not open input file `") + argv[firstArgIndex] + "' for reading: " + strerror(errno));
         exit(1);
       }
+
+      // ExprManager *exprMgr = ...;
+      // SmtEngine smt(exprMgr, &opts);
+      // Parser parser(infile, exprMgr, &opts);
+      // while(!parser.done) {
+      //   Command *cmd = parser.get();
+      //   cmd->invoke(smt);
+      //   delete cmd;
+      // }
     }
   } catch(CVC4::Main::OptionException* e) {
     if(opts.smtcomp_mode) {
diff --git a/src/main/main.h b/src/main/main.h
index 4101f4fe4..d0a517967 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -6,11 +6,11 @@
 #include "util/exception.h"
 #include "util/options.h"
 
-#ifndef __CVC4_MAIN_H
-#define __CVC4_MAIN_H
+#ifndef __CVC4__MAIN__MAIN_H
+#define __CVC4__MAIN__MAIN_H
 
 namespace CVC4 {
-namespace Main {
+namespace main {
 
 class OptionException : public CVC4::Exception {
 public:
@@ -20,7 +20,7 @@ public:
 int parseOptions(int argc, char** argv, CVC4::Options*) throw(CVC4::Exception*);
 void cvc4_init() throw();
 
-}/* CVC4::Main namespace */
+}/* CVC4::main namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4_MAIN_H */
+#endif /* __CVC4__MAIN__MAIN_H */
diff --git a/src/main/usage.h b/src/main/usage.h
index 971ba7640..edc9ad1d1 100644
--- a/src/main/usage.h
+++ b/src/main/usage.h
@@ -1,8 +1,8 @@
-#ifndef __CVC4_USAGE_H
-#define __CVC4_USAGE_H
+#ifndef __CVC4__MAIN__USAGE_H
+#define __CVC4__MAIN__USAGE_H
 
 namespace CVC4 {
-namespace Main {
+namespace main {
 
 // no more % chars in here without being escaped; it's used as a
 // printf() format string
@@ -23,7 +23,7 @@ CVC4 options:\n\
    --stats         give statistics on exit\n\
 ";
 
-}/* CVC4::Main namespace */
+}/* CVC4::main namespace */
 }/* CVC4 namespace */
 
-#endif /* __CVC4_USAGE_H */
+#endif /* __CVC4__MAIN__USAGE_H */
diff --git a/src/main/util.cpp b/src/main/util.cpp
index da4d4b0c0..63c8cc860 100644
--- a/src/main/util.cpp
+++ b/src/main/util.cpp
@@ -16,12 +16,12 @@ namespace Main {
 
 void sigint_handler(int sig, siginfo_t* info, void*) {
   fprintf(stderr, "CVC4 interrupted by user.\n");
-  exit(info->si_signo + 128);
+  abort();
 }
 
 void segv_handler(int sig, siginfo_t* info, void*) {
   fprintf(stderr, "CVC4 suffered a segfault.\n");
-  exit(info->si_signo + 128);
+  abort();
 }
 
 void cvc4_init() throw() {