minor fixes, plus experimental readline support in InteractiveShell

2 files changed, 25 insertions, 0 deletions

diff --git a/src/expr/command.cpp b/src/expr/command.cpp
index 48cf4ea93..d300b27de 100644
--- a/src/expr/command.cpp
+++ b/src/expr/command.cpp
@@ -158,6 +158,15 @@ void QueryCommand::toStream(std::ostream& out) const {
   out << "Query(" << d_expr << ')';
 }
 
+/* class QuitCommand */
+
+QuitCommand::QuitCommand() {
+}
+
+void QuitCommand::toStream(std::ostream& out) const {
+  out << "Quit()" << endl;
+}
+
 /* class CommandSequence */
 
 CommandSequence::CommandSequence() :
@@ -208,6 +217,14 @@ DeclarationCommand::DeclarationCommand(const std::vector<std::string>& ids, Type
   d_type(t) {
 }
 
+const std::vector<std::string>& DeclarationCommand::getDeclaredSymbols() const {
+  return d_declaredSymbols;
+}
+
+Type DeclarationCommand::getDeclaredType() const {
+  return d_type;
+}
+
 void DeclarationCommand::toStream(std::ostream& out) const {
   out << "Declare([";
   copy( d_declaredSymbols.begin(), d_declaredSymbols.end() - 1,
diff --git a/src/expr/command.h b/src/expr/command.h
index 585e60eb4..17736ed77 100644
--- a/src/expr/command.h
+++ b/src/expr/command.h
@@ -108,6 +108,8 @@ protected:
 public:
   DeclarationCommand(const std::string& id, Type t);
   DeclarationCommand(const std::vector<std::string>& ids, Type t);
+  const std::vector<std::string>& getDeclaredSymbols() const;
+  Type getDeclaredType() const;
   void toStream(std::ostream& out) const;
 };/* class DeclarationCommand */
 
@@ -276,6 +278,12 @@ public:
   void toStream(std::ostream& out) const;
 };/* class DatatypeDeclarationCommand */
 
+class CVC4_PUBLIC QuitCommand : public EmptyCommand {
+public:
+  QuitCommand();
+  void toStream(std::ostream& out) const;
+};/* class QuitCommand */
+
 class CVC4_PUBLIC CommandSequence : public Command {
 private:
   /** All the commands to be executed (in sequence) */