Raise Trxl::InvalidArgumentError if division LHS is NULL

snusnu · May 8, 2012 · 49d9ad6 · 49d9ad6
1 parent 1b9b89b
commit 49d9ad6
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 46 deletions.
diff --git a/lib/trxl/trxl_grammar.rb b/lib/trxl/trxl_grammar.rb
@@ -3382,7 +3382,7 @@ module Multitive2
     def eval(env = Environment.new)
       # left associative evaluation
       multitives(env).inject(exponential.eval(env)) do |operand, next_op|
-        op = (next_op[0].text_value == '/' ? operand.to_f : operand)
+        op = (next_op[0].text_value == '/' ? (operand ? operand.to_f : nil) : operand)
         next_op[0].apply(op, next_op[1])
       end
     end

diff --git a/lib/trxl/trxl_grammar.treetop b/lib/trxl/trxl_grammar.treetop
@@ -518,7 +518,7 @@ grammar Trxl
       def eval(env = Environment.new)
         # left associative evaluation
         multitives(env).inject(exponential.eval(env)) do |operand, next_op|
-          op = (next_op[0].text_value == '/' ? operand.to_f : operand)
+          op = (next_op[0].text_value == '/' ? (operand ? operand.to_f : nil) : operand)
           next_op[0].apply(op, next_op[1])
         end
       end