Miroirs/fOOrth
1
0
Fork 0
mirror of https://github.com/PeterCamilleri/fOOrth synced 2024-11-16 07:47:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Duration fixes.

Browse source
This commit is contained in:
Peter Camilleri 2015-08-10 18:31:46 -04:00
parent 6be6771bf1
commit a5b095009d
3 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
integration/standard_lib_tests.rb
View file

@ -119,6 +119,17 @@ class StandardLibraryTester < Minitest::Test
foorth_equal('try now false - catch end', [])
foorth_equal('try now false format catch end', [])
foorth_equal('try 10 .to_duration false > catch end', [])
foorth_equal('try 10 .to_duration false < catch end', [])
foorth_equal('try 10 .to_duration false >= catch end', [])
foorth_equal('try 10 .to_duration false <= catch end', [])
foorth_equal('try 10 .to_duration false <=> catch end', [])
foorth_equal('try 10 .to_duration false + catch end', [])
foorth_equal('try 10 .to_duration false - catch end', [])
foorth_equal('try 10 .to_duration false * catch end', [])
foorth_equal('try 10 .to_duration false / catch end', [])
foorth_equal('try 10 .to_duration f"%Z" catch end', [])
end
def test_some_logical_and

36
lib/fOOrth/library/duration/arithmetic.rb
View file

@ -33,26 +33,46 @@ module XfOOrth
#[a_duration numeric/duration] + [a_duration]
Duration.create_shared_method('+', NosSpec, [], &lambda {|vm|
result = @period + @period.foorth_coerce(vm.peek)
vm.poke(Duration.new(result))
begin
result = @period + @period.foorth_coerce(vm.peek)
vm.poke(Duration.new(result))
rescue
vm.data_stack.pop
raise
end
})
#[a_duration numeric/duration] - [a_duration]
Duration.create_shared_method('-', NosSpec, [], &lambda {|vm|
result = @period - @period.foorth_coerce(vm.peek)
vm.poke(Duration.new(result))
begin
result = @period - @period.foorth_coerce(vm.peek)
vm.poke(Duration.new(result))
rescue
vm.data_stack.pop
raise
end
})
#[a_duration numeric/duration] * [a_duration]
Duration.create_shared_method('*', NosSpec, [], &lambda {|vm|
result = @period * @period.foorth_coerce(vm.peek)
vm.poke(Duration.new(result))
begin
result = @period * @period.foorth_coerce(vm.peek)
vm.poke(Duration.new(result))
rescue
vm.data_stack.pop
raise
end
})
#[a_duration numeric/duration] / [a_duration]
Duration.create_shared_method('/', NosSpec, [], &lambda {|vm|
result = @period / @period.foorth_coerce(vm.peek)
vm.poke(Duration.new(result))
begin
result = @period / @period.foorth_coerce(vm.peek)
vm.poke(Duration.new(result))
rescue
vm.data_stack.pop
raise
end
})
# [a_duration] 1+ [a_duration+1]

1
lib/fOOrth/library/duration/formatter.rb
View file

@ -138,6 +138,7 @@ module XfOOrth
begin
vm.poke(self.strfmt(vm.peek))
rescue => err
vm.data_stack.pop
error "F40: Formating error: #{err.message}."
end
end