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

beautification

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@475 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2002-05-17 01:01:07 +00:00
parent 3b3a19f5d9
commit 17728f58f5
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/init.c
View File

@ -688,7 +688,7 @@ InitCPredBack(char *Name, int Arity, int Extra, CPredicate Start, CPredicate Con
pe->StateOfPred = NUMBER_OF_CPREDS; pe->StateOfPred = NUMBER_OF_CPREDS;
c_predicates[NUMBER_OF_CPREDS] = Start; c_predicates[NUMBER_OF_CPREDS] = Start;
NUMBER_OF_CPREDS++; NUMBER_OF_CPREDS++;
code->u.lds.p = (CODEADDR) pe; code->u.lds.p = pe;
code->u.lds.s = Arity; code->u.lds.s = Arity;
code->u.lds.extra = Extra; code->u.lds.extra = Extra;
#ifdef YAPOR #ifdef YAPOR
@ -703,7 +703,7 @@ InitCPredBack(char *Name, int Arity, int Extra, CPredicate Start, CPredicate Con
code->u.lds.d = (CODEADDR) Cont; code->u.lds.d = (CODEADDR) Cont;
c_predicates[NUMBER_OF_CPREDS] = Cont; c_predicates[NUMBER_OF_CPREDS] = Cont;
NUMBER_OF_CPREDS++; NUMBER_OF_CPREDS++;
code->u.lds.p = (CODEADDR) pe; code->u.lds.p = pe;
code->u.lds.s = Arity; code->u.lds.s = Arity;
code->u.lds.extra = Extra; code->u.lds.extra = Extra;
#ifdef YAPOR #ifdef YAPOR

18
C/save.c
View File

@ -1618,7 +1618,7 @@ RestoreClause(Clause *Cl)
case _table_answer_resolution: case _table_answer_resolution:
case _table_completion: case _table_completion:
#endif #endif
pc->u.ld.p = CodeAddrAdjust(pc->u.ld.p); pc->u.ld.p = PtoPredAdjust(pc->u.ld.p);
pc->u.ld.d = CodeAddrAdjust(pc->u.ld.d); pc->u.ld.d = CodeAddrAdjust(pc->u.ld.d);
pc = NEXTOP(pc,ld); pc = NEXTOP(pc,ld);
break; break;
@ -1967,7 +1967,7 @@ RestoreClause(Clause *Cl)
break; break;
/* instructions type sdl */ /* instructions type sdl */
case _call_c_wfail: case _call_c_wfail:
pc->u.sdl.p = CodeAddrAdjust(pc->u.sdl.p); pc->u.sdl.p = PtoPredAdjust(pc->u.sdl.p);
pc->u.sdl.l = CodeAddrAdjust(pc->u.sdl.l); pc->u.sdl.l = CodeAddrAdjust(pc->u.sdl.l);
pc->u.sdl.d = CCodeAdjust((PredEntry *)(pc->u.sdl.p)); pc->u.sdl.d = CCodeAdjust((PredEntry *)(pc->u.sdl.p));
pc = NEXTOP(pc,sdl); pc = NEXTOP(pc,sdl);
@ -1977,7 +1977,7 @@ RestoreClause(Clause *Cl)
case _try_userc: case _try_userc:
/* don't need to do no nothing here, initstaff will do it for us /* don't need to do no nothing here, initstaff will do it for us
*/ */
pc->u.lds.p = CodeAddrAdjust(pc->u.lds.p); pc->u.lds.p = PtoPredAdjust(pc->u.lds.p);
pc->u.lds.d = CCodeAdjust((PredEntry *)(pc->u.lds.p)); pc->u.lds.d = CCodeAdjust((PredEntry *)(pc->u.lds.p));
pc = NEXTOP(pc,lds); pc = NEXTOP(pc,lds);
break; break;
@ -1985,7 +1985,7 @@ RestoreClause(Clause *Cl)
case _retry_userc: case _retry_userc:
/* don't need to do no nothing here, initstaff will do it for us /* don't need to do no nothing here, initstaff will do it for us
pc->u.lds.d = CCodeAdjust(pc->u.lds.d); */ pc->u.lds.d = CCodeAdjust(pc->u.lds.d); */
pc->u.lds.p = CodeAddrAdjust(pc->u.lds.p); pc->u.lds.p = PtoPredAdjust(pc->u.lds.p);
pc->u.lds.d = NextCCodeAdjust((PredEntry *)(pc->u.lds.p)); pc->u.lds.d = NextCCodeAdjust((PredEntry *)(pc->u.lds.p));
pc = NEXTOP(pc,lds); pc = NEXTOP(pc,lds);
break; break;
@ -1994,7 +1994,7 @@ RestoreClause(Clause *Cl)
case _trust_first_in: case _trust_first_in:
case _trust_tail_in: case _trust_tail_in:
case _trust_head_in: case _trust_head_in:
pc->u.ldl.p = CodeAddrAdjust(pc->u.ldl.p); pc->u.ldl.p = PtoPredAdjust(pc->u.ldl.p);
pc->u.ldl.d = CodeAddrAdjust(pc->u.ldl.d); pc->u.ldl.d = CodeAddrAdjust(pc->u.ldl.d);
pc->u.ldl.bl = CodeAddrAdjust(pc->u.ldl.bl); pc->u.ldl.bl = CodeAddrAdjust(pc->u.ldl.bl);
pc = NEXTOP(pc,ldl); pc = NEXTOP(pc,ldl);
@ -2154,7 +2154,7 @@ RestoreClause(Clause *Cl)
/* instructions type slll */ /* instructions type slll */
case _switch_last: case _switch_last:
case _switch_l_list: case _switch_l_list:
pc->u.slll.p = CodeAddrAdjust(pc->u.slll.p); pc->u.slll.p = PtoPredAdjust(pc->u.slll.p);
pc->u.slll.l1 = CodeAddrAdjust(pc->u.slll.l1); pc->u.slll.l1 = CodeAddrAdjust(pc->u.slll.l1);
pc->u.slll.l2 = CodeAddrAdjust(pc->u.slll.l2); pc->u.slll.l2 = CodeAddrAdjust(pc->u.slll.l2);
pc->u.slll.l3 = CodeAddrAdjust(pc->u.slll.l3); pc->u.slll.l3 = CodeAddrAdjust(pc->u.slll.l3);
@ -2273,7 +2273,7 @@ RestoreClause(Clause *Cl)
break; break;
/* instructions type lxx */ /* instructions type lxx */
case _call_bfunc_xx: case _call_bfunc_xx:
pc->u.lxx.p = CodeAddrAdjust(pc->u.lxx.p); pc->u.lxx.p = PtoPredAdjust(pc->u.lxx.p);
pc->u.lxx.l = DirectCCodeAdjust((PredEntry *)(pc->u.lxx.p)); pc->u.lxx.l = DirectCCodeAdjust((PredEntry *)(pc->u.lxx.p));
pc->u.lxx.x1 = XAdjust(pc->u.lxx.x1); pc->u.lxx.x1 = XAdjust(pc->u.lxx.x1);
pc->u.lxx.x2 = XAdjust(pc->u.lxx.x2); pc->u.lxx.x2 = XAdjust(pc->u.lxx.x2);
@ -2282,14 +2282,14 @@ RestoreClause(Clause *Cl)
/* instructions type lxy */ /* instructions type lxy */
case _call_bfunc_yx: case _call_bfunc_yx:
case _call_bfunc_xy: case _call_bfunc_xy:
pc->u.lxy.p = CodeAddrAdjust(pc->u.lxy.p); pc->u.lxy.p = PtoPredAdjust(pc->u.lxy.p);
pc->u.lxy.l = DirectCCodeAdjust((PredEntry *)(pc->u.lxy.p)); pc->u.lxy.l = DirectCCodeAdjust((PredEntry *)(pc->u.lxy.p));
pc->u.lxy.x = XAdjust(pc->u.lxy.x); pc->u.lxy.x = XAdjust(pc->u.lxy.x);
pc->u.lxy.y = YAdjust(pc->u.lxy.y); pc->u.lxy.y = YAdjust(pc->u.lxy.y);
pc = NEXTOP(pc,lxy); pc = NEXTOP(pc,lxy);
break; break;
case _call_bfunc_yy: case _call_bfunc_yy:
pc->u.lyy.p = CodeAddrAdjust(pc->u.lyy.p); pc->u.lyy.p = PtoPredAdjust(pc->u.lyy.p);
pc->u.lyy.l = DirectCCodeAdjust((PredEntry *)(pc->u.lyy.p)); pc->u.lyy.l = DirectCCodeAdjust((PredEntry *)(pc->u.lyy.p));
pc->u.lyy.y1 = YAdjust(pc->u.lyy.y1); pc->u.lyy.y1 = YAdjust(pc->u.lyy.y1);
pc->u.lyy.y2 = YAdjust(pc->u.lyy.y2); pc->u.lyy.y2 = YAdjust(pc->u.lyy.y2);

2
pl/boot.yap
View File

@ -500,7 +500,7 @@ repeat :- '$repeat'.
'$show_frozen'(G,V,LGs) :- '$show_frozen'(G,V,LGs) :-
'$all_frozen_goals'(LGs0), LGs0 = [_|_], !, '$all_frozen_goals'(LGs0), LGs0 = [_|_], !,
'$all_attvars'(LAV), attributes:all_attvars(LAV),
'$convert_to_list_of_frozen_goals'(LGs0,V,LAV,G,LGs). '$convert_to_list_of_frozen_goals'(LGs0,V,LAV,G,LGs).
'$show_frozen'(_,_,[]). '$show_frozen'(_,_,[]).

4
pl/corout.yap
View File

@ -619,7 +619,7 @@ call_residue(Goal,Residue) :-
; ;
'$pick_vars_for_project'(LIV,NLIV), '$pick_vars_for_project'(LIV,NLIV),
'$project_module'(LMods,NLIV,LAV), '$project_module'(LMods,NLIV,LAV),
'$all_attvars'(NLAV0), attributes:all_attvars(NLAV0),
'$sort'(NLAV0, NLAV), '$sort'(NLAV0, NLAV),
'$convert_att_vars'(NLAV, LIV, Gs, Gs0) '$convert_att_vars'(NLAV, LIV, Gs, Gs0)
). ).
@ -634,7 +634,7 @@ call_residue(Goal,Residue) :-
'$project_module'([Mod|LMods], LIV, LAV) :- '$project_module'([Mod|LMods], LIV, LAV) :-
\+ '$undefined'(project_attributes(LIV, LAV), Mod), \+ '$undefined'(project_attributes(LIV, LAV), Mod),
'$execute'(Mod:project_attributes(LIV, LAV)), !, '$execute'(Mod:project_attributes(LIV, LAV)), !,
'$all_attvars'(NLAV), attributes:all_attvars(NLAV),
'$project_module'(LMods,LIV,NLAV). '$project_module'(LMods,LIV,NLAV).
'$project_module'([_|LMods], LIV, LAV) :- '$project_module'([_|LMods], LIV, LAV) :-
'$project_module'(LMods,LIV,LAV). '$project_module'(LMods,LIV,LAV).

3
pl/init.yap
View File

@ -91,7 +91,8 @@ system_mode(verbose,off) :- '$set_value'('$verbose',off).
'$set_pred_module'(rm_att(_,_), attributes), '$set_pred_module'(rm_att(_,_), attributes),
'$set_pred_module'(inc_n_of_atts(_), attributes), '$set_pred_module'(inc_n_of_atts(_), attributes),
'$set_pred_module'(n_of_atts(_), attributes), '$set_pred_module'(n_of_atts(_), attributes),
'$set_pred_module'(bind_attvar(_), attributes). '$set_pred_module'(bind_attvar(_), attributes),
'$set_pred_module'(all_attvars(_), attributes).
:- '$set_pred_module'(open_mem_read_stream(_,_), charsio), :- '$set_pred_module'(open_mem_read_stream(_,_), charsio),
'$set_pred_module'(open_mem_write_stream(_), charsio), '$set_pred_module'(open_mem_write_stream(_), charsio),