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

instantiation error

Browse Source
This commit is contained in:
Vítor Santos Costa
2013-12-16 21:47:46 +00:00
parent 7a6d36ff16
commit 1aafb30360
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
C/text.c
View File

@@ -219,8 +219,11 @@ Yap_ListOfAtomsToBuffer(void *buf, Term t, seq_tv_t *inp, int *widep, size_t *le
LOCAL_Error_Term = *r; LOCAL_Error_Term = *r;
return NULL; return NULL;
} }
if (n && !atoms) if (n && !atoms) {
LOCAL_Error_Term = t;
LOCAL_Error_TYPE = TYPE_ERROR_CHARACTER;
return NULL; return NULL;
}
*lenp = n; *lenp = n;
if (*widep) { if (*widep) {
wchar_t *s; wchar_t *s;
@@ -351,6 +354,11 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng
switch (inp->type & YAP_TYPE_MASK) { switch (inp->type & YAP_TYPE_MASK) {
case YAP_STRING_STRING: case YAP_STRING_STRING:
{ const char *s; { const char *s;
if (IsVarTerm(inp->val.t)) {
LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = inp->val.t;
return 0L;
}
if (!IsStringTerm(inp->val.t)) { if (!IsStringTerm(inp->val.t)) {
LOCAL_Error_TYPE = TYPE_ERROR_STRING; LOCAL_Error_TYPE = TYPE_ERROR_STRING;
LOCAL_Error_Term = inp->val.t; LOCAL_Error_Term = inp->val.t;
@@ -399,7 +407,11 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng
case YAP_STRING_ATOM: case YAP_STRING_ATOM:
// this is a term, extract to a buffer, and representation is wide // this is a term, extract to a buffer, and representation is wide
*minimal = TRUE; *minimal = TRUE;
if (!IsAtomTerm(inp->val.t)) { if (IsVarTerm(inp->val.t)) {
LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = inp->val.t;
return 0L;
} else if (!IsAtomTerm(inp->val.t)) {
LOCAL_Error_TYPE = TYPE_ERROR_ATOM; LOCAL_Error_TYPE = TYPE_ERROR_ATOM;
LOCAL_Error_Term = inp->val.t; LOCAL_Error_Term = inp->val.t;
return NULL; return NULL;
@@ -488,7 +500,11 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng
return NULL; return NULL;
} else { } else {
Term t = inp->val.t; Term t = inp->val.t;
if (IsStringTerm(t)) { if (IsVarTerm(t)) {
LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = t;
return NULL;
} else if (IsStringTerm(t)) {
if (inp->type & (YAP_STRING_STRING)) { if (inp->type & (YAP_STRING_STRING)) {
inp->type &= (YAP_STRING_STRING); inp->type &= (YAP_STRING_STRING);
return read_Text( buf, inp, enc, minimal, lengp PASS_REGS); return read_Text( buf, inp, enc, minimal, lengp PASS_REGS);
@@ -505,14 +521,14 @@ read_Text( void *buf, seq_tv_t *inp, encoding_t *enc, int *minimal, size_t *leng
LOCAL_Error_Term = t; LOCAL_Error_Term = t;
} }
} else if (IsAtomTerm(t)) { } else if (IsAtomTerm(t)) {
if (inp->type & (YAP_STRING_ATOM)) { if (t == TermNil && inp->type & (YAP_STRING_CODES|YAP_STRING_ATOMS)) {
inp->type &= (YAP_STRING_CODES|YAP_STRING_ATOMS);
return read_Text( buf, inp, enc, minimal, lengp PASS_REGS);
} else if (inp->type & (YAP_STRING_ATOM)) {
inp->type &= (YAP_STRING_ATOM); inp->type &= (YAP_STRING_ATOM);
inp->val.t = t; inp->val.t = t;
return read_Text( buf, inp, enc, minimal, lengp PASS_REGS); return read_Text( buf, inp, enc, minimal, lengp PASS_REGS);
// [] is special... // [] is special...
} else if (t == TermNil && inp->type & (YAP_STRING_CODES|YAP_STRING_ATOMS)) {
inp->type &= (YAP_STRING_CODES|YAP_STRING_ATOMS);
return read_Text( buf, inp, enc, minimal, lengp PASS_REGS);
} else { } else {
LOCAL_Error_TYPE = gen_type_error( inp->type ); LOCAL_Error_TYPE = gen_type_error( inp->type );
LOCAL_Error_Term = t; LOCAL_Error_Term = t;