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

fix atomic_conct, Paulo Moura

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-10-22 17:17:34 +01:00
parent 93270c125a
commit 92ffbe5a2e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
C/atomic.c
View File

@ -638,10 +638,13 @@ init_atom_concat3( USES_REGS1 )
} else if (Yap_IsGroundTerm(t2) && Yap_IsGroundTerm(t3)) { } else if (Yap_IsGroundTerm(t2) && Yap_IsGroundTerm(t3)) {
at = Yap_SubtractTailAtom( Deref(ARG3), t2 PASS_REGS ); at = Yap_SubtractTailAtom( Deref(ARG3), t2 PASS_REGS );
ot = ARG1; ot = ARG1;
} else { } else if (Yap_IsGroundTerm(t3)) {
EXTRA_CBACK_ARG(3,1) = MkIntTerm(0); EXTRA_CBACK_ARG(3,1) = MkIntTerm(0);
EXTRA_CBACK_ARG(3,2) = MkIntTerm(Yap_AtomToLength(t3 PASS_REGS)); EXTRA_CBACK_ARG(3,2) = MkIntTerm(Yap_AtomToLength(t3 PASS_REGS));
return cont_atom_concat3( PASS_REGS1 ); return cont_atom_concat3( PASS_REGS1 );
} else {
LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = t1;
} }
if (at) { if (at) {
if (Yap_unify(ot, MkAtomTerm(at))) cut_succeed(); if (Yap_unify(ot, MkAtomTerm(at))) cut_succeed();
@ -732,10 +735,13 @@ init_atomic_concat3( USES_REGS1 )
} else if (Yap_IsGroundTerm(t2) && Yap_IsGroundTerm(t3)) { } else if (Yap_IsGroundTerm(t2) && Yap_IsGroundTerm(t3)) {
at = Yap_SubtractTailAtom( t3, CastToAtom(t2) PASS_REGS ); at = Yap_SubtractTailAtom( t3, CastToAtom(t2) PASS_REGS );
ot = ARG1; ot = ARG1;
} else { } else if (Yap_IsGroundTerm(t3)) {
EXTRA_CBACK_ARG(3,1) = MkIntTerm(0); EXTRA_CBACK_ARG(3,1) = MkIntTerm(0);
EXTRA_CBACK_ARG(3,2) = MkIntTerm(Yap_AtomicToLength(t3 PASS_REGS)); EXTRA_CBACK_ARG(3,2) = MkIntTerm(Yap_AtomicToLength(t3 PASS_REGS));
return cont_atomic_concat3( PASS_REGS1 ); return cont_atomic_concat3( PASS_REGS1 );
} else {
LOCAL_Error_TYPE = INSTANTIATION_ERROR;
LOCAL_Error_Term = t1;
} }
if (at) { if (at) {
if (Yap_unify(ot, CastToNumeric(at))) cut_succeed(); if (Yap_unify(ot, CastToNumeric(at))) cut_succeed();