gwh/rpl.rb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

also EVAL names and words

Browse source
This commit is contained in:
Gwenhael Le Moine 2021-11-18 14:23:56 +01:00
parent cc99b517a7
commit db02abb114
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/dictionary.rb
View file

@ -133,7 +133,7 @@ module Rpn
add( 'sinv', proc { |stack| Rpn::Core.__todo( stack ) } ) # inverse a variable. ex: 1 'name' sinv add( 'sinv', proc { |stack| Rpn::Core.__todo( stack ) } ) # inverse a variable. ex: 1 'name' sinv
# PROGRAM # PROGRAM
add( 'eval', proc { |stack| Rpn::Core::Program.eval( stack, self ) } ) # evaluate (run) a program, or recall a variable. ex: 'my_prog' eval add( 'eval', proc { |stack| Rpn::Core::Program.eval( stack, self ) } )
add( '->', proc { |stack| Rpn::Core.__todo( stack ) } ) # load program local variables. ex: << -> n m << 0 n m for i i + next >> >> add( '->', proc { |stack| Rpn::Core.__todo( stack ) } ) # load program local variables. ex: << -> n m << 0 n m for i i + next >> >>
# TRIG ON REALS AND COMPLEXES # TRIG ON REALS AND COMPLEXES

7
lib/language/program.rb
View file

@ -3,12 +3,13 @@ module Rpn
module Program module Program
module_function module_function
# power # evaluate (run) a program, or recall a variable. ex: 'my_prog' eval
def eval( stack, dictionary ) def eval( stack, dictionary )
stack, args = Rpn::Core.stack_extract( stack, [%i[program]] ) stack, args = Rpn::Core.stack_extract( stack, [%i[program word name]] )
# we trim enclosing «» # we trim enclosing «»
parsed_input = Rpn::Parser.new.parse_input( args[0][:value][1..-2] ) preparsed_input = args[0][:type] == :word ? args[0][:value] : args[0][:value][1..-2]
parsed_input = Rpn::Parser.new.parse_input( preparsed_input )
stack, _dictionary = Rpn::Runner.new.run_input( stack, dictionary, parsed_input ) stack, _dictionary = Rpn::Runner.new.run_input( stack, dictionary, parsed_input )
# TODO: check that STO actually updates dictionary # TODO: check that STO actually updates dictionary

14
spec/language_program_spec.rb
View file

@ -15,5 +15,19 @@ class TestParser < Test::Unit::TestCase
assert_equal [{ value: 4, type: :numeric }, assert_equal [{ value: 4, type: :numeric },
{ value: 4, type: :numeric }], { value: 4, type: :numeric }],
stack stack
stack = Rpn::Core::Program.eval( [{ value: 4, type: :numeric },
{ value: "'dup'", type: :name }], Rpn::Dictionary.new )
assert_equal [{ value: 4, type: :numeric },
{ value: 4, type: :numeric }],
stack
stack = Rpn::Core::Program.eval( [{ value: 4, type: :numeric },
{ value: 'dup', type: :word }], Rpn::Dictionary.new )
assert_equal [{ value: 4, type: :numeric },
{ value: 4, type: :numeric }],
stack
end end
end end