diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed trie warnings

Browse Source
This commit is contained in:
Theo 2010-07-19 12:06:39 +01:00
parent 0a6ba6a678
commit 5e84c38efe
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/tries/core_tries.c
View File

@ -329,7 +329,7 @@ TrNode core_trie_put_entry(TrEngine engine, TrNode node, YAP_Term entry, YAP_Int
} }
/* reset var terms */ /* reset var terms */
while (STACK_NOT_EMPTY(stack_vars++, stack_vars_base)) { while (STACK_NOT_EMPTY(stack_vars++, stack_vars_base)) {
POP_DOWN(stack_vars); (void) POP_DOWN(stack_vars);
*((YAP_Term *)*stack_vars) = *stack_vars; *((YAP_Term *)*stack_vars) = *stack_vars;
} }
if (depth) if (depth)
@ -347,7 +347,7 @@ TrNode core_trie_check_entry(TrNode node, YAP_Term entry) {
node = check_entry(node, entry); node = check_entry(node, entry);
/* reset var terms */ /* reset var terms */
while (STACK_NOT_EMPTY(stack_vars++, stack_vars_base)) { while (STACK_NOT_EMPTY(stack_vars++, stack_vars_base)) {
POP_DOWN(stack_vars); (void) POP_DOWN(stack_vars);
*((YAP_Term *)*stack_vars) = *stack_vars; *((YAP_Term *)*stack_vars) = *stack_vars;
} }
return node; return node;
@ -473,14 +473,15 @@ TrNode core_trie_load(TrEngine engine, FILE *file, void (*load_function)(TrNode,
TrNode node; TrNode node;
char version[15]; char version[15];
fpos_t curpos; fpos_t curpos;
int n;
fscanf(file, "%14s", version); n = fscanf(file, "%14s", version);
if (fgetpos(file, &curpos)) if (fgetpos(file, &curpos))
return NULL; return NULL;
if (!strcmp(version, "BEGIN_TRIE_v2")) { if (!strcmp(version, "BEGIN_TRIE_v2")) {
fseek(file, -11, SEEK_END); fseek(file, -11, SEEK_END);
fscanf(file, "%s", version); n = fscanf(file, "%s", version);
if (strcmp(version, "END_TRIE_v2")) { if (strcmp(version, "END_TRIE_v2")) {
fprintf(stderr, "******************************************\n"); fprintf(stderr, "******************************************\n");
fprintf(stderr, " Tries core module: trie file corrupted\n"); fprintf(stderr, " Tries core module: trie file corrupted\n");
@ -492,7 +493,7 @@ TrNode core_trie_load(TrEngine engine, FILE *file, void (*load_function)(TrNode,
CURRENT_LOAD_VERSION = 2; CURRENT_LOAD_VERSION = 2;
} else if (!strcmp(version, "BEGIN_TRIE")) { } else if (!strcmp(version, "BEGIN_TRIE")) {
fseek(file, -8, SEEK_END); fseek(file, -8, SEEK_END);
fscanf(file, "%s", version); n = fscanf(file, "%s", version);
if (strcmp(version, "END_TRIE")) { if (strcmp(version, "END_TRIE")) {
fprintf(stderr, "******************************************\n"); fprintf(stderr, "******************************************\n");
fprintf(stderr, " Tries core module: trie file corrupted\n"); fprintf(stderr, " Tries core module: trie file corrupted\n");
@ -1377,6 +1378,7 @@ static
void traverse_and_load(TrNode parent, FILE *file) { void traverse_and_load(TrNode parent, FILE *file) {
TrHash hash = NULL; TrHash hash = NULL;
YAP_Term t; YAP_Term t;
int n;
if (!fscanf(file, "%lu", &t)) { if (!fscanf(file, "%lu", &t)) {
MARK_AS_LEAF_TRIE_NODE(parent); MARK_AS_LEAF_TRIE_NODE(parent);
@ -1389,16 +1391,16 @@ void traverse_and_load(TrNode parent, FILE *file) {
if (t == HASH_SAVE_MARK) { if (t == HASH_SAVE_MARK) {
/* alloc a new trie hash */ /* alloc a new trie hash */
int num_buckets; int num_buckets;
fscanf(file, "%d", &num_buckets); n = fscanf(file, "%d", &num_buckets);
new_trie_hash(hash, 0, num_buckets); new_trie_hash(hash, 0, num_buckets);
TrNode_child(parent) = (TrNode) hash; TrNode_child(parent) = (TrNode) hash;
fscanf(file, "%lu", &t); n = fscanf(file, "%lu", &t);
} }
do { do {
TrNode child; TrNode child;
if (t == ATOM_SAVE_MARK) { if (t == ATOM_SAVE_MARK) {
int index; int index;
fscanf(file, "%d", &index); n = fscanf(file, "%d", &index);
if (index > CURRENT_INDEX) { if (index > CURRENT_INDEX) {
char atom[1000]; char atom[1000];
if (CURRENT_LOAD_VERSION == 2) { if (CURRENT_LOAD_VERSION == 2) {
@ -1409,7 +1411,7 @@ void traverse_and_load(TrNode parent, FILE *file) {
*ptr++ = ch; *ptr++ = ch;
*ptr = '\0'; *ptr = '\0';
} else if (CURRENT_LOAD_VERSION == 1) { } else if (CURRENT_LOAD_VERSION == 1) {
fscanf(file, "%s", atom); n = fscanf(file, "%s", atom);
} }
CURRENT_INDEX = index; CURRENT_INDEX = index;
if (CURRENT_INDEX == CURRENT_AUXILIARY_TERM_STACK_SIZE) if (CURRENT_INDEX == CURRENT_AUXILIARY_TERM_STACK_SIZE)
@ -1419,11 +1421,11 @@ void traverse_and_load(TrNode parent, FILE *file) {
t = AUXILIARY_TERM_STACK[index]; t = AUXILIARY_TERM_STACK[index];
} else if (t == FUNCTOR_SAVE_MARK) { } else if (t == FUNCTOR_SAVE_MARK) {
int index; int index;
fscanf(file, "%d", &index); n = fscanf(file, "%d", &index);
if (index > CURRENT_INDEX) { if (index > CURRENT_INDEX) {
char atom[1000]; char atom[1000];
int arity; int arity;
fscanf(file, "%s %d", atom, &arity); n = fscanf(file, "%s %d", atom, &arity);
CURRENT_INDEX = index; CURRENT_INDEX = index;
if (CURRENT_INDEX == CURRENT_AUXILIARY_TERM_STACK_SIZE) if (CURRENT_INDEX == CURRENT_AUXILIARY_TERM_STACK_SIZE)
expand_auxiliary_term_stack(); expand_auxiliary_term_stack();
@ -1431,7 +1433,7 @@ void traverse_and_load(TrNode parent, FILE *file) {
} }
t = AUXILIARY_TERM_STACK[index]; t = AUXILIARY_TERM_STACK[index];
} else if (t == FLOAT_SAVE_MARK) } else if (t == FLOAT_SAVE_MARK)
fscanf(file, "%lu", &t); n = fscanf(file, "%lu", &t);
child = trie_node_insert(parent, t, hash); child = trie_node_insert(parent, t, hash);
traverse_and_load(child, file); traverse_and_load(child, file);
} while (fscanf(file, "%lu", &t)); } while (fscanf(file, "%lu", &t));