projects
/
selector.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the removal of duplicates so that the most recent one is kept
[selector.git]
/
selector.cc
diff --git
a/selector.cc
b/selector.cc
index
ebbd021
..
7422fd6
100644
(file)
--- a/
selector.cc
+++ b/
selector.cc
@@
-114,13
+114,17
@@
int test_and_add(char *new_string, int new_index,
code = code % hash_table_size;
while(hash_table[code] >= 0) {
code = code % hash_table_size;
while(hash_table[code] >= 0) {
- if(strcmp(new_string, strings[hash_table[code]]) == 0) return 1;
+ if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+ int result = hash_table[code];
+ hash_table[code] = new_index;
+ return result;
+ }
code = (code + 1) % hash_table_size;
}
hash_table[code] = new_index;
code = (code + 1) % hash_table_size;
}
hash_table[code] = new_index;
- return
0
;
+ return
-1
;
}
//////////////////////////////////////////////////////////////////////
}
//////////////////////////////////////////////////////////////////////
@@
-438,13
+442,13
@@
int main(int argc, char **argv) {
i++;
}
i++;
}
- else if(strcmp(argv[i], "-
z
") == 0) {
-
z
sh_history = 1;
+ else if(strcmp(argv[i], "-
b
") == 0) {
+
ba
sh_history = 1;
i++;
}
i++;
}
- else if(strcmp(argv[i], "-
b
") == 0) {
-
ba
sh_history = 1;
+ else if(strcmp(argv[i], "-
z
") == 0) {
+
z
sh_history = 1;
i++;
}
i++;
}
@@
-496,6
+500,7
@@
int main(int argc, char **argv) {
<< " [-m]"
<< " [-d]"
<< " [-e]"
<< " [-m]"
<< " [-d]"
<< " [-e]"
+ << " [-b]"
<< " [-z]"
<< " [-i]"
<< " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
<< " [-z]"
<< " [-i]"
<< " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
@@
-545,16
+550,36
@@
int main(int argc, char **argv) {
while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
}
while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
}
- if(!hash_table || !test_and_add(s, nb_lines, lines, hash_table, hash_table_size)) {
+ int dup;
+
+ if(hash_table) {
+ dup = test_and_add(s, nb_lines, lines, hash_table, hash_table_size);
+ } else {
+ dup = -1;
+ }
+
+ if(dup < 0) {
lines[nb_lines] = new char[strlen(s) + 1];
strcpy(lines[nb_lines], s);
lines[nb_lines] = new char[strlen(s) + 1];
strcpy(lines[nb_lines], s);
- nb_lines++;
+ } else {
+ lines[nb_lines] = lines[dup];
+ lines[dup] = 0;
}
}
+
+ nb_lines++;
}
}
delete[] hash_table;
}
}
delete[] hash_table;
+ int n = 0;
+ for(int k = 0; k < nb_lines; k++) {
+ if(lines[k]) {
+ lines[n++] = lines[k];
+ }
+ }
+ nb_lines = n;
+
if(inverse_order) {
for(int i = 0; i < nb_lines/2; i++) {
char *s = lines[nb_lines - 1 - i];
if(inverse_order) {
for(int i = 0; i < nb_lines/2; i++) {
char *s = lines[nb_lines - 1 - i];