summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
06d791c)
instead of the older one.
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;
}
//////////////////////////////////////////////////////////////////////
}
//////////////////////////////////////////////////////////////////////
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);
+ } else {
+ lines[nb_lines] = lines[dup];
+ lines[dup] = 0;
+ 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];