Minor fixes to various parts of CVC4, including the removal of the uintptr_t constructors for Type and Expr (which existed due to ANTLR limitations). These issues are now handled (as a hack, due to said limitations) in the parser rather than the CVC4 core.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/interactive_shell.cpp b/src/main/interactive_shell.cpp
index cf04dacdf..707fc0ef3 100644
--- a/src/main/interactive_shell.cpp
+++ b/src/main/interactive_shell.cpp
@@ -130,7 +130,7 @@ Command* InteractiveShell::readCommand() {
     throw ParserException("Interactive input broken.");
   }
 
-  char* lineBuf;
+  char* lineBuf = NULL;
   string input;
   stringbuf sb;
   string line;
@@ -138,12 +138,12 @@ Command* InteractiveShell::readCommand() {
   /* Prompt the user for input. */
   if(d_usingReadline) {
 #if HAVE_LIBREADLINE
-  lineBuf = ::readline("CVC4> ");
-  if(lineBuf != NULL && lineBuf[0] != '\0') {
-    ::add_history(lineBuf);
-  }
-  line = lineBuf == NULL ? "" : lineBuf;
-  free(lineBuf);
+    lineBuf = ::readline("CVC4> ");
+    if(lineBuf != NULL && lineBuf[0] != '\0') {
+      ::add_history(lineBuf);
+    }
+    line = lineBuf == NULL ? "" : lineBuf;
+    free(lineBuf);
 #endif /* HAVE_LIBREADLINE */
   } else {
     d_out << "CVC4> " << flush;