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

fix wide atom writing.

Browse Source
This commit is contained in:
Vitor Santos Costa 2011-09-02 23:22:35 +01:00
parent 5a91af843f
commit 284ac49217
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/PLStream/pl-write.c
View File

@ -567,6 +567,11 @@ writeAtom(atom_t a, write_options *options)
return (*atomBlobType(atom)->write)(options->out, a, options->flags); return (*atomBlobType(atom)->write)(options->out, a, options->flags);
if ( false(atomBlobType(atom), PL_BLOB_TEXT) ) if ( false(atomBlobType(atom), PL_BLOB_TEXT) )
return writeBlob(a, options); return writeBlob(a, options);
#if __YAP_PROLOG__
if (isWideAtom(atom)) {
return writeUCSAtom(options->out, a, options->flags);
}
#endif
if ( true(options, PL_WRT_QUOTED) ) if ( true(options, PL_WRT_QUOTED) )
{ switch( atomType(a, options->out) ) { switch( atomType(a, options->out) )
@ -574,11 +579,6 @@ writeAtom(atom_t a, write_options *options)
case AT_SYMBOL: case AT_SYMBOL:
case AT_SOLO: case AT_SOLO:
case AT_SPECIAL: case AT_SPECIAL:
#if __YAP_PROLOG__
if (isWideAtom(atom)) {
return PutWideToken(nameOfWideAtom(atom), options->out);
}
#endif
return PutToken(nameOfAtom(atom), options->out); return PutToken(nameOfAtom(atom), options->out);
case AT_QUOTE: case AT_QUOTE:
case AT_FULLSTOP: case AT_FULLSTOP:
@ -594,11 +594,6 @@ writeAtom(atom_t a, write_options *options)
} }
} }
} else { } else {
#if __YAP_PROLOG__
if (isWideAtom(atom)) {
return PutWideTokenN(nameOfWideAtom(atom), atomLength(atom), options->out);
}
#endif
return PutTokenN(nameOfAtom(atom), atomLength(atom), options->out); return PutTokenN(nameOfAtom(atom), atomLength(atom), options->out);
} }
} }

10
packages/PLStream/pl-yap.h
View File

@ -129,7 +129,15 @@ void PL_license(const char *license, const char *module);
#define atomFromTerm(term) YAP_SWIAtomFromAtom(YAP_AtomOfTerm(term)) #define atomFromTerm(term) YAP_SWIAtomFromAtom(YAP_AtomOfTerm(term))
#define atomName(atom) ((char *)YAP_AtomName(atom)) #define atomName(atom) ((char *)YAP_AtomName(atom))
#define nameOfAtom(atom) ((char *)YAP_AtomName(atom)) #define nameOfAtom(atom) ((char *)YAP_AtomName(atom))
#define atomLength(atom) YAP_AtomNameLength(atom)
inline static size_t
atomLength(Atom atom)
{
if (YAP_IsWideAtom(atom))
return wcslen(atom->WStrOfAE)*sizeof(wchar_t);
return(strlen(atom->StrOfAE));
}
#define atomBlobType(at) YAP_find_blob_type(at) #define atomBlobType(at) YAP_find_blob_type(at)
#define argTermP(w,i) ((Word)((YAP_ArgsOfTerm(w)+(i)))) #define argTermP(w,i) ((Word)((YAP_ArgsOfTerm(w)+(i))))
#define deRef(t) while (IsVarTerm(*(t)) && !IsUnboundVar(t)) { t = (CELL *)(*(t)); } #define deRef(t) while (IsVarTerm(*(t)) && !IsUnboundVar(t)) { t = (CELL *)(*(t)); }