From b8ca5e92b2c6c00f2f3f98ba2eea77cc01e968c1 Mon Sep 17 00:00:00 2001
From: Christopher Bohn <bohn@unl.edu>
Date: Wed, 17 Mar 2021 13:50:31 -0500
Subject: [PATCH] Moved string-to-integer conversion
This will simplify the student task if we give them partial code to be
completed.
---
MutualRecursion.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/MutualRecursion.py b/MutualRecursion.py
index 4e1d2c5..b88b9ec 100755
--- a/MutualRecursion.py
+++ b/MutualRecursion.py
@@ -77,19 +77,19 @@ def parse(expression):
def add(left_expression, right_expression):
- return int(evaluate(left_expression)) + int(evaluate(right_expression))
+ return evaluate(left_expression) + evaluate(right_expression)
def subtract(left_expression, right_expression):
- return int(evaluate(left_expression)) - int(evaluate(right_expression))
+ return evaluate(left_expression) - evaluate(right_expression)
def multiply(left_expression, right_expression):
- return int(evaluate(left_expression)) * int(evaluate(right_expression))
+ return evaluate(left_expression) * evaluate(right_expression)
def divide(left_expression, right_expression):
- return int(evaluate(left_expression)) / int(evaluate(right_expression))
+ return evaluate(left_expression) / evaluate(right_expression)
operator_map = {
@@ -102,7 +102,7 @@ operator_map = {
def evaluate(expression):
if expression.isnumeric():
- return expression
+ return int(expression)
else:
left_expression, operator, right_expression = parse(expression)
return operator_map[operator](left_expression, right_expression)
--
GitLab