Miroirs/rpn
1
0
Fork 0
mirror of https://github.com/louisrubet/rpn synced 2024-12-28 09:58:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#34: debug for..step commands

Browse source
This commit is contained in:
Louis Rubet 2017-05-19 14:12:48 +02:00
parent c250535dd9
commit f2c7753f62
2 changed files with 71 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/rpn-branch.h
View file

@ -96,22 +96,11 @@ int rpn_for(branch& myobj)
myobj.farg1 = (number*)_branch_stack.back();
_stack->pop_back();
// test value
if (myobj.farg1->_value > myobj.farg2->_value)
// last boundary lower than first boundary
// -> next command shall be after 'next'
// arg2 holds index of 'next'
ret = myobj.arg2 + 1;
else
{
// store symbol with first value
_local_heap.add(sym->_value, myobj.farg1, myobj.farg1->size());
(void)_stack->pop_back();
// store symbol with first value
_local_heap.add(sym->_value, myobj.farg1, myobj.farg1->size());
(void)_stack->pop_back();
ret = myobj.arg1 + 1;
}
return ret;
return myobj.arg1 + 1;
}
int rpn_next(branch& myobj)
@ -161,6 +150,7 @@ int rpn_next(branch& myobj)
int rpn_step(branch& myobj)
{
static int count = 0;
// arg1 = index of start or for command in program
// farg1 = current count
branch* start_or_for = (branch*)seq_obj(myobj.arg1);
@ -174,6 +164,9 @@ int rpn_step(branch& myobj)
number* step = (number*)_stack->pop_back();
mpfr_add(myobj.farg1->_value.mpfr, myobj.farg1->_value.mpfr, step->_value.mpfr, MPFR_DEF_RND);
cout<<"step=";step->show(cout);cout<<endl;
return -1;
// for command: increment symbol too
if (start_or_for->arg1 != -1)
{
@ -186,7 +179,14 @@ int rpn_step(branch& myobj)
}
//test value
if (myobj.farg1->_value > start_or_for->farg2->_value)
bool step_positive = mpfr_cmp_d(step->_value.mpfr, 0.0)>0;
cout<<"(count="<<count;")\n";
if (count++>10)
return -1;
if ((step_positive && (myobj.farg1 > start_or_for->farg2))
|| ((! step_positive) && (myobj.farg1 < start_or_for->farg2)))
{
// end of loop
myobj.arg_bool = false;// init again next time

55
test/branch.txt
View file

@ -45,12 +45,67 @@ erase
-> stack size should be 0
erase
# start next (3)
-2 -1 start 0 next
-> stack should be 0, 0
erase
# start next (4)
-1 -2 start 0 next
-> stack size should be 0
erase
# start next (5)
1 1 start 0 next
-> stack should be 0
erase
# for next (1)
23 27 for i i next
-> stack should be 23, 24, 25, 26, 27
erase
# for next (2)
1 1 for i i next
-> stack should be 1
erase
# for next (3)
27 23 for i i next
-> stack size should be 0
erase
# for next (4)
-2 -1 for i i next
-> stack should be -2, -1
erase
# for next (5)
-1 -2 for i i next
-> stack size should be 0
erase
# for step (1)
23 27 for i 1 step
-> stack should be 23, 24, 25, 26, 27
erase
# for step (2)
0 1 for i i 0.25 step
-> stack should be 0, 0.25, 0.5, 0.75, 1
erase
# for step (3)
-1 0 for i i 0.25 step
-> stack should be -1, -0.75, -0.5, -0.25, 0
erase
# for step (4)
0 -1 for i i 0.25 step
-> stack size should be 0
erase
# for step (5)
0 -1 for i i -0.25 step
-> stack size should be 0, -0.25, -0.5, -0.75, -1
erase