rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIXED: use lsb/2 and msb/2 from library(arithmetic)

Browse Source 
This addresses #1720.
This commit is contained in:
Markus Triska
2023-01-28 09:42:26 +01:00
parent 2bdba261ea
commit 5bae8fcaf8
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/clpz.pl
View File

@@ -2962,8 +2962,8 @@ expr_conds(A0>>B0, A>>B) --> expr_conds(A0, A), expr_conds(B0, B).
expr_conds(A0/\B0, A/\B) --> expr_conds(A0, A), expr_conds(B0, B). expr_conds(A0/\B0, A/\B) --> expr_conds(A0, A), expr_conds(B0, B).
expr_conds(A0\/B0, A\/B) --> expr_conds(A0, A), expr_conds(B0, B). expr_conds(A0\/B0, A\/B) --> expr_conds(A0, A), expr_conds(B0, B).
expr_conds(xor(A0,B0), xor(A,B)) --> expr_conds(A0, A), expr_conds(B0, B). expr_conds(xor(A0,B0), xor(A,B)) --> expr_conds(A0, A), expr_conds(B0, B).
expr_conds(lsb(A0), lsb(A)) --> expr_conds(A0, A). % expr_conds(lsb(A0), lsb(A)) --> expr_conds(A0, A).
expr_conds(msb(A0), msb(A)) --> expr_conds(A0, A). % expr_conds(msb(A0), msb(A)) --> expr_conds(A0, A).
expr_conds(popcount(A0), Count) --> expr_conds(popcount(A0), Count) -->
expr_conds(A0, A), expr_conds(A0, A),
[I is A, arithmetic:popcount(I, Count)]. [I is A, arithmetic:popcount(I, Count)].
@@ -3539,8 +3539,8 @@ parse_reified(E, R, D,
m(A^B) => [d(D), p(pexp(A,B,R)), a(A,B,R)], m(A^B) => [d(D), p(pexp(A,B,R)), a(A,B,R)],
% bitwise operations % bitwise operations
m(\A) => [function(D,\,A,R)], m(\A) => [function(D,\,A,R)],
m(msb(A)) => [function(D,msb,A,R)], m(msb(A)) => [g(#A#>0) ,function(D,msb,A,R)],
m(lsb(A)) => [function(D,lsb,A,R)], m(lsb(A)) => [g(#A#>0), function(D,lsb,A,R)],
m(popcount(A)) => [function(D,popcount,A,R)], m(popcount(A)) => [function(D,popcount,A,R)],
m(sign(A)) => [function(D,sign,A,R)], m(sign(A)) => [function(D,sign,A,R)],
m(A<<B) => [function(D,<<,A,B,R)], m(A<<B) => [function(D,<<,A,B,R)],
@@ -5683,8 +5683,11 @@ run_propagator(pfunction(Op,A,B,R), MState) -->
run_propagator(pfunction(Op,A,R), MState) --> run_propagator(pfunction(Op,A,R), MState) -->
( integer(A) -> ( integer(A) ->
kill(MState), kill(MState),
Expr =.. [Op,A], ( Op == msb -> { msb(A, R) }
; Op == lsb -> { lsb(A, R) }
; Expr =.. [Op,A],
R is Expr R is Expr
)
; [] ; []
). ).