projects
/
satune.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into...
[satune.git]
/
src
/
AST
/
table.cc
diff --git
a/src/AST/table.cc
b/src/AST/table.cc
index b7d550c5aee6bbfb1cf66aadca78898c25ff9fbd..016b3cce41ff49e866540555be390d09449b1e28 100644
(file)
--- a/
src/AST/table.cc
+++ b/
src/AST/table.cc
@@
-8,7
+8,7
@@
Table::Table(Set **_domains, uint numDomain, Set *_range) :
domains(_domains, numDomain),
range(_range) {
Table::Table(Set **_domains, uint numDomain, Set *_range) :
domains(_domains, numDomain),
range(_range) {
- entries =
allocHashSetTableEntry(HT_INITIAL_CAPACITY, HT_DEFAULT_FACTOR
);
+ entries =
new HashSetTableEntry(
);
}
void Table::addNewTableEntry(uint64_t *inputs, uint inputSize, uint64_t result) {
}
void Table::addNewTableEntry(uint64_t *inputs, uint inputSize, uint64_t result) {
@@
-17,23
+17,23
@@
void Table::addNewTableEntry(uint64_t *inputs, uint inputSize, uint64_t result)
ASSERT(result == true || result == false);
#endif
TableEntry *tb = allocTableEntry(inputs, inputSize, result);
ASSERT(result == true || result == false);
#endif
TableEntry *tb = allocTableEntry(inputs, inputSize, result);
- bool status =
addHashSetTableEntry(entries,
tb);
+ bool status =
entries->add(
tb);
ASSERT(status);
}
TableEntry * Table::getTableEntry(uint64_t *inputs, uint inputSize) {
TableEntry *temp = allocTableEntry(inputs, inputSize, -1);
ASSERT(status);
}
TableEntry * Table::getTableEntry(uint64_t *inputs, uint inputSize) {
TableEntry *temp = allocTableEntry(inputs, inputSize, -1);
- TableEntry *result =
getHashSetTableEntry(entries,
temp);
+ TableEntry *result =
entries->get(
temp);
deleteTableEntry(temp);
return result;
}
Table::~Table() {
deleteTableEntry(temp);
return result;
}
Table::~Table() {
- HSIteratorTableEntry *iterator =
iteratorTableEntry(entries
);
- while (
hasNextTableEntry(iterator
)) {
- deleteTableEntry(
nextTableEntry(iterator
));
+ HSIteratorTableEntry *iterator =
entries->iterator(
);
+ while (
iterator->hasNext(
)) {
+ deleteTableEntry(
iterator->next(
));
}
}
- delete
IterTableEntry(iterator)
;
- delete
HashSetTableEntry(entries)
;
+ delete
iterator
;
+ delete
entries
;
}
}