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

oops

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-08-16 09:32:27 -05:00
parent 2726fb279c
commit 93068241d3
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C/atomic.c
View File

@ -634,7 +634,8 @@ restart_aux:
i = IntOfTerm(EXTRA_CBACK_ARG(3, 1)); i = IntOfTerm(EXTRA_CBACK_ARG(3, 1));
max = IntOfTerm(EXTRA_CBACK_ARG(3, 2)); max = IntOfTerm(EXTRA_CBACK_ARG(3, 2));
EXTRA_CBACK_ARG(3, 1) = MkIntTerm(i + 1); EXTRA_CBACK_ARG(3, 1) = MkIntTerm(i + 1);
if (!Yap_SpliceAtom(t3, ats, i, max PASS_REGS)) { if (!Yap_SpliceAtom(t3, ats, i, max PASS_REGS) && LOCAL_Error_TYPE ==
YAP_NO_ERROR) {
cut_fail(); cut_fail();
} else { } else {
if (i < max) if (i < max)
@ -650,7 +651,7 @@ restart_aux:
if (Yap_HandleError("atom_concat/3")) { if (Yap_HandleError("atom_concat/3")) {
goto restart_aux; goto restart_aux;
} else { } else {
return FALSE; return false;
} }
} }
cut_fail(); cut_fail();
@ -680,9 +681,6 @@ restart_aux:
} else { } else {
LOCAL_Error_TYPE = INSTANTIATION_ERROR; LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = t1; LOCAL_Error_Term = t1;
Yap_Error(INSTANTIATION_ERROR, IsVarTerm(t1) ? t1 : t2,
"got atom_concat(X,atom,Z) or atom_concat(,atom,Y,Z)");
return false;
} }
if (at) { if (at) {
if (Yap_unify(ot, MkAtomTerm(at))) if (Yap_unify(ot, MkAtomTerm(at)))

4
os/charsio.c
View File

@ -1045,7 +1045,7 @@ static Int peek_byte(USES_REGS1) { /* at_end_of_stream */
if (sno < 0) if (sno < 0)
return (FALSE); return (FALSE);
if (false && !(GLOBAL_Stream[sno].status & Binary_Stream_f)) { if (!(GLOBAL_Stream[sno].status & Binary_Stream_f)) {
UNLOCK(GLOBAL_Stream[sno].streamlock); UNLOCK(GLOBAL_Stream[sno].streamlock);
Yap_Error(PERMISSION_ERROR_INPUT_BINARY_STREAM, ARG1, "peek_byte/2"); Yap_Error(PERMISSION_ERROR_INPUT_BINARY_STREAM, ARG1, "peek_byte/2");
return (FALSE); return (FALSE);
@ -1087,7 +1087,7 @@ static Int peek_byte_1(USES_REGS1) { /* at_end_of_stream */
#endif #endif
} }
UNLOCK(GLOBAL_Stream[sno].streamlock); UNLOCK(GLOBAL_Stream[sno].streamlock);
return (Yap_unify_constant(ARG2, MkIntTerm(ch))); return (Yap_unify_constant(ARG1, MkIntTerm(ch)));
} }
/** @pred peek_char(+_S_, - _C_) is iso /** @pred peek_char(+_S_, - _C_) is iso

2
os/iopreds.c
View File

@ -1594,7 +1594,7 @@ int Yap_CheckBinaryStream__(const char *file, const char *f, int line, Term arg,
int sno; int sno;
if ((sno = CheckStream__(file, f, line, arg, kind, msg)) < 0) if ((sno = CheckStream__(file, f, line, arg, kind, msg)) < 0)
return -1; return -1;
if ((GLOBAL_Stream[sno].status & Binary_Stream_f)) { if (!(GLOBAL_Stream[sno].status & Binary_Stream_f)) {
UNLOCK(GLOBAL_Stream[sno].streamlock); UNLOCK(GLOBAL_Stream[sno].streamlock);
if (kind == Input_Stream_f) if (kind == Input_Stream_f)
PlIOError__(file, f, line, PERMISSION_ERROR_INPUT_TEXT_STREAM, arg, msg); PlIOError__(file, f, line, PERMISSION_ERROR_INPUT_TEXT_STREAM, arg, msg);