From: Andres Noetzli <andres.noetzli@gmail.com>
Date: Sat, 21 Apr 2018 06:15:03 +0000 (-0700)
Subject: Remove unused cache.h (#1795)
X-Git-Tag: cvc5-1.0.0~5131
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=583277b93d581e1de40b9df8468fe412ba293438;p=cvc5.git

Remove unused cache.h (#1795)
---

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 4867b775b..158464d76 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -22,7 +22,6 @@ libutil_la_SOURCES = \
 	bitvector.h \
 	bitvector.cpp \
 	bool.h \
-	cache.h \
 	cardinality.cpp \
 	cardinality.h \
 	channel.h \
diff --git a/src/util/cache.h b/src/util/cache.h
deleted file mode 100644
index 4f9af98a6..000000000
--- a/src/util/cache.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*********************                                                        */
-/*! \file cache.h
- ** \verbatim
- ** Top contributors (to current version):
- **   Morgan Deters, Paul Meng, Tim King
- ** This file is part of the CVC4 project.
- ** Copyright (c) 2009-2017 by the authors listed in the file AUTHORS
- ** in the top-level source directory) and their institutional affiliations.
- ** All rights reserved.  See the file COPYING in the top-level source
- ** directory for licensing information.\endverbatim
- **
- ** \brief A generic Cache<> template class for use by functions that
- ** walk the Node DAG and want to cache results for sub-DAGs
- **
- ** A generic Cache<> template class for use by functions that walk
- ** the Node DAG and want to cache results for sub-DAGs.
- **/
-
-#include "cvc4_private.h"
-
-#ifndef __CVC4__CACHE_H
-#define __CVC4__CACHE_H
-
-#include <functional>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-namespace CVC4 {
-
-/**
- * A generic implementation of a cache for functions that walk the
- * Node DAG performing a computation and want to cache some or all
- * computations.
- */
-template <class T, class U, class Hasher = std::hash<T> >
-class Cache {
-  typedef std::unordered_map<T, U, Hasher> Map;
-  Map d_map;
-  std::vector<T> d_current;
-  typename Map::iterator d_result;
-
-  // disallow copy/assignment
-  Cache(const Cache&) CVC4_UNDEFINED;
-  Cache& operator=(const Cache&) CVC4_UNDEFINED;
-
-public:
-
-  typedef T key_type;
-  typedef U value_type;
-  typedef Hasher hash_function;
-
-  /**
-   * Makes it easy and error-free to use a Cache<> in a function.
-   */
-  class Scope {
-    Cache& d_cache;
-    bool d_fired;
-
-  public:
-   Scope(Cache<T, U, Hasher>& cache, const T& elt)
-       : d_cache(cache), d_fired(d_cache.computing(elt))
-   {
-    }
-
-    ~Scope() {
-      if(!d_fired) {
-        d_cache();// pop stack
-      }
-    }
-
-    operator bool() const { return d_fired; }
-    const U& get() const
-    {
-      Assert(d_fired, "nothing in cache");
-      return d_cache.get();
-    }
-
-    U& operator()(U& computed)
-    {
-      Assert(!d_fired, "can only cache a computation once");
-      d_fired = true;
-      return d_cache(computed);
-    }
-    const U& operator()(const U& computed)
-    {
-      Assert(!d_fired, "can only cache a computation once");
-      d_fired = true;
-      return d_cache(computed);
-    }
-  };/* class Cache::Scope */
-
-  Cache() {}
-
-  bool computing(const T& elt) {
-    d_result = d_map.find(elt);
-    bool found = (d_result != d_map.end());
-    if(!found) {
-      d_current.push_back(elt);
-    }
-    return found;
-  }
-
-  const U& get() {
-    Assert(d_result != d_map.end());
-    return (*d_result).second;
-  }
-
-  // cache nothing (just pop)
-  void operator()() {
-    d_current.pop_back();
-  }
-
-  U& operator()(U& result) {
-    d_map.insert(d_current.back(), result);
-    d_current.pop_back();
-    return result;
-  }
-  const U& operator()(const U& result) {
-    d_map.insert(std::make_pair(d_current.back(), result));
-    d_current.pop_back();
-    return result;
-  }
-};/* class Cache<> */
-
-
-}/* CVC4 namespace */
-
-#endif /* __CVC4__CACHE_H */