[llvm-commits] [llvm] r42825 - /llvm/trunk/include/llvm/ADT/ImmutableSet.h
Ted Kremenek
kremenek at apple.com
Wed Oct 10 09:27:34 PDT 2007
Author: kremenek
Date: Wed Oct 10 11:27:33 2007
New Revision: 42825
URL: http://llvm.org/viewvc/llvm-project?rev=42825&view=rev
Log:
Renamed internal method "Create" of ImutAVLTree to "CreateNode".
Modified:
llvm/trunk/include/llvm/ADT/ImmutableSet.h
Modified: llvm/trunk/include/llvm/ADT/ImmutableSet.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ImmutableSet.h?rev=42825&r1=42824&r2=42825&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/ImmutableSet.h (original)
+++ llvm/trunk/include/llvm/ADT/ImmutableSet.h Wed Oct 10 11:27:33 2007
@@ -26,6 +26,7 @@
template <typename ImutInfo> class ImutAVLFactory;
+
template <typename ImutInfo >
class ImutAVLTree : public FoldingSetNode {
struct ComputeIsEqual;
@@ -34,6 +35,7 @@
typedef typename ImutInfo::value_type value_type;
typedef typename ImutInfo::value_type_ref value_type_ref;
typedef ImutAVLFactory<ImutInfo> Factory;
+
friend class ImutAVLFactory<ImutInfo>;
//===----------------------------------------------------===//
@@ -52,7 +54,7 @@
ImutAVLTree *T = this;
while (T) {
- key_type_ref CurrentKey = ImutInfo::KeyOfValue(Value(T));
+ key_type_ref CurrentKey = ImutInfo::KeyOfValue(T->getValue());
if (ImutInfo::isEqual(K,CurrentKey))
return T;
@@ -75,7 +77,6 @@
}
-
bool isEqual(const ImutAVLTree& RHS) const {
// FIXME: Todo.
return true;
@@ -267,7 +268,7 @@
}
//===--------------------------------------------------===//
- // "Create" is used to generate new tree roots that link
+ // "CreateNode" is used to generate new tree roots that link
// to other trees. The functon may also simply move links
// in an existing root if that root is still marked mutable.
// This is necessary because otherwise our balancing code
@@ -276,7 +277,7 @@
// returned to the caller.
//===--------------------------------------------------===//
- TreeTy* Create(TreeTy* L, value_type_ref V, TreeTy* R) {
+ TreeTy* CreateNode(TreeTy* L, value_type_ref V, TreeTy* R) {
FoldingSetNodeID ID;
unsigned height = IncrementHeight(L,R);
@@ -296,7 +297,7 @@
return T;
}
- TreeTy* Create(TreeTy* L, TreeTy* OldTree, TreeTy* R) {
+ TreeTy* CreateNode(TreeTy* L, TreeTy* OldTree, TreeTy* R) {
assert (!isEmpty(OldTree));
if (OldTree->isMutable()) {
@@ -305,7 +306,7 @@
OldTree->setHeight(IncrementHeight(L,R));
return OldTree;
}
- else return Create(L, Value(OldTree), R);
+ else return CreateNode(L, Value(OldTree), R);
}
/// Balance - Used by Add_internal and Remove_internal to
@@ -323,7 +324,7 @@
TreeTy* LR = Right(L);
if (Height(LL) >= Height(LR))
- return Create(LL, L, Create(LR,V,R));
+ return CreateNode(LL, L, CreateNode(LR,V,R));
assert (!isEmpty(LR) &&
"LR cannot be empty because it has a height >= 1.");
@@ -331,7 +332,7 @@
TreeTy* LRL = Left(LR);
TreeTy* LRR = Right(LR);
- return Create(Create(LL,L,LRL), LR, Create(LRR,V,R));
+ return CreateNode(CreateNode(LL,L,LRL), LR, CreateNode(LRR,V,R));
}
else if (hr > hl + 2) {
assert (!isEmpty(R) &&
@@ -341,7 +342,7 @@
TreeTy* RR = Right(R);
if (Height(RR) >= Height(RL))
- return Create(Create(L,V,RL), R, RR);
+ return CreateNode(CreateNode(L,V,RL), R, RR);
assert (!isEmpty(RL) &&
"RL cannot be empty because it has a height >= 1.");
@@ -349,10 +350,10 @@
TreeTy* RLL = Left(RL);
TreeTy* RLR = Right(RL);
- return Create(Create(L,V,RLL), RL, Create(RLR,R,RR));
+ return CreateNode(CreateNode(L,V,RLL), RL, CreateNode(RLR,R,RR));
}
else
- return Create(L,V,R);
+ return CreateNode(L,V,R);
}
/// Add_internal - Creates a new tree that includes the specified
@@ -360,7 +361,7 @@
/// already contained the data item, the original tree is returned.
TreeTy* Add_internal(value_type_ref V, TreeTy* T) {
if (isEmpty(T))
- return Create(T, V, T);
+ return CreateNode(T, V, T);
assert (!T->isMutable());
@@ -368,7 +369,7 @@
key_type_ref KCurrent = ImutInfo::KeyOfValue(Value(T));
if (ImutInfo::isEqual(K,KCurrent))
- return Create(Left(T), V, Right(T));
+ return CreateNode(Left(T), V, Right(T));
else if (ImutInfo::isLess(K,KCurrent))
return Balance(Add_internal(V,Left(T)), Value(T), Right(T));
else
More information about the llvm-commits
mailing list