projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop support for GCC 2.x as it is hopelessly broken anyway
[oota-llvm.git]
/
include
/
llvm
/
ADT
/
IndexedMap.h
diff --git
a/include/llvm/ADT/IndexedMap.h
b/include/llvm/ADT/IndexedMap.h
index 5fcdfae9dea71235f54e14e1b8ecc9fee3cda8ac..ff5d3a139c705e793d53460213d2061757774ae3 100644
(file)
--- a/
include/llvm/ADT/IndexedMap.h
+++ b/
include/llvm/ADT/IndexedMap.h
@@
-1,15
+1,15
@@
-//===-
DenseMap.h - A dense map implmentation -------------
------*- C++ -*-===//
-//
+//===-
llvm/ADT/IndexedMap.h - An index map implementation
------*- C++ -*-===//
+//
// The LLVM Compiler Infrastructure
//
// The LLVM Compiler Infrastructure
//
-// This file
was developed by the LLVM research group and is distributed under
-//
the University of Illinois Open Source
License. See LICENSE.TXT for details.
-//
+// This file
is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
//
-// This file implements a
dense map. A dense
map template takes two
+// This file implements a
n indexed map. The index
map template takes two
// types. The first is the mapped type and the second is a functor
// types. The first is the mapped type and the second is a functor
-// that maps its argument to a size_t. On instan
c
iation a "null" value
+// that maps its argument to a size_t. On instan
t
iation a "null" value
// can be provided to be used as a "does not exist" indicator in the
// map. A member function grow() is provided that given the value of
// the maximally indexed key (the argument of the functor) makes sure
// can be provided to be used as a "does not exist" indicator in the
// map. A member function grow() is provided that given the value of
// the maximally indexed key (the argument of the functor) makes sure
@@
-17,44
+17,58
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#ifndef
SUPPORT_DENSE
MAP_H
-#define
SUPPORT_DENSE
MAP_H
+#ifndef
LLVM_ADT_INDEXED
MAP_H
+#define
LLVM_ADT_INDEXED
MAP_H
+#include <cassert>
+#include <functional>
#include <vector>
namespace llvm {
#include <vector>
namespace llvm {
-template <typename T, typename ToIndexT>
-class DenseMap {
+ struct IdentityFunctor : std::unary_function<unsigned, unsigned> {
+ unsigned operator()(unsigned Index) const {
+ return Index;
+ }
+ };
+
+ template <typename T, typename ToIndexT = IdentityFunctor>
+ class IndexedMap {
typedef typename ToIndexT::argument_type IndexT;
typedef std::vector<T> StorageT;
StorageT storage_;
T nullVal_;
ToIndexT toIndex_;
typedef typename ToIndexT::argument_type IndexT;
typedef std::vector<T> StorageT;
StorageT storage_;
T nullVal_;
ToIndexT toIndex_;
-public:
-
DenseMap(
) { }
+
public:
+
IndexedMap() : nullVal_(T()
) { }
- explicit
Dense
Map(const T& val) : nullVal_(val) { }
+ explicit
Indexed
Map(const T& val) : nullVal_(val) { }
typename StorageT::reference operator[](IndexT n) {
typename StorageT::reference operator[](IndexT n) {
-
assert(toIndex_(n) < storage_.size() && "index out of bounds!");
-
return storage_[toIndex_(n)];
+ assert(toIndex_(n) < storage_.size() && "index out of bounds!");
+ return storage_[toIndex_(n)];
}
typename StorageT::const_reference operator[](IndexT n) const {
}
typename StorageT::const_reference operator[](IndexT n) const {
-
assert(toIndex_(n) < storage_.size() && "index out of bounds!");
-
return storage_[toIndex_(n)];
+ assert(toIndex_(n) < storage_.size() && "index out of bounds!");
+ return storage_[toIndex_(n)];
}
void clear() {
}
void clear() {
-
storage_.assign(storage_.size(), nullVal_
);
+
storage_.clear(
);
}
void grow(IndexT n) {
}
void grow(IndexT n) {
- storage_.resize(toIndex_(n) + 1, nullVal_);
+ unsigned NewSize = toIndex_(n) + 1;
+ if (NewSize > storage_.size())
+ storage_.resize(NewSize, nullVal_);
+ }
+
+ typename StorageT::size_type size() const {
+ return storage_.size();
}
}
-};
+
};
} // End llvm namespace
} // End llvm namespace