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

fix write -(-1) UN # 236

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-03-18 00:08:10 +00:00
parent 5c6c034ec9
commit 3cb8b99852
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
C/write.c
View File

@ -273,9 +273,7 @@ wrputf(Float f, struct write_globs *wglb) /* writes a float */
char *pt = s; char *pt = s;
int ch; int ch;
if (lastw == symbol) { if (lastw == symbol || lastw == alphanum) {
wrputc(' ', stream);
} else if (lastw == alphanum) {
wrputc(' ', stream); wrputc(' ', stream);
} }
lastw = alphanum; lastw = alphanum;
@ -312,6 +310,9 @@ wrputf(Float f, struct write_globs *wglb) /* writes a float */
char *format_float(double f, char *buf); char *format_float(double f, char *buf);
char *buf; char *buf;
if (lastw == symbol || lastw == alphanum) {
wrputc(' ', stream);
}
/* use SWI's format_float */ /* use SWI's format_float */
buf = format_float(f, s); buf = format_float(f, s);
if (!buf) return; if (!buf) return;
@ -640,8 +641,8 @@ write_var(CELL *t, struct write_globs *wglb, struct rewind_term *rwt)
/* make sure we don't get no creepy spaces where they shouldn't be */ /* make sure we don't get no creepy spaces where they shouldn't be */
lastw = separator; lastw = separator;
if (IsAttVar(t)) { if (IsAttVar(t)) {
Int vcount = (t-H0);
#if defined(COROUTINING) && defined(DEBUG) #if defined(COROUTINING) && defined(DEBUG)
Int vcount = (t-H0);
if (Yap_Portray_delays) { if (Yap_Portray_delays) {
exts ext = ExtFromCell(t); exts ext = ExtFromCell(t);
struct rewind_term nrwt; struct rewind_term nrwt;
@ -770,7 +771,40 @@ static int op_can_be_read_as_number(char *s, Term t)
if (s[1]) if (s[1])
return FALSE; return FALSE;
t = ArgOfTerm(1,t); t = ArgOfTerm(1,t);
return IsNumTerm(t); if (IsIntTerm(t)) return IntOfTerm(t) >= 0;
if (IsApplTerm(t)) {
Functor f = FunctorOfTerm(t);
if (IsExtensionFunctor(f)) {
switch((CELL)f) {
case (CELL)FunctorDouble:
return FloatOfTerm(t) >= 0.0;
case (CELL)FunctorAttVar:
case (CELL)FunctorDBRef:
return FALSE;
case (CELL)FunctorLongInt:
return LongIntOfTerm(t) >= 0;
/* case (CELL)FunctorBigInt: */
default:
{
CELL *pt = RepAppl(t)+1;
CELL big_tag = pt[0];
#ifdef USE_GMP
if (big_tag == BIG_INT || big_tag == BIG_RATIONAL) {
extern int Yap_gmp_cmp_big_int(Term t, Int i);
return Yap_gmp_cmp_big_int(t, 0) >= 0;
} else
#endif
if (big_tag == BLOB_STRING || BLOB_WIDE_STRING)
return FALSE;
else
return TRUE;
}
}
}
}
/* standard Prolog term */
return FALSE;
} }
static void static void