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

fix ref to clauses from MegaClauses

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1157 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2004-10-06 21:15:49 +00:00
parent 7efbf340a5
commit 2ad440faf5
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
C/dbase.c
View File

@ -4558,7 +4558,8 @@ mega_instance(yamop *code, PredEntry *ap)
CELL *ptr; CELL *ptr;
if (IsVarTerm(t2)) { if (IsVarTerm(t2)) {
Yap_unify(ARG2, (t2 = Yap_MkNewApplTerm(f,arity))); t2 = Yap_MkNewApplTerm(f,arity);
Yap_unify(ARG2, t2);
} else if (!IsApplTerm(t2) || FunctorOfTerm(t2) != f) { } else if (!IsApplTerm(t2) || FunctorOfTerm(t2) != f) {
return FALSE; return FALSE;
} }

14
C/iopreds.c
View File

@ -4165,26 +4165,26 @@ format(volatile Term otail, volatile Term oargs, int sno)
f_putc = format_putc; f_putc = format_putc;
break; break;
do_instantiation_error: do_instantiation_error:
Yap_Error(INSTANTIATION_ERROR, t, "format/2"); Yap_Error(INSTANTIATION_ERROR, t, "format(\"%s\",_) ", fstr);
goto do_default_error; goto do_default_error;
do_type_int_error: do_type_int_error:
Yap_Error(TYPE_ERROR_INTEGER, t, "format/2"); Yap_Error(TYPE_ERROR_INTEGER, t, "format(\"%s\",_) ", fstr);
goto do_default_error; goto do_default_error;
do_type_number_error: do_type_number_error:
Yap_Error(TYPE_ERROR_NUMBER, t, "format/2"); Yap_Error(TYPE_ERROR_NUMBER, t, "format(\"%s\",_) ", fstr);
goto do_default_error; goto do_default_error;
do_type_atom_error: do_type_atom_error:
Yap_Error(TYPE_ERROR_ATOM, t, "format/2"); Yap_Error(TYPE_ERROR_ATOM, t, "format(\"%s\",_) ", fstr);
goto do_default_error; goto do_default_error;
do_domain_not_less_zero_error: do_domain_not_less_zero_error:
Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t, "format/2"); Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t, "format(\"%s\",_) ", fstr);
goto do_default_error; goto do_default_error;
do_domain_error_radix: do_domain_error_radix:
Yap_Error(DOMAIN_ERROR_RADIX, t, "format/2"); Yap_Error(DOMAIN_ERROR_RADIX, t, "format(\"%s\",_) ", fstr);
goto do_default_error; goto do_default_error;
do_consistency_error: do_consistency_error:
default: default:
Yap_Error(CONSISTENCY_ERROR, oargs, "format/2"); Yap_Error(CONSISTENCY_ERROR, oargs, "format(\"%s\",_) ", fstr);
do_default_error: do_default_error:
if (tnum <= 8) if (tnum <= 8)
targs = NULL; targs = NULL;

4
H/clause.h
View File

@ -290,12 +290,12 @@ Yap_MkMegaRefTerm(PredEntry *ap,yamop *ipc)
static inline yamop * static inline yamop *
Yap_MegaClauseFromTerm(Term t) Yap_MegaClauseFromTerm(Term t)
{ {
return (yamop *)IntegerOfTerm(ArgOfTerm(1,t)); return (yamop *)IntegerOfTerm(ArgOfTerm(2,t));
} }
static inline PredEntry * static inline PredEntry *
Yap_MegaClausePredicateFromTerm(Term t) Yap_MegaClausePredicateFromTerm(Term t)
{ {
return (PredEntry *)IntegerOfTerm(ArgOfTerm(2,t)); return (PredEntry *)IntegerOfTerm(ArgOfTerm(1,t));
} }