Commands and the eclipse C++ project settings.

diff --git a/.cproject b/.cproject
new file mode 100644 (file)
index 0000000..1f07c09
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<buildSystem id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916">
+<storageModule id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916" moduleId="org.eclipse.cdt.core.settings"/>
+</buildSystem>
+<cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916">
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration buildProperties="" description="Default Compile Mode" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+<folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916." name="/" resourcePath="">
+<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1059693132" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1059693132.1347347451" name=""/>
+<builder id="org.eclipse.cdt.build.core.settings.default.builder.2117011086" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1626792335" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1709197603" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1475463766" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.835106183" name="UPC" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1433577222" languageId="org.eclipse.cdt.core.parser.upc.upc" languageName="UPC" sourceContentType="org.eclipse.cdt.core.parser.upc.upcSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1820868999" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.81842681" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1138692275" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1285337363" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration"/>
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916" moduleId="org.eclipse.cdt.core.settings" name="Default">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cconfiguration>
+<cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916.1183369816">
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration buildProperties="" description="Build the parser" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916.1183369816" name="Parser" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+<folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916.1183369816." name="/" resourcePath="">
+<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.137865064" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.137865064.690995676" name=""/>
+<builder buildPath="${workspace_loc:/cvc4/src/parser}" id="org.eclipse.cdt.build.core.settings.default.builder.13571035" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+<tool id="org.eclipse.cdt.build.core.settings.holder.libs.295833049" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+<tool id="org.eclipse.cdt.build.core.settings.holder.836295828" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2114628394" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1316224646" name="UPC" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1557914541" languageId="org.eclipse.cdt.core.parser.upc.upc" languageName="UPC" sourceContentType="org.eclipse.cdt.core.parser.upc.upcSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.422183358" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.479022148" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+<tool id="org.eclipse.cdt.build.core.settings.holder.1655487482" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.450208448" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+</tool>
+</toolChain>
+</folderInfo>
+</configuration>
+</storageModule>
+<storageModule moduleId="scannerConfiguration"/>
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1665182916.1183369816" moduleId="org.eclipse.cdt.core.settings" name="Parser">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="cvc4.null.233072613" name="cvc4"/>
+</storageModule>
+</cproject>

diff --git a/src/util/command.cpp b/src/util/command.cpp
index db03a91896a6f068dd38e31083561ad38d63339b..b728a2228a325410ef9fda8416bf816ef4da6e37 100644 (file)
--- a/src/util/command.cpp
+++ b/src/util/command.cpp
@@ -1,18 +1,45 @@
-/*********************                                           -*- C++ -*-  */
-/** command.cpp
- ** This file is part of the CVC4 prototype.
- ** Copyright (c) 2009 The Analysis of Computer Systems Group (ACSys)
- ** Courant Institute of Mathematical Sciences
- ** New York University
- ** See the file COPYING in the top-level source directory for licensing
- ** information.
- **
- **/
+/*
+ * command.cpp
+ *
+ *  Created on: Nov 25, 2009
+ *      Author: dejan
+ */
 
-#include "util/command.h"
-#include "smt/smt_engine.h"
+#include "command.h"
 
-namespace CVC4 {
+using namespace CVC4;
 
+AssertCommand::AssertCommand(const Expr& e) :
+  d_expr(e)
+{
+}
+
+void AssertCommand::invoke(CVC4::SmtEngine* smt_engine)
+{
+  smt_engine->assert(d_expr);
+}
+
+CheckSatCommand::CheckSatCommand()
+{
+}
+
+CheckSatCommand::CheckSatCommand(const Expr& e):
+    d_expr(e)
+{
+}
+
+void CheckSatCommand::invoke(CVC4::SmtEngine* smt_engine)
+{
+  smt_engine->checkSat(d_expr);
+}
+
+QueryCommand::QueryCommand(const Expr& e):
+    d_expr(e)
+{
+}
+
+void QueryCommand::invoke(CVC4::SmtEngine* smt_engine)
+{
+  smt_engine->query(d_expr);
+}
 
-}/* CVC4 namespace */

diff --git a/src/util/command.h b/src/util/command.h
index 6de87c9f26904d24748489dfa151b82c6d12979d..745f6f5e2429d3cbf160fca894a7b83de9214178 100644 (file)
--- a/src/util/command.h
+++ b/src/util/command.h
@@ -13,46 +13,45 @@
 #define __CVC4__COMMAND_H
 
 #include "expr/expr.h"
-#include "smt/smt_engine.h"
 
-namespace CVC4 {
+namespace CVC4
+{
 
-class Command {
-protected:
-  SmtEngine* d_smt;
+class SmtEngine;
 
-public:
-  Command(CVC4::SmtEngine* smt) : d_smt(smt) {}
-  SmtEngine* getSmtEngine() { return d_smt; }
-  virtual void invoke() = 0;
+class Command
+{
+  public:
+    virtual void invoke(CVC4::SmtEngine* smt_engine) = 0;
+    virtual ~Command() {}
 };
 
-class AssertCommand : public Command {
-protected:
-  Expr d_expr;
-
-public:
-  AssertCommand(CVC4::SmtEngine* smt, const Expr& e) : Command(smt), d_expr(e) {}
-  void invoke() { d_smt->assert(d_expr); }
+class AssertCommand: public Command
+{
+  public:
+    AssertCommand(const Expr& e);
+    void invoke(CVC4::SmtEngine* smt_engine);
+  protected:
+    Expr d_expr;
 };
 
-class CheckSatCommand : public Command {
-protected:
-  Expr d_expr;
-
-public:
-  CheckSatCommand(CVC4::SmtEngine* smt) : Command(smt), d_expr(Expr::null()) {}
-  CheckSatCommand(CVC4::SmtEngine* smt, const Expr& e) : Command(smt), d_expr(e) {}
-  void invoke() { d_smt->checkSat(d_expr); }
+class CheckSatCommand: public Command
+{
+  public:
+    CheckSatCommand();
+    CheckSatCommand(const Expr& e);
+    void invoke(CVC4::SmtEngine* smt);
+  protected:
+    Expr d_expr;
 };
 
-class QueryCommand : public Command {
-protected:
-  Expr d_expr;
-
-public:
-  QueryCommand(CVC4::SmtEngine* smt, const Expr& e) : Command(smt), d_expr(e) {}
-  void invoke() { d_smt->query(d_expr); }
+class QueryCommand: public Command
+{
+  public:
+    QueryCommand(const Expr& e);
+    void invoke(CVC4::SmtEngine* smt);
+  protected:
+    Expr d_expr;
 };
 
 }/* CVC4 namespace */