From: Terrance S. <ts...@us...> - 2013-02-14 21:47:51
|
Update of /cvsroot/xsb/XSB/emu In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12799 Modified Files: tst_utils.c Log Message: Handled quatations for increasingly obscure cases of terms printed out by forest logging. Index: tst_utils.c =================================================================== RCS file: /cvsroot/xsb/XSB/emu/tst_utils.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- tst_utils.c 18 Jan 2013 20:20:59 -0000 1.45 +++ tst_utils.c 14 Feb 2013 21:47:47 -0000 1.46 @@ -199,6 +199,7 @@ } int sprintTrieSymbol(char * buffer, Cell symbol) { + int ctr; if ( symbol == ESCAPE_NODE_SYMBOL ) return sprintf(buffer, "%lu [ESCAPE_NODE_SYMBOL]", ESCAPE_NODE_SYMBOL); @@ -225,7 +226,8 @@ break; } psc = DecodeTrieFunctor(symbol); - return sprintf(buffer, "%s/%d", get_name(psc), get_arity(psc)); + ctr = sprint_quotedname(buffer, 0, get_name(psc)); + return sprintf(buffer+ctr, "/%d", get_arity(psc)); } break; case XSB_LIST: @@ -377,8 +379,12 @@ if ( list_recursion ) { if ( string == nil_string ) ctr = ctr + sprintf(buffer+ctr, "]"); - else - ctr = ctr + sprintf(buffer+ctr, "|%s]", string); + else { + // ctr = ctr + sprintf(buffer+ctr, "|%s]", string); + ctr = ctr + sprintf(buffer+ctr, "|"); + ctr = sprint_quotedname(buffer, ctr, string); + ctr = ctr + sprintf(buffer+ctr, "]"); + } } else // ctr = ctr + sprintf(buffer+ctr, "%s", string); @@ -407,7 +413,9 @@ if ( list_recursion ) ctr = ctr + sprintf(buffer+ctr, "|"); psc = DecodeTrieFunctor(symbol); - ctr = ctr + sprintf(buffer+ctr, "%s(", get_name(psc)); + // ctr = ctr + sprintf(buffer+ctr, "%s(", get_name(psc)); + ctr = sprint_quotedname(buffer, ctr, get_name(psc)); + ctr = ctr + sprintf(buffer+ctr, "("); for (i = 1; i < (int)get_arity(psc); i++) { ctr = ctr + symstkSPrintNextTerm(CTXTc buffer+ctr,FALSE); ctr = ctr + sprintf(buffer+ctr, ","); |