From 3e2a8562b4f76bfe8b43d066bcf18dab0fa6631e Mon Sep 17 00:00:00 2001 From: Andres Noetzli Date: Wed, 15 Aug 2018 11:46:31 -0700 Subject: [PATCH] Remove unused class DynamicArray (#2312) --- src/util/Makefile.am | 1 - src/util/dynamic_array.h | 150 --------------------------------------- 2 files changed, 151 deletions(-) delete mode 100644 src/util/dynamic_array.h diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 297d96208..04d0a5b02 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -29,7 +29,6 @@ libutil_la_SOURCES = \ dense_map.h \ divisible.cpp \ divisible.h \ - dynamic_array.h \ floatingpoint.cpp \ gmp_util.h \ hash.h \ diff --git a/src/util/dynamic_array.h b/src/util/dynamic_array.h deleted file mode 100644 index a3056743f..000000000 --- a/src/util/dynamic_array.h +++ /dev/null @@ -1,150 +0,0 @@ -/********************* */ -/*! \file dynamic_array.h - ** \verbatim - ** Top contributors (to current version): - ** Tim King, Morgan Deters - ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 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 [[ Add one-line brief description here ]] - ** - ** [[ Add lengthier description here ]] - ** \todo document this file - **/ - -#include "cvc4_private.h" - -#ifndef __CVC4__UTIL__DYNAMIC_ARRAY_H -#define __CVC4__UTIL__DYNAMIC_ARRAY_H - -#include "base/cvc4_assert.h" - -namespace CVC4 { - -template -class DynamicArray { -protected: - T* d_arr; - unsigned d_size; - unsigned d_allocated; - - bool d_callDestructor; - - void grow() { - bool empty = (d_arr == NULL); - d_allocated = empty ? 15 : d_allocated * 2 + 1; - unsigned allocSize = sizeof(T) * d_allocated; - T* tmpList = (T*) (empty ? malloc(allocSize) :realloc(d_arr, allocSize)); - if(tmpList == NULL) { - throw std::bad_alloc(); - } - d_arr = tmpList; - } - -public: - DynamicArray(bool callDestructor = false) : - d_arr(NULL), - d_size(0), - d_allocated(0), - d_callDestructor(callDestructor) { - } - - virtual ~DynamicArray() { - if(d_callDestructor) { - for(unsigned i = 0; i < d_size; ++i) { - d_arr[i].~T(); - } - } - free(d_arr); - } - - - unsigned size() const{ - return d_size; - } - - bool empty() const{ - return size() == 0; - } - - void push_back(const T& data) { - if(d_size == d_allocated) { - grow(); - } - Assert(d_size < d_allocated); - - ::new((void*)(d_arr + d_size)) T(data); - ++d_size; - } - - const T& operator[](unsigned i) const { - Assert(i < d_size, "index out of bounds in DynamicArray::operator[]"); - return d_arr[i]; - } - - T& operator[](unsigned i) { - Assert(i < d_size, "index out of bounds in DynamicArray::operator[]"); - return d_arr[i]; - } - - const T& back() const { - Assert(d_size > 0, "DynamicArray::back() called on empty list"); - return d_arr[d_size - 1]; - } - - void pop_back() { - Assert(d_size > 0, "DynamicArray::back() called on empty list"); - --d_size; - if(d_callDestructor) { - d_arr[d_size].~T(); - } - } - - typedef T* iterator; - typedef const T* const_iterator; - - iterator begin() { return d_arr; } - iterator end() { return d_arr + d_size; } - const_iterator begin() const { return d_arr; } - const_iterator end() const { return d_arr + d_size; } - -};/* class DynamicArray */ - -template -class DynamicGrowingArray : public DynamicArray { - Ctor d_ctor; - -public: - DynamicGrowingArray(bool callDestructor, const Ctor& c) : - DynamicArray(callDestructor), - d_ctor(c) { - } - - DynamicGrowingArray(bool callDestructor = false) : - DynamicArray(callDestructor), - d_ctor() { - } - - T& operator[](unsigned i) { - while(this->d_allocated <= i) { - this->grow(); - } - while(this->d_size <= i) { - ::new((void*)(this->d_arr + this->d_size)) T(d_ctor); - ++this->d_size; - } - return this->d_arr[i]; - } - - const T& operator[](unsigned i) const { - Assert(this->d_size > i); - return this->d_arr[i]; - } -};/* CVC4::DynamicGrowingArray */ - -}/* CVC4 namespace */ - -#endif /* __CVC4__UTIL__DYNAMIC_ARRAY_H */ -- 2.30.2