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

improve string support

Browse Source 
fix non-thread compilation.
This commit is contained in:
Vítor Santos Costa
2011-03-11 23:21:23 +00:00
parent d42db0dc5c
commit 0d6be2d858
12 changed files with 92 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
packages/PLStream/pl-yap.c
View File

@@ -77,15 +77,13 @@ codeToAtom(int chrcode)
word
globalString(size_t size, char *s)
{
// return YAP_MkBlobStringTerm(s, size);
return 0L;
return Yap_MkBlobStringTerm(s, size);
}
word
globalWString(size_t size, wchar_t *s)
{
// return YAP_MkBlobWideStringTerm(size, s);
return 0L;
return Yap_MkBlobWideStringTerm(s, size);
}
int
@@ -282,6 +280,13 @@ _PL_unify_atomic(term_t t, PL_atomic_t a)
return PL_unify_atom(t, a);
}
int
_PL_unify_string(term_t t, word w)
{
GET_LD
return Yap_unify(Yap_GetFromSlot(t PASS_REGS), w);
}
word lookupAtom(const char *s, size_t len)
{
/* dirty trick to ensure s is null terminated */
@@ -377,7 +382,21 @@ get_atom_text(atom_t atom, PL_chars_t *text)
int
get_string_text(word w, PL_chars_t *text ARG_LD)
{ fail;
{
CELL fl = RepAppl(w)[1];
if (fl == BLOB_STRING) {
fprintf(stderr,"%s\n", Yap_BlobStringOfTerm(w));
text->text.t = Yap_BlobStringOfTerm(w);
text->encoding = ENC_ISO_LATIN_1;
text->length = strlen(text->text.t);
} else {
text->text.w = Yap_BlobWideStringOfTerm(w);
text->encoding = ENC_WCHAR;
text->length = wcslen(text->text.w);
}
text->storage = PL_CHARS_STACK;
text->canonical = TRUE;
return TRUE;
}
void
@@ -1067,18 +1086,6 @@ recursiveMutexInit(recursiveMutex *m)
}
word
pl_sleep(term_t time)
{ double t;
if ( PL_get_float_ex(time, &t) )
return Pause(t);
fail;
}
counting_mutex _PL_mutexes[] =
{ COUNT_MUTEX_INITIALIZER("L_MISC"),
COUNT_MUTEX_INITIALIZER("L_ALLOC"),