Skip to content

git experiment #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrakeDwornik merged 1 commit into from
Nov 1, 2021
Merged

git experiment #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ def __init__(self):
def err(self):
self.error = True

def eval_function(self, x: str): -> float
def eval_function(self, x: str) -> float:
"""
evaluates x to return a result
"""
print(eval(x))
return eval(x)


Expand Down
Empty file added empty_file
View file
Open in desktop
Empty file.
5 changes: 3 additions & 2 deletions main_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ def screen_options():
elif Operation == 20:
print("Evaluate")
x = str(input("Enter what you would like evaluated: "))
return calc.eval_function(x)
calc.result = calc.eval_function(x)
return calc.result

elif Operation == 21:
condi = False
Expand All @@ -249,7 +250,7 @@ def choose_data_type():
print(bin(int(calc.result)).replace("0b", ""))
return bin(int(calc.result)).replace("0b", "")
elif type_choice == 4:
print(oct(int(calc.resultt)))
print(oct(int(calc.result)))
return oct(int(calc.result))


Expand Down