Update calculator.go

liujieking · Feb 10, 2017 · e8d45ac · e8d45ac
1 parent b7ec4c2
commit e8d45ac
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/eBook/exercises/chapter_12/calculator.go b/eBook/exercises/chapter_12/calculator.go
@@ -31,21 +31,23 @@ func main() {
 				i, _ := strconv.Atoi(token)
 				calc1.Push(i)  
 			case token == "+":
-				q := calc1.Pop()
-				p := calc1.Pop()
-				fmt.Printf("The result of %d %s %d = %d\n", p, token, q, p + q)
+				q, _ := calc1.Pop()
+				p, _ := calc1.Pop()
+				fmt.Printf("The result of %d %s %d = %d\n", p, token, q, p.(int) + q.(int))
 			case token == "-":
-				q := calc1.Pop()
-				p := calc1.Pop()
-				fmt.Printf("The result of %d %s %d = %d\n", p, token, q, p - q)
+				q, _ := calc1.Pop()
+				p, _ := calc1.Pop()
+				fmt.Printf("The result of %d %s %d = %d\n", p, token, q, p.(int) - q.(int))
+
 			case token == "*":
-				q := calc1.Pop()
-				p := calc1.Pop()
-				fmt.Printf("The result of %d %s %d = %d\n", p, token, q, p * q)
+				q, _ := calc1.Pop()
+				p, _ := calc1.Pop()
+				fmt.Printf("The result of %d %s %d = %d\n", p, token, q, p.(int) * q.(int))
+
 			case token == "/":
-				q := calc1.Pop()
-				p := calc1.Pop()
-				fmt.Printf("The result of %d %s %d = %d\n", p, token, q, p / q)
+				q, _ := calc1.Pop()
+				p, _ := calc1.Pop()
+				fmt.Printf("The result of %d %s %d = %d\n", p, token, q, p.(int) / q.(int))
 			default:
 				fmt.Println("No valid input")
 		}