Duration fixes.

integration/standard_lib_tests.rb

@@ -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

lib/fOOrth/library/duration/arithmetic.rb

@@ -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)
+    begin
-    vm.poke(Duration.new(result))
+      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)
+    begin
-    vm.poke(Duration.new(result))
+      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)
+    begin
-    vm.poke(Duration.new(result))
+      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)
+    begin
-    vm.poke(Duration.new(result))
+      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]

lib/fOOrth/library/duration/formatter.rb

@@ -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