Some items from the CVC4 public interface review:

* rename DeclarationScope to SymbolTable
* rename all HashStrategy -> HashFunction (which we often have anyways)
* remove CDCircList (no one is currently using it)

1 files changed, 163 insertions, 0 deletions

diff --git a/test/unit/expr/symbol_table_black.h b/test/unit/expr/symbol_table_black.h
new file mode 100644
index 000000000..89fbf42e8
--- /dev/null
+++ b/test/unit/expr/symbol_table_black.h
@@ -0,0 +1,163 @@
+/*********************                                                        */
+/*! \file symbol_table_black.h
+ ** \verbatim
+ ** Original author: cconway
+ ** Major contributors: none
+ ** Minor contributors (to current version): mdeters, dejan
+ ** This file is part of the CVC4 prototype.
+ ** Copyright (c) 2009, 2010, 2011  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.\endverbatim
+ **
+ ** \brief Black box testing of CVC4::SymbolTable
+ **
+ ** Black box testing of CVC4::SymbolTable.
+ **/
+
+#include <cxxtest/TestSuite.h>
+
+#include <sstream>
+#include <string>
+
+#include "context/context.h"
+#include "expr/symbol_table.h"
+#include "expr/expr_manager.h"
+#include "expr/expr.h"
+#include "expr/type.h"
+#include "util/Assert.h"
+#include "util/exception.h"
+
+using namespace CVC4;
+using namespace CVC4::kind;
+using namespace CVC4::context;
+using namespace std;
+
+class SymbolTableBlack : public CxxTest::TestSuite {
+private:
+
+  ExprManager* d_exprManager;
+
+public:
+
+  void setUp() {
+    try {
+      d_exprManager = new ExprManager;
+    } catch(Exception e) {
+      cerr << "Exception during setUp():" << endl << e;
+      throw;
+    }
+  }
+
+  void tearDown() {
+    try {
+      delete d_exprManager;
+    } catch(Exception e) {
+      cerr << "Exception during tearDown():" << endl << e;
+      throw;
+    }
+  }
+
+  void testBind() {
+    SymbolTable symtab;
+    Type booleanType = d_exprManager->booleanType();
+    Expr x = d_exprManager->mkVar(booleanType);
+    symtab.bind("x",x);
+    TS_ASSERT( symtab.isBound("x") );
+    TS_ASSERT_EQUALS( symtab.lookup("x"), x );
+  }
+
+  void testBind2() {
+    SymbolTable symtab;
+    Type booleanType = d_exprManager->booleanType();
+    // var name attribute shouldn't matter
+    Expr y = d_exprManager->mkVar("y", booleanType);
+    symtab.bind("x",y);
+    TS_ASSERT( symtab.isBound("x") );
+    TS_ASSERT_EQUALS( symtab.lookup("x"), y );
+  }
+
+  void testBind3() {
+    SymbolTable symtab;
+    Type booleanType = d_exprManager->booleanType();
+    Expr x = d_exprManager->mkVar(booleanType);
+    symtab.bind("x",x);
+    Expr y = d_exprManager->mkVar(booleanType);
+    // new binding covers old
+    symtab.bind("x",y);
+    TS_ASSERT( symtab.isBound("x") );
+    TS_ASSERT_EQUALS( symtab.lookup("x"), y );
+  }
+
+  void testBind4() {
+    SymbolTable symtab;
+    Type booleanType = d_exprManager->booleanType();
+    Expr x = d_exprManager->mkVar(booleanType);
+    symtab.bind("x",x);
+
+    Type t = d_exprManager->mkSort("T");
+    // duplicate binding for type is OK
+    symtab.bindType("x",t);
+
+    TS_ASSERT( symtab.isBound("x") );
+    TS_ASSERT_EQUALS( symtab.lookup("x"), x );
+    TS_ASSERT( symtab.isBoundType("x") );
+    TS_ASSERT_EQUALS( symtab.lookupType("x"), t );
+  }
+
+  void testBindType() {
+    SymbolTable symtab;
+    Type s = d_exprManager->mkSort("S");
+    symtab.bindType("S",s);
+    TS_ASSERT( symtab.isBoundType("S") );
+    TS_ASSERT_EQUALS( symtab.lookupType("S"), s );
+  }
+
+  void testBindType2() {
+    SymbolTable symtab;
+    // type name attribute shouldn't matter
+    Type s = d_exprManager->mkSort("S");
+    symtab.bindType("T",s);
+    TS_ASSERT( symtab.isBoundType("T") );
+    TS_ASSERT_EQUALS( symtab.lookupType("T"), s );
+  }
+
+  void testBindType3() {
+    SymbolTable symtab;
+    Type s = d_exprManager->mkSort("S");
+    symtab.bindType("S",s);
+    Type t = d_exprManager->mkSort("T");
+    // new binding covers old
+    symtab.bindType("S",t);
+    TS_ASSERT( symtab.isBoundType("S") );
+    TS_ASSERT_EQUALS( symtab.lookupType("S"), t );
+  }
+
+  void testPushScope() {
+    SymbolTable symtab;
+    Type booleanType = d_exprManager->booleanType();
+    Expr x = d_exprManager->mkVar(booleanType);
+    symtab.bind("x",x);
+    symtab.pushScope();
+
+    TS_ASSERT( symtab.isBound("x") );
+    TS_ASSERT_EQUALS( symtab.lookup("x"), x );
+
+    Expr y = d_exprManager->mkVar(booleanType);
+    symtab.bind("x",y);
+
+    TS_ASSERT( symtab.isBound("x") );
+    TS_ASSERT_EQUALS( symtab.lookup("x"), y );
+
+    symtab.popScope();
+    TS_ASSERT( symtab.isBound("x") );
+    TS_ASSERT_EQUALS( symtab.lookup("x"), x );
+  }
+
+  void testBadPop() {
+    SymbolTable symtab;
+    // TODO: What kind of exception gets thrown here?
+    TS_ASSERT_THROWS( symtab.popScope(), ScopeException );
+  }
+};/* class SymbolTableBlack */