long -> Int
This commit is contained in:
parent
f83ac17ca3
commit
faeef37a03
|
@ -1372,7 +1372,7 @@ ArgsOfSFTerm(Term t)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
long
|
Int
|
||||||
Yap_NewSlots(int n)
|
Yap_NewSlots(int n)
|
||||||
{
|
{
|
||||||
Int old_slots = IntOfTerm(ASP[0]), oldn = n;
|
Int old_slots = IntOfTerm(ASP[0]), oldn = n;
|
||||||
|
@ -1385,7 +1385,7 @@ Yap_NewSlots(int n)
|
||||||
return((ASP+1)-LCL0);
|
return((ASP+1)-LCL0);
|
||||||
}
|
}
|
||||||
|
|
||||||
long
|
Int
|
||||||
Yap_InitSlot(Term t)
|
Yap_InitSlot(Term t)
|
||||||
{
|
{
|
||||||
Int old_slots = IntOfTerm(ASP[0]);
|
Int old_slots = IntOfTerm(ASP[0]);
|
||||||
|
@ -1408,25 +1408,25 @@ Yap_RecoverSlots(int n)
|
||||||
}
|
}
|
||||||
|
|
||||||
Term
|
Term
|
||||||
Yap_GetFromSlot(long slot)
|
Yap_GetFromSlot(Int slot)
|
||||||
{
|
{
|
||||||
return(Deref(LCL0[slot]));
|
return(Deref(LCL0[slot]));
|
||||||
}
|
}
|
||||||
|
|
||||||
Term
|
Term
|
||||||
Yap_GetPtrFromSlot(long slot)
|
Yap_GetPtrFromSlot(Int slot)
|
||||||
{
|
{
|
||||||
return(LCL0[slot]);
|
return(LCL0[slot]);
|
||||||
}
|
}
|
||||||
|
|
||||||
Term *
|
Term *
|
||||||
Yap_AddressFromSlot(long slot)
|
Yap_AddressFromSlot(Int slot)
|
||||||
{
|
{
|
||||||
return(LCL0+slot);
|
return(LCL0+slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Yap_PutInSlot(long slot, Term t)
|
Yap_PutInSlot(Int slot, Term t)
|
||||||
{
|
{
|
||||||
LCL0[slot] = t;
|
LCL0[slot] = t;
|
||||||
}
|
}
|
||||||
|
|
|
@ -406,8 +406,8 @@ X_API Term STD_PROTO(YAP_MkPairTerm,(Term,Term));
|
||||||
X_API Term STD_PROTO(YAP_MkNewPairTerm,(void));
|
X_API Term STD_PROTO(YAP_MkNewPairTerm,(void));
|
||||||
X_API Term STD_PROTO(YAP_HeadOfTerm,(Term));
|
X_API Term STD_PROTO(YAP_HeadOfTerm,(Term));
|
||||||
X_API Term STD_PROTO(YAP_TailOfTerm,(Term));
|
X_API Term STD_PROTO(YAP_TailOfTerm,(Term));
|
||||||
X_API Term STD_PROTO(YAP_MkApplTerm,(Functor,unsigned long int,Term *));
|
X_API Term STD_PROTO(YAP_MkApplTerm,(Functor,UInt,Term *));
|
||||||
X_API Term STD_PROTO(YAP_MkNewApplTerm,(Functor,unsigned long int));
|
X_API Term STD_PROTO(YAP_MkNewApplTerm,(Functor,UInt));
|
||||||
X_API Functor STD_PROTO(YAP_FunctorOfTerm,(Term));
|
X_API Functor STD_PROTO(YAP_FunctorOfTerm,(Term));
|
||||||
X_API Term STD_PROTO(YAP_ArgOfTerm,(Int,Term));
|
X_API Term STD_PROTO(YAP_ArgOfTerm,(Int,Term));
|
||||||
X_API Term *STD_PROTO(YAP_ArgsOfTerm,(Term));
|
X_API Term *STD_PROTO(YAP_ArgsOfTerm,(Term));
|
||||||
|
@ -470,23 +470,23 @@ X_API int STD_PROTO(YAP_StreamToFileNo, (Term));
|
||||||
X_API void STD_PROTO(YAP_CloseAllOpenStreams,(void));
|
X_API void STD_PROTO(YAP_CloseAllOpenStreams,(void));
|
||||||
X_API void STD_PROTO(YAP_FlushAllStreams,(void));
|
X_API void STD_PROTO(YAP_FlushAllStreams,(void));
|
||||||
X_API Term STD_PROTO(YAP_OpenStream,(void *, char *, Term, int));
|
X_API Term STD_PROTO(YAP_OpenStream,(void *, char *, Term, int));
|
||||||
X_API long STD_PROTO(YAP_CurrentSlot,(void));
|
X_API Int STD_PROTO(YAP_CurrentSlot,(void));
|
||||||
X_API long STD_PROTO(YAP_NewSlots,(int));
|
X_API Int STD_PROTO(YAP_NewSlots,(int));
|
||||||
X_API long STD_PROTO(YAP_InitSlot,(Term));
|
X_API Int STD_PROTO(YAP_InitSlot,(Term));
|
||||||
X_API Term STD_PROTO(YAP_GetFromSlot,(long));
|
X_API Term STD_PROTO(YAP_GetFromSlot,(Int));
|
||||||
X_API Term *STD_PROTO(YAP_AddressFromSlot,(long));
|
X_API Term *STD_PROTO(YAP_AddressFromSlot,(Int));
|
||||||
X_API void STD_PROTO(YAP_PutInSlot,(long, Term));
|
X_API void STD_PROTO(YAP_PutInSlot,(Int, Term));
|
||||||
X_API int STD_PROTO(YAP_RecoverSlots,(int));
|
X_API int STD_PROTO(YAP_RecoverSlots,(int));
|
||||||
X_API void STD_PROTO(YAP_Throw,(Term));
|
X_API void STD_PROTO(YAP_Throw,(Term));
|
||||||
X_API void STD_PROTO(YAP_Halt,(int));
|
X_API void STD_PROTO(YAP_Halt,(int));
|
||||||
X_API Term *STD_PROTO(YAP_TopOfLocalStack,(void));
|
X_API Term *STD_PROTO(YAP_TopOfLocalStack,(void));
|
||||||
X_API void *STD_PROTO(YAP_Predicate,(Atom,unsigned long int,Term));
|
X_API void *STD_PROTO(YAP_Predicate,(Atom,UInt,Term));
|
||||||
X_API void STD_PROTO(YAP_PredicateInfo,(void *,Atom *,unsigned long int *,Term *));
|
X_API void STD_PROTO(YAP_PredicateInfo,(void *,Atom *,UInt *,Term *));
|
||||||
X_API void STD_PROTO(YAP_UserCPredicate,(char *,CPredicate,unsigned long int));
|
X_API void STD_PROTO(YAP_UserCPredicate,(char *,CPredicate,UInt));
|
||||||
X_API void STD_PROTO(YAP_UserBackCPredicate,(char *,CPredicate,CPredicate,unsigned long int,unsigned int));
|
X_API void STD_PROTO(YAP_UserBackCPredicate,(char *,CPredicate,CPredicate,UInt,unsigned int));
|
||||||
X_API void STD_PROTO(YAP_UserCPredicateWithArgs,(char *,CPredicate,unsigned long int,Term));
|
X_API void STD_PROTO(YAP_UserCPredicateWithArgs,(char *,CPredicate,UInt,Term));
|
||||||
#ifdef CUT_C
|
#ifdef CUT_C
|
||||||
X_API void STD_PROTO(YAP_UserBackCutCPredicate,(char *,CPredicate,CPredicate,CPredicate,unsigned long int,unsigned int));
|
X_API void STD_PROTO(YAP_UserBackCutCPredicate,(char *,CPredicate,CPredicate,CPredicate,UInt,unsigned int));
|
||||||
X_API void *STD_PROTO(YAP_ExtraSpaceCut,(void));
|
X_API void *STD_PROTO(YAP_ExtraSpaceCut,(void));
|
||||||
#endif
|
#endif
|
||||||
X_API Term STD_PROTO(YAP_CurrentModule,(void));
|
X_API Term STD_PROTO(YAP_CurrentModule,(void));
|
||||||
|
@ -864,8 +864,8 @@ YAP_MkPairTerm(Term t1, Term t2)
|
||||||
BACKUP_H();
|
BACKUP_H();
|
||||||
|
|
||||||
if (H > ASP-1024) {
|
if (H > ASP-1024) {
|
||||||
long sl1 = Yap_InitSlot(t1);
|
Int sl1 = Yap_InitSlot(t1);
|
||||||
long sl2 = Yap_InitSlot(t2);
|
Int sl2 = Yap_InitSlot(t2);
|
||||||
if (!dogc()) {
|
if (!dogc()) {
|
||||||
RECOVER_H();
|
RECOVER_H();
|
||||||
return TermNil;
|
return TermNil;
|
||||||
|
@ -907,7 +907,7 @@ YAP_TailOfTerm(Term t)
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API Term
|
X_API Term
|
||||||
YAP_MkApplTerm(Functor f,unsigned long int arity, Term args[])
|
YAP_MkApplTerm(Functor f,UInt arity, Term args[])
|
||||||
{
|
{
|
||||||
Term t;
|
Term t;
|
||||||
BACKUP_H();
|
BACKUP_H();
|
||||||
|
@ -922,7 +922,7 @@ YAP_MkApplTerm(Functor f,unsigned long int arity, Term args[])
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API Term
|
X_API Term
|
||||||
YAP_MkNewApplTerm(Functor f,unsigned long int arity)
|
YAP_MkNewApplTerm(Functor f,UInt arity)
|
||||||
{
|
{
|
||||||
Term t;
|
Term t;
|
||||||
BACKUP_H();
|
BACKUP_H();
|
||||||
|
@ -1052,19 +1052,19 @@ YAP_Unify(Term t1, Term t2)
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API long
|
X_API Int
|
||||||
YAP_CurrentSlot(void)
|
YAP_CurrentSlot(void)
|
||||||
{
|
{
|
||||||
return Yap_CurrentSlot();
|
return Yap_CurrentSlot();
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API long
|
X_API Int
|
||||||
YAP_NewSlots(int n)
|
YAP_NewSlots(int n)
|
||||||
{
|
{
|
||||||
return Yap_NewSlots(n);
|
return Yap_NewSlots(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API long
|
X_API Int
|
||||||
YAP_InitSlot(Term t)
|
YAP_InitSlot(Term t)
|
||||||
{
|
{
|
||||||
return Yap_InitSlot(t);
|
return Yap_InitSlot(t);
|
||||||
|
@ -1077,19 +1077,19 @@ YAP_RecoverSlots(int n)
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API Term
|
X_API Term
|
||||||
YAP_GetFromSlot(long slot)
|
YAP_GetFromSlot(Int slot)
|
||||||
{
|
{
|
||||||
return Yap_GetFromSlot(slot);
|
return Yap_GetFromSlot(slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API Term *
|
X_API Term *
|
||||||
YAP_AddressFromSlot(long slot)
|
YAP_AddressFromSlot(Int slot)
|
||||||
{
|
{
|
||||||
return Yap_AddressFromSlot(slot);
|
return Yap_AddressFromSlot(slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API void
|
X_API void
|
||||||
YAP_PutInSlot(long slot, Term t)
|
YAP_PutInSlot(Int slot, Term t)
|
||||||
{
|
{
|
||||||
Yap_PutInSlot(slot, t);
|
Yap_PutInSlot(slot, t);
|
||||||
}
|
}
|
||||||
|
@ -1107,14 +1107,14 @@ typedef struct foreign_context
|
||||||
struct PL_local_data *engine; /* invoking engine */
|
struct PL_local_data *engine; /* invoking engine */
|
||||||
} scontext ;
|
} scontext ;
|
||||||
|
|
||||||
typedef Int (*CPredicate1)(long);
|
typedef Int (*CPredicate1)(Int);
|
||||||
typedef Int (*CPredicate2)(long,long);
|
typedef Int (*CPredicate2)(Int,Int);
|
||||||
typedef Int (*CPredicate3)(long,long,long);
|
typedef Int (*CPredicate3)(Int,Int,Int);
|
||||||
typedef Int (*CPredicate4)(long,long,long,long);
|
typedef Int (*CPredicate4)(Int,Int,Int,Int);
|
||||||
typedef Int (*CPredicate5)(long,long,long,long,long);
|
typedef Int (*CPredicate5)(Int,Int,Int,Int,Int);
|
||||||
typedef Int (*CPredicate6)(long,long,long,long,long,long);
|
typedef Int (*CPredicate6)(Int,Int,Int,Int,Int,Int);
|
||||||
typedef Int (*CPredicate7)(long,long,long,long,long,long,long);
|
typedef Int (*CPredicate7)(Int,Int,Int,Int,Int,Int,Int);
|
||||||
typedef Int (*CPredicate8)(long,long,long,long,long,long,long,long);
|
typedef Int (*CPredicate8)(Int,Int,Int,Int,Int,Int,Int,Int);
|
||||||
typedef Int (*CPredicateV)(Int,Int,struct foreign_context *);
|
typedef Int (*CPredicateV)(Int,Int,struct foreign_context *);
|
||||||
|
|
||||||
static Int
|
static Int
|
||||||
|
@ -1200,14 +1200,14 @@ execute_cargs(PredEntry *pe, CPredicate exec_code)
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef Int (*CBPredicate)(struct foreign_context *);
|
typedef Int (*CBPredicate)(struct foreign_context *);
|
||||||
typedef Int (*CBPredicate1)(long,struct foreign_context *);
|
typedef Int (*CBPredicate1)(Int,struct foreign_context *);
|
||||||
typedef Int (*CBPredicate2)(long,long,struct foreign_context *);
|
typedef Int (*CBPredicate2)(Int,Int,struct foreign_context *);
|
||||||
typedef Int (*CBPredicate3)(long,long,long,struct foreign_context *);
|
typedef Int (*CBPredicate3)(Int,Int,Int,struct foreign_context *);
|
||||||
typedef Int (*CBPredicate4)(long,long,long,long,struct foreign_context *);
|
typedef Int (*CBPredicate4)(Int,Int,Int,Int,struct foreign_context *);
|
||||||
typedef Int (*CBPredicate5)(long,long,long,long,long,struct foreign_context *);
|
typedef Int (*CBPredicate5)(Int,Int,Int,Int,Int,struct foreign_context *);
|
||||||
typedef Int (*CBPredicate6)(long,long,long,long,long,long,struct foreign_context *);
|
typedef Int (*CBPredicate6)(Int,Int,Int,Int,Int,Int,struct foreign_context *);
|
||||||
typedef Int (*CBPredicate7)(long,long,long,long,long,long,long,struct foreign_context *);
|
typedef Int (*CBPredicate7)(Int,Int,Int,Int,Int,Int,Int,struct foreign_context *);
|
||||||
typedef Int (*CBPredicate8)(long,long,long,long,long,long,long,long,struct foreign_context *);
|
typedef Int (*CBPredicate8)(Int,Int,Int,Int,Int,Int,Int,Int,struct foreign_context *);
|
||||||
|
|
||||||
static Int
|
static Int
|
||||||
execute_cargs_back(PredEntry *pe, CPredicate exec_code, struct foreign_context *ctx)
|
execute_cargs_back(PredEntry *pe, CPredicate exec_code, struct foreign_context *ctx)
|
||||||
|
@ -2712,7 +2712,7 @@ YAP_TopOfLocalStack(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API void *
|
X_API void *
|
||||||
YAP_Predicate(Atom a, unsigned long int arity, Term m)
|
YAP_Predicate(Atom a, UInt arity, Term m)
|
||||||
{
|
{
|
||||||
if (arity == 0) {
|
if (arity == 0) {
|
||||||
return((void *)RepPredProp(PredPropByAtom(a,m)));
|
return((void *)RepPredProp(PredPropByAtom(a,m)));
|
||||||
|
@ -2723,7 +2723,7 @@ YAP_Predicate(Atom a, unsigned long int arity, Term m)
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API void
|
X_API void
|
||||||
YAP_PredicateInfo(void *p, Atom* a, unsigned long int* arity, Term* m)
|
YAP_PredicateInfo(void *p, Atom* a, UInt* arity, Term* m)
|
||||||
{
|
{
|
||||||
PredEntry *pd = (PredEntry *)p;
|
PredEntry *pd = (PredEntry *)p;
|
||||||
if (pd->ArityOfPE) {
|
if (pd->ArityOfPE) {
|
||||||
|
@ -2740,14 +2740,14 @@ YAP_PredicateInfo(void *p, Atom* a, unsigned long int* arity, Term* m)
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API void
|
X_API void
|
||||||
YAP_UserCPredicate(char *name, CPredicate def, unsigned long int arity)
|
YAP_UserCPredicate(char *name, CPredicate def, UInt arity)
|
||||||
{
|
{
|
||||||
Yap_InitCPred(name, arity, def, UserCPredFlag);
|
Yap_InitCPred(name, arity, def, UserCPredFlag);
|
||||||
}
|
}
|
||||||
|
|
||||||
X_API void
|
X_API void
|
||||||
YAP_UserBackCPredicate(char *name, CPredicate init, CPredicate cont,
|
YAP_UserBackCPredicate(char *name, CPredicate init, CPredicate cont,
|
||||||
unsigned long int arity, unsigned int extra)
|
UInt arity, unsigned int extra)
|
||||||
{
|
{
|
||||||
#ifdef CUT_C
|
#ifdef CUT_C
|
||||||
Yap_InitCPredBackCut(name, arity, extra, init, cont, NULL ,UserCPredFlag);
|
Yap_InitCPredBackCut(name, arity, extra, init, cont, NULL ,UserCPredFlag);
|
||||||
|
@ -2760,7 +2760,7 @@ YAP_UserBackCPredicate(char *name, CPredicate init, CPredicate cont,
|
||||||
#ifdef CUT_C
|
#ifdef CUT_C
|
||||||
X_API void
|
X_API void
|
||||||
YAP_UserBackCutCPredicate(char *name, CPredicate init, CPredicate cont, CPredicate cut,
|
YAP_UserBackCutCPredicate(char *name, CPredicate init, CPredicate cont, CPredicate cut,
|
||||||
unsigned long int arity, unsigned int extra)
|
UInt arity, unsigned int extra)
|
||||||
{
|
{
|
||||||
Yap_InitCPredBackCut(name, arity, extra, init, cont, cut, UserCPredFlag);
|
Yap_InitCPredBackCut(name, arity, extra, init, cont, cut, UserCPredFlag);
|
||||||
}
|
}
|
||||||
|
@ -2768,7 +2768,7 @@ YAP_UserBackCutCPredicate(char *name, CPredicate init, CPredicate cont, CPredica
|
||||||
|
|
||||||
|
|
||||||
X_API void
|
X_API void
|
||||||
YAP_UserCPredicateWithArgs(char *a, CPredicate f, unsigned long int arity, Term mod)
|
YAP_UserCPredicateWithArgs(char *a, CPredicate f, UInt arity, Term mod)
|
||||||
{
|
{
|
||||||
PredEntry *pe;
|
PredEntry *pe;
|
||||||
Term cm = CurrentModule;
|
Term cm = CurrentModule;
|
||||||
|
|
|
@ -3719,7 +3719,6 @@ do_gc(Int predarity, CELL *current_env, yamop *nextop)
|
||||||
int gc_trace;
|
int gc_trace;
|
||||||
UInt gc_phase;
|
UInt gc_phase;
|
||||||
UInt alloc_sz;
|
UInt alloc_sz;
|
||||||
|
|
||||||
heap_cells = H-H0;
|
heap_cells = H-H0;
|
||||||
gc_verbose = is_gc_verbose();
|
gc_verbose = is_gc_verbose();
|
||||||
effectiveness = 0;
|
effectiveness = 0;
|
||||||
|
|
|
@ -5330,8 +5330,8 @@ format(volatile Term otail, volatile Term oargs, int sno)
|
||||||
t = targs[targ++];
|
t = targs[targ++];
|
||||||
Yap_StartSlots();
|
Yap_StartSlots();
|
||||||
{
|
{
|
||||||
long sl = Yap_InitSlot(args);
|
Int sl = Yap_InitSlot(args);
|
||||||
long sl2;
|
Int sl2;
|
||||||
Int res;
|
Int res;
|
||||||
Term ta[2];
|
Term ta[2];
|
||||||
Term ts;
|
Term ts;
|
||||||
|
@ -5360,7 +5360,7 @@ format(volatile Term otail, volatile Term oargs, int sno)
|
||||||
t = targs[targ++];
|
t = targs[targ++];
|
||||||
Yap_StartSlots();
|
Yap_StartSlots();
|
||||||
{
|
{
|
||||||
long sl = Yap_InitSlot(args);
|
Int sl = Yap_InitSlot(args);
|
||||||
Yap_plwrite(t, f_putc, Handle_vars_f|Use_portray_f|To_heap_f, 1200);
|
Yap_plwrite(t, f_putc, Handle_vars_f|Use_portray_f|To_heap_f, 1200);
|
||||||
FormatInfo = &finfo;
|
FormatInfo = &finfo;
|
||||||
args = Yap_GetFromSlot(sl);
|
args = Yap_GetFromSlot(sl);
|
||||||
|
|
|
@ -172,7 +172,7 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
|
||||||
LOCK(Yap_heap_regs->low_level_trace_lock);
|
LOCK(Yap_heap_regs->low_level_trace_lock);
|
||||||
sc = Yap_heap_regs;
|
sc = Yap_heap_regs;
|
||||||
vsc_count++;
|
vsc_count++;
|
||||||
#ifdef THREADS
|
#ifdef THREADS
|
||||||
MY_ThreadHandle.thread_inst_count++;
|
MY_ThreadHandle.thread_inst_count++;
|
||||||
#endif
|
#endif
|
||||||
#ifdef COMMENTED
|
#ifdef COMMENTED
|
||||||
|
@ -385,10 +385,13 @@ static Int p_start_low_level_trace2(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
static Int p_stop_low_level_trace(void)
|
static Int p_stop_low_level_trace(void)
|
||||||
{
|
{
|
||||||
Yap_do_low_level_trace = FALSE;
|
Yap_do_low_level_trace = FALSE;
|
||||||
do_trace_primitives = TRUE;
|
do_trace_primitives = TRUE;
|
||||||
|
fprintf(stderr,"vsc_count = %I64d\n",vsc_count);
|
||||||
return(TRUE);
|
return(TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,8 +46,8 @@ static wtype lastw;
|
||||||
typedef int (*wrf) (int, wchar_t);
|
typedef int (*wrf) (int, wchar_t);
|
||||||
|
|
||||||
typedef struct union_slots {
|
typedef struct union_slots {
|
||||||
long old;
|
Int old;
|
||||||
long ptr;
|
Int ptr;
|
||||||
} uslots;
|
} uslots;
|
||||||
|
|
||||||
typedef struct union_direct {
|
typedef struct union_direct {
|
||||||
|
@ -408,7 +408,7 @@ write_var(CELL *t, struct write_globs *wglb, struct rewind_term *rwt)
|
||||||
Yap_Portray_delays = FALSE;
|
Yap_Portray_delays = FALSE;
|
||||||
if (ext == attvars_ext) {
|
if (ext == attvars_ext) {
|
||||||
attvar_record *attv = RepAttVar(t);
|
attvar_record *attv = RepAttVar(t);
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
Term l = attv->Atts;
|
Term l = attv->Atts;
|
||||||
|
|
||||||
wrputs("$AT(",wglb->writewch);
|
wrputs("$AT(",wglb->writewch);
|
||||||
|
@ -488,7 +488,7 @@ write_list(Term t, int direction, int depth, struct write_globs *wglb, struct re
|
||||||
nrwt.u.s.ptr = 0;
|
nrwt.u.s.ptr = 0;
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
long sl= 0;
|
Int sl= 0;
|
||||||
int ndirection;
|
int ndirection;
|
||||||
int do_jump;
|
int do_jump;
|
||||||
|
|
||||||
|
@ -570,7 +570,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
|
||||||
if (wglb->Use_portray) {
|
if (wglb->Use_portray) {
|
||||||
Term targs[1];
|
Term targs[1];
|
||||||
Term old_EX = 0L;
|
Term old_EX = 0L;
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
|
|
||||||
targs[0] = t;
|
targs[0] = t;
|
||||||
Yap_PutValue(AtomPortray, MkAtomTerm(AtomNil));
|
Yap_PutValue(AtomPortray, MkAtomTerm(AtomNil));
|
||||||
|
@ -685,7 +685,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
|
||||||
wrputc('(', wglb->writewch);
|
wrputc('(', wglb->writewch);
|
||||||
lastw = separator;
|
lastw = separator;
|
||||||
while (*p) {
|
while (*p) {
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
|
|
||||||
while (argno < *p) {
|
while (argno < *p) {
|
||||||
wrputc('_', wglb->writewch), wrputc(',', wglb->writewch);
|
wrputc('_', wglb->writewch), wrputc(',', wglb->writewch);
|
||||||
|
@ -717,7 +717,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
|
||||||
if (wglb->Use_portray) {
|
if (wglb->Use_portray) {
|
||||||
Term targs[1];
|
Term targs[1];
|
||||||
Term old_EX = 0L;
|
Term old_EX = 0L;
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
|
|
||||||
targs[0] = t;
|
targs[0] = t;
|
||||||
Yap_PutValue(AtomPortray, MkAtomTerm(AtomNil));
|
Yap_PutValue(AtomPortray, MkAtomTerm(AtomNil));
|
||||||
|
@ -771,7 +771,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
|
||||||
Arity == 1 &&
|
Arity == 1 &&
|
||||||
Yap_IsPosfixOp(atom, &op, &lp)) {
|
Yap_IsPosfixOp(atom, &op, &lp)) {
|
||||||
Term tleft = ArgOfTerm(1, t);
|
Term tleft = ArgOfTerm(1, t);
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
int bracket_left =
|
int bracket_left =
|
||||||
!IsVarTerm(tleft) && IsAtomTerm(tleft) &&
|
!IsVarTerm(tleft) && IsAtomTerm(tleft) &&
|
||||||
LeftOpToProtect(AtomOfTerm(tleft), lp);
|
LeftOpToProtect(AtomOfTerm(tleft), lp);
|
||||||
|
@ -811,7 +811,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
|
||||||
&rp) ) {
|
&rp) ) {
|
||||||
Term tleft = ArgOfTerm(1, t);
|
Term tleft = ArgOfTerm(1, t);
|
||||||
Term tright = ArgOfTerm(2, t);
|
Term tright = ArgOfTerm(2, t);
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
int bracket_left =
|
int bracket_left =
|
||||||
!IsVarTerm(tleft) && IsAtomTerm(tleft) &&
|
!IsVarTerm(tleft) && IsAtomTerm(tleft) &&
|
||||||
LeftOpToProtect(AtomOfTerm(tleft), lp);
|
LeftOpToProtect(AtomOfTerm(tleft), lp);
|
||||||
|
@ -891,7 +891,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
|
||||||
putUnquotedString(ti, wglb->writewch);
|
putUnquotedString(ti, wglb->writewch);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
|
|
||||||
wrputs("'$VAR'(",wglb->writewch);
|
wrputs("'$VAR'(",wglb->writewch);
|
||||||
lastw = separator;
|
lastw = separator;
|
||||||
|
@ -917,7 +917,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
|
||||||
wrputc('}', wglb->writewch);
|
wrputc('}', wglb->writewch);
|
||||||
lastw = separator;
|
lastw = separator;
|
||||||
} else if (atom == AtomArray) {
|
} else if (atom == AtomArray) {
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
|
|
||||||
wrputc('{', wglb->writewch);
|
wrputc('{', wglb->writewch);
|
||||||
lastw = separator;
|
lastw = separator;
|
||||||
|
@ -951,7 +951,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
|
||||||
lastw = separator;
|
lastw = separator;
|
||||||
wrputc('(', wglb->writewch);
|
wrputc('(', wglb->writewch);
|
||||||
for (op = 1; op <= Arity; ++op) {
|
for (op = 1; op <= Arity; ++op) {
|
||||||
long sl = 0;
|
Int sl = 0;
|
||||||
|
|
||||||
if (op == wglb->MaxArgs) {
|
if (op == wglb->MaxArgs) {
|
||||||
wrputc('.', wglb->writewch);
|
wrputc('.', wglb->writewch);
|
||||||
|
|
|
@ -61,13 +61,13 @@ int STD_PROTO(Yap_AtomDecreaseHold,(Atom));
|
||||||
|
|
||||||
#define Yap_StartSlots() (*--ASP = MkIntTerm(0))
|
#define Yap_StartSlots() (*--ASP = MkIntTerm(0))
|
||||||
#define Yap_CurrentSlot() IntOfTerm(ASP[0])
|
#define Yap_CurrentSlot() IntOfTerm(ASP[0])
|
||||||
long STD_PROTO(Yap_InitSlot,(Term));
|
Int STD_PROTO(Yap_InitSlot,(Term));
|
||||||
long STD_PROTO(Yap_NewSlots,(int));
|
Int STD_PROTO(Yap_NewSlots,(int));
|
||||||
Term STD_PROTO(Yap_GetFromSlot,(long));
|
Term STD_PROTO(Yap_GetFromSlot,(Int));
|
||||||
int STD_PROTO(Yap_RecoverSlots,(int));
|
int STD_PROTO(Yap_RecoverSlots,(int));
|
||||||
Term STD_PROTO(Yap_GetPtrFromSlot,(long));
|
Term STD_PROTO(Yap_GetPtrFromSlot,(Int));
|
||||||
Term *STD_PROTO(Yap_AddressFromSlot,(long));
|
Term *STD_PROTO(Yap_AddressFromSlot,(Int));
|
||||||
void STD_PROTO(Yap_PutInSlot,(long, Term));
|
void STD_PROTO(Yap_PutInSlot,(Int, Term));
|
||||||
|
|
||||||
|
|
||||||
#ifdef SFUNC
|
#ifdef SFUNC
|
||||||
|
|
Reference in New Issue