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

tries module: bug fix when printing float terms

This commit is contained in:
Ricardo Rocha 2010-03-31 19:36:26 +01:00
parent 6cb0886587
commit fd1f63a73b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/tries/core_tries.c
View File

@ -1394,7 +1394,7 @@ void traverse_and_print(TrNode node, int *arity, char *str, int str_index, int m
node = *bucket; node = *bucket;
traverse_and_print(node, arity, str, str_index, mode); traverse_and_print(node, arity, str, str_index, mode);
memcpy(arity, current_arity, sizeof(int) * (current_arity[0] + 1)); memcpy(arity, current_arity, sizeof(int) * (current_arity[0] + 1));
if (arity[arity[0]] < 0) { if (mode != TRIE_PRINT_FLOAT2 && arity[arity[0]] < 0) {
/* restore possible PairEndEmptyTag/PairEndTermTag/CommaEndTag side-effect */ /* restore possible PairEndEmptyTag/PairEndTermTag/CommaEndTag side-effect */
if (str[str_index - 1] != '[') if (str[str_index - 1] != '[')
str[str_index - 1] = ','; str[str_index - 1] = ',';
@ -1413,7 +1413,7 @@ void traverse_and_print(TrNode node, int *arity, char *str, int str_index, int m
memcpy(current_arity, arity, sizeof(int) * (arity[0] + 1)); memcpy(current_arity, arity, sizeof(int) * (arity[0] + 1));
traverse_and_print(TrNode_next(node), arity, str, str_index, mode); traverse_and_print(TrNode_next(node), arity, str, str_index, mode);
memcpy(arity, current_arity, sizeof(int) * (current_arity[0] + 1)); memcpy(arity, current_arity, sizeof(int) * (current_arity[0] + 1));
if (arity[arity[0]] < 0) { if (mode != TRIE_PRINT_FLOAT2 && arity[arity[0]] < 0) {
/* restore possible PairEndEmptyTag/PairEndTermTag/CommaEndTag side-effect */ /* restore possible PairEndEmptyTag/PairEndTermTag/CommaEndTag side-effect */
if (str[str_index - 1] != '[') if (str[str_index - 1] != '[')
str[str_index - 1] = ','; str[str_index - 1] = ',';
@ -1425,7 +1425,7 @@ void traverse_and_print(TrNode node, int *arity, char *str, int str_index, int m
} }
/* update position for possible PairEndTermTag side-effect */ /* update position for possible PairEndTermTag side-effect */
if (arity[arity[0]] < 0 && str_index > 1) if (mode != TRIE_PRINT_FLOAT2 && arity[arity[0]] < 0 && str_index > 1)
arity[arity[0]] = -str_index + 1; arity[arity[0]] = -str_index + 1;
t = TrNode_entry(node); t = TrNode_entry(node);
@ -1439,6 +1439,7 @@ void traverse_and_print(TrNode node, int *arity, char *str, int str_index, int m
p = (YAP_Term *)((void *) &f); /* to avoid gcc warning */ p = (YAP_Term *)((void *) &f); /* to avoid gcc warning */
*(p + 1) = t; *(p + 1) = t;
*p = (YAP_Term) arity[arity[0]]; *p = (YAP_Term) arity[arity[0]];
arity[arity[0]] = -1;
#else /* TAG_64BITS */ #else /* TAG_64BITS */
volatile double f; volatile double f;
volatile YAP_Term *p; volatile YAP_Term *p;