Miroirs/newrpl
1
0
Fork 0
mirror of https://git.code.sf.net/p/newrpl/sources synced 2024-11-16 19:51:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed arguments dissapearing during numeric reduction.

Browse source
This commit is contained in:
claudiol 2020-04-06 20:10:54 -04:00
parent dc099669fb
commit 92868c51f3
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
newrpl-fw.pro
View file

@ -242,8 +242,7 @@ SOURCES +=\
newrpl/lib-104-solvers.c \
newrpl/lib-55-constants.c \
newrpl/lib-4081-tags.c \
newrpl/lib-112-asm.c \
firmware/sys/Font24.c
newrpl/lib-112-asm.c

17
newrpl/symbolic.c
View file

@ -2171,7 +2171,7 @@ WORDPTR rplSymbNumericReduce(WORDPTR object)
// HERE WE HAVE A NUMERATOR RESULT IN THE STACK! KEEP IT THERE FOR NOW
// SCAN ALL NUMERIC FACTORS IN THE DENOMINATOR AND MULTIPLY TOGETHER
BINT reddenom = 0, approxdenom = 0;
BINT reddenom = 0, approxdenom = 0, addfactors = 0;
argptr = stkptr - 2;
for(f = 0; f < nargs - redargs; ++f) {
@ -2359,6 +2359,8 @@ WORDPTR rplSymbNumericReduce(WORDPTR object)
++stkptr;
++DSTop;
++addfactors;
*(stkptr - 2) = rplPeekData(1 + ((reddenom > 0) ? 1 : 0)); // STORE THE NUMERATOR
}
@ -2416,6 +2418,7 @@ WORDPTR rplSymbNumericReduce(WORDPTR object)
ptr[1] = rplPeekData(1); // STORE THE DENOMINATOR
ptr[2] = (WORDPTR) two_bint;
ptr[3] = (WORDPTR) inverse_opcode;
++addfactors;
}
--DSTop;
@ -2435,17 +2438,7 @@ WORDPTR rplSymbNumericReduce(WORDPTR object)
if(redargs + reddenom) {
// UPDATE THE ARGUMENT COUNT
BINT newcount = nargs - redargs - reddenom;
if((redargs || num_is_one) && !(num_is_one
&& (reddenom + redargs < nargs)))
++newcount;
else if(approxdenom)
++newcount;
if(reddenom) {
++newcount;
if(den_is_one)
--newcount;
}
BINT newcount = nargs - redargs - reddenom + addfactors;
if(newcount < 2) {
// SINGLE ARGUMENT, SO REMOVE THE MULTIPLICATION