From 4244e2cd033a39503b3d3f74aabb7549fe66933d Mon Sep 17 00:00:00 2001
From: pythongosssss <125205205+pythongosssss@users.noreply.github.com>
Date: Thu, 16 May 2024 21:33:51 +0100
Subject: [PATCH] Add sqrt Add int Add bitwise ops Fix treating everything as
 floats

---
 py/math_expression.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/py/math_expression.py b/py/math_expression.py
index 385eed2..08eebe9 100644
--- a/py/math_expression.py
+++ b/py/math_expression.py
@@ -12,7 +12,11 @@ operators = {
     ast.Pow: op.pow,
     ast.BitXor: op.xor,
     ast.USub: op.neg,
-    ast.Mod: op.mod
+    ast.Mod: op.mod,
+    ast.BitAnd: op.and_,
+    ast.BitOr: op.or_,
+    ast.Invert: op.invert,
+    ast.And: op.and_,
 }
 
 # TODO: restructure args to provide more info, generate hint based on args to save duplication
@@ -52,6 +56,16 @@ functions = {
         "call": lambda *args: random.choice(args),
         "hint": "...numbers"
     },
+    "sqrt": {
+        "args": (1, 1),
+        "call": lambda a: math.sqrt(a),
+        "hint": "number"
+    },
+    "int": {
+        "args": (1, 1),
+        "call": lambda a = None: int(a),
+        "hint": "number"
+    },
 }
 
 autocompleteWords = list({
@@ -140,7 +154,11 @@ class MathExpression:
             if isinstance(node, ast.Num):
                 return node.n
             elif isinstance(node, ast.BinOp):
-                return operators[type(node.op)](float(eval_expr(node.left)), float(eval_expr(node.right)))
+                l = eval_expr(node.left)
+                r = eval_expr(node.right)
+                l = l if isinstance(l, int) else float(l)
+                r = r if isinstance(r, int) else float(r)
+                return operators[type(node.op)](l, r)
             elif isinstance(node, ast.UnaryOp):
                 return operators[type(node.op)](eval_expr(node.operand))
             elif isinstance(node, ast.Attribute):