Permalink
Browse files

Merged.

  • Loading branch information...
2 parents 121b8ef + 6d01ac3 commit ae0908decf89b1917f2729dfc9861bb5de5ecccf Yuki Okubo committed Jun 23, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 calc.rb
View
@@ -4,7 +4,7 @@
when '-'
p minus(ARGV[1].to_i, ARGV[2].to_i)
when '*'
- p (ARGV[1].to_i, ARGV[2].to_i)
+ p multiply(ARGV[1].to_i, ARGV[2].to_i)
when '/'
p div(ARGV[1].to_i, ARGV[2].to_i)
else
@@ -19,3 +19,8 @@ def plus( operand1, operand2 )
result = operand1 + operand2
return result
end
+
+def multiply(a, b)
+ a * b
+end
+

0 comments on commit ae0908d

Please sign in to comment.