Miroirs/rpn
1
0
Fork 0
mirror of https://github.com/louisrubet/rpn synced 2025-02-01 07:57:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

#126, #127: now type consumes stack, returns string

Browse source
This commit is contained in:
Louis Rubet 2017-06-17 10:21:02 +02:00
parent 562ae5fdef
commit 8b0b447e6a
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/rpn-general.hpp
View file

@ -134,14 +134,14 @@ void type()
{ {
MIN_ARGUMENTS(1); MIN_ARGUMENTS(1);
int type = _stack->back()->_type; int type = _stack->pop_back()->_type;
if (type < 0 || type >= (int)cmd_max) if (type < 0 || type >= (int)cmd_max)
type = (int)cmd_undef; type = (int)cmd_undef;
unsigned int string_size = strlen(object::s_cmd_type_string[type]); unsigned int string_size = strlen(object::s_cmd_type_string[type]);
unsigned int size = sizeof(symbol)+string_size+1; unsigned int size = sizeof(symbol)+string_size+1;
symbol* sym = (symbol*)_stack->allocate_back(size, cmd_symbol); ostring* typ = (ostring*)_stack->allocate_back(size, cmd_string);
sym->set(object::s_cmd_type_string[type], string_size, false); typ->set(object::s_cmd_type_string[type], string_size);
} }
void rpn_default() void rpn_default()

13
test/02-general.txt
View file

@ -12,22 +12,27 @@ erase
# type (1) # type (1)
1 type 1 type
-> stack should be 1, 'number' -> stack should be "number"
erase erase
# type (2) # type (2)
"hey" type "hey" type
-> stack should be "hey", 'string' -> stack should be "string"
erase erase
# type (3) # type (3)
<< -> n << n >> >> type << -> n << n >> >> type
-> stack should be << -> n << n >> >>, 'program' -> stack should be "program"
erase erase
# type (4) # type (4)
(1,2) type (1,2) type
-> stack should be (1,2)), 'complex' -> stack should be "complex"
erase
# type (5)
type
-> error should be 2
erase erase
# default # default