Miroirs/rpn
1
0
Fork 0
mirror of https://github.com/louisrubet/rpn synced 2024-12-30 10:23:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#34: debug for..netx commands

Browse source
This commit is contained in:
Louis Rubet 2017-05-17 18:15:03 +02:00
parent a16a9e13ce
commit e4dced2735
2 changed files with 55 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/rpn-branch.h
View file

@ -77,28 +77,41 @@ int rpn_start(branch& myobj)
int rpn_for(branch& myobj)
{
int ret;
MIN_ARGUMENTS_RET(2, 1);
ARG_MUST_BE_OF_TYPE_RET(0, cmd_number, -1);
ARG_MUST_BE_OF_TYPE_RET(1, cmd_number, -1);
symbol* sym = ((symbol*)seq_obj(myobj.arg1));
// farg1 = first value of for command
// farg2 = last value of for command
// arg1 = index of symbol to increase
stack::copy_and_push_back(*_stack, 0, _branch_stack);
//myobj.farg2 = (number*)_branch_stack.back();
//myobj.farg2->init(_branch_stack.back_blob());
stack::copy_and_push_back(*_stack, 0, _branch_stack);
//myobj.farg1 = (number*)_branch_stack.back();
//myobj.farg1->init(_branch_stack.back_blob());
stack::copy_and_push_back(*_stack, _stack->size()-1, _branch_stack);
myobj.farg2 = (number*)_branch_stack.back();
_stack->pop_back();
// farg1 = first value of for command
stack::copy_and_push_back(*_stack, _stack->size()-1, _branch_stack);
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
//TODO
//number* num = (number*)_local_heap.add(string(sym->_value), NULL, number::calc_size(), cmd_number);
//num->set(myobj.farg1);
_local_heap.add(sym->_value, myobj.farg1, myobj.farg1->size());
(void)_stack->pop_back();
return myobj.arg1 + 1;
ret = myobj.arg1 + 1;
}
return ret;
}
int rpn_next(branch& myobj)
@ -118,17 +131,12 @@ int rpn_next(branch& myobj)
// for command: increment symbol too
if (start_or_for->arg1 != -1)
{
void* obj;
object* obj;
unsigned int size;
int type;
symbol* var = (symbol*)seq_obj(start_or_for->arg1);
// check symbol variable is a number, then increase
// if (_local_heap.get(string(var->_value), obj, size, type) && (type == cmd_number))
// {
// ((number*)obj)->set(myobj.farg1);
// ((number*)obj)->ensure_significand();
// }
// increase symbol variable
_local_heap.replace_value(string(var->_value), myobj.farg1, myobj.farg1->size());
}
//test value

26
src/stack.h
View file

@ -201,7 +201,7 @@ public:
free(i->second);
}
object* add(const string name, void* obj, unsigned int size, int type = 0)
object* add(const string name, object* obj, unsigned int size, int type = 0)
{
struct local_var* local = _map[name];
if (local == NULL)
@ -219,9 +219,13 @@ public:
local->length = size;
if (obj != NULL)
{
memcpy(local->obj, obj, size);
if (local->obj->_type == cmd_number)
((number*)local->obj)->_value.set_significand(((number*)local->obj)+1);
}
return (object*)local->obj;
return local->obj;
}
bool get(const string name, object*& obj, unsigned int& size)
@ -240,6 +244,24 @@ public:
return false;
}
bool replace_value(const string name, object* obj, unsigned int size)
{
bool ret=false;
map<string, struct local_var*>::iterator i = _map.find(name);
if (i != _map.end())
{
if (i->second != NULL && size==i->second->length)
{
(void)memcpy(i->second->obj, obj, size);
if (i->second->obj->_type == cmd_number)
((number*)i->second->obj)->_value.set_significand(((number*)i->second->obj)+1);
}
return true;
}
return ret;
}
bool exist(const string name)
{
return (_map.find(name) != _map.end());