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

allow better writing of inlined operations

Browse Source 
disallow eval.yap
This commit is contained in:
Vitor Santos Costa 2009-02-16 21:04:30 +00:00
parent 419e0e369f
commit ad2d073184
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
C/computils.c
View File

@ -409,7 +409,7 @@ ShowOp (char *f, struct PSEUDO *cpc)
} }
break; break;
case 'd': case 'd':
Yap_DebugPlWrite (MkIntTerm (rn)); Yap_DebugPlWrite (MkIntegerTerm (arg));
break; break;
case 'z': case 'z':
Yap_DebugPlWrite (MkIntTerm (cpc->rnd3)); Yap_DebugPlWrite (MkIntTerm (cpc->rnd3));
@ -431,6 +431,7 @@ ShowOp (char *f, struct PSEUDO *cpc)
Yap_DebugErrorPutc (v->KindOfVE == PermVar ? 'Y' : 'X'); Yap_DebugErrorPutc (v->KindOfVE == PermVar ? 'Y' : 'X');
Yap_DebugPlWrite (MkIntTerm ((v->NoOfVE) & MaskVarAdrs)); Yap_DebugPlWrite (MkIntTerm ((v->NoOfVE) & MaskVarAdrs));
} }
break;
case 'm': case 'm':
Yap_DebugPlWrite (MkAtomTerm ((Atom) arg)); Yap_DebugPlWrite (MkAtomTerm ((Atom) arg));
Yap_DebugErrorPutc ('/'); Yap_DebugErrorPutc ('/');

11
pl/modules.yap
View File

@ -194,18 +194,11 @@ module(N) :-
% A6: head module (this is the one used in compiling and accessing). % A6: head module (this is the one used in compiling and accessing).
% %
% %
'$module_expansion'((H:-B),(H:-B1),(H:-NBO),M,HM) :- !, '$module_expansion'((H:-B),(H:-B1),(H:-BO),M,HM) :- !,
'$is_mt'(M, H, B, IB, MM), '$is_mt'(M, H, B, IB, MM),
'$module_u_vars'(H,UVars,M), % collect head variables in '$module_u_vars'(H,UVars,M), % collect head variables in
% expanded positions % expanded positions
'$module_expansion'(IB,B1,BO,M,MM,HM,UVars), '$module_expansion'(IB,B1,BO,M,MM,HM,UVars).
(
get_value('$c_arith',true)
->
'$eval':'$compile_arithmetic'((H:-BO),(H:-NBO))
;
NBO = BO
).
% do not expand bodyless clauses. % do not expand bodyless clauses.
'$module_expansion'(H,H,H,_,_). '$module_expansion'(H,H,H,_,_).