Merge pull request #108 from Jodus-Melodus/Jodus-Melodus/issue94

Evaluate function
Jodus-Melodus · Jun 17, 2024 · 4a72f29 · 4a72f29
2 parents 3fd00a2 + aef1f30
commit 4a72f29
Show file tree

Hide file tree

Showing 16 changed files with 448 additions and 445 deletions.
diff --git a/Themes/night-owl/syntax.json b/Themes/night-owl/syntax.json
@@ -2,7 +2,7 @@
     ".phi": {
         "keywords": [
             "#3d81ff",
-            "(?<!\\w)(output|for|readFile|del|update|hasAttr|unknown|in|case|match|input|throw|each|try|catch|continue|break|type|while|if|int|Real|Int|Str|as|lambda|real|import|export|obj|array|bool|str|items|now|length|wait|hash|fn|do|else|append|keys|join|format)(?!\\w)",
+            "(?<!\\w)(output|eval|for|readFile|del|update|hasAttr|unknown|in|case|match|input|throw|each|try|catch|continue|break|type|while|if|int|Real|Int|Str|as|lambda|real|import|export|obj|array|bool|str|items|now|length|wait|hash|fn|do|else|append|keys|join|format)(?!\\w)",
             [
                 "output",
                 "input",
@@ -48,7 +48,8 @@
                 ".items",
                 ".update",
                 ".keys",
-                ".hasAttr"
+                ".hasAttr",
+                "eval"
             ]
         ],
         "symbols": [
@@ -85,7 +86,7 @@
             ]
         ]
     },
-    ".json":{
+    ".json": {
         "symbols": [
             "#ffb617",
             "(:|\")",
@@ -97,5 +98,5 @@
             []
         ]
     },
-    ".txt":{}
+    ".txt": {}
 }
diff --git a/Themes/phi-theme/syntax.json b/Themes/phi-theme/syntax.json
@@ -2,7 +2,7 @@
     ".phi": {
         "keywords": [
             "#3d81ff",
-            "(?<!\\w)(output|unknown|del|hasAttr|for|in|readFile|case|update|match|input|throw|each|try|catch|continue|break|type|while|if|int|Real|Int|Str|as|lambda|real|import|export|obj|array|bool|str|items|now|length|wait|hash|fn|do|else|append|keys|join|format)(?!\\w)",
+            "(?<!\\w)(output|eval|unknown|del|hasAttr|for|in|readFile|case|update|match|input|throw|each|try|catch|continue|break|type|while|if|int|Real|Int|Str|as|lambda|real|import|export|obj|array|bool|str|items|now|length|wait|hash|fn|do|else|append|keys|join|format)(?!\\w)",
             [
                 "output",
                 "input",
@@ -48,7 +48,8 @@
                 ".items",
                 ".keys",
                 ".update",
-                ".hasAttr"
+                ".hasAttr",
+                "eval"
             ]
         ],
         "symbols": [

diff --git a/__pycache__/shell.cpython-311.pyc b/__pycache__/shell.cpython-311.pyc
diff --git a/backend/Environment.py b/backend/Environment.py
@@ -5,14 +5,14 @@
 import sys
 
 class Environment:
-    def __init__(self, parent=None, file_path:str='') -> None:
+    def __init__(self, parent=None, file_path:str="") -> None:
         self.file_path = file_path
         self.parent = parent
         self.variables = {}
         self.constants = {}
 
     def __str__(self) -> str:
-        return 'Environment'
+        return "Environment"
 
     def __repr__(self) -> str:
         return str({
@@ -31,7 +31,7 @@ def assign_variable(self, variable_name: str, var_value) -> None:
         return var_value
 
     def declare_variable(self, variable_name: str, var_value, constant:bool=False) -> None:
-        if ((variable_name in self.variables) or (variable_name in self.constants)) and (variable_name != '~'):
+        if ((variable_name in self.variables) or (variable_name in self.constants)) and (variable_name != "~"):
             return SyntaxError(self.file_path, self, f"Variable '{variable_name}' already defined.", 0, 0)
         if constant:
             self.constants[variable_name] = var_value
@@ -64,26 +64,25 @@ def delete_variable(self, variable_name:str) -> None:
         env = self.resolve(variable_name)
         del env.variables[variable_name]
 
-def create_global_environment(parent:Environment|None=None, file_path:str='') -> Environment:
+def create_global_environment(parent:Environment|None=None, file_path:str="") -> Environment:
     env = Environment(parent, file_path)
     # functions
-    env.declare_variable('output', NativeFunction(lambda args, scope : sys.stdout.write(str(output(args[0], file_path)) + '\n')), True)
-    env.declare_variable('input', NativeFunction(lambda args, scope : phi_input(file_path, args[0])), True)
-    env.declare_variable('type', NativeFunction(lambda args, scope : type_(file_path, args[0])), True)
-    env.declare_variable('hash', NativeFunction(lambda args, scope : hash(file_path, args[0])), True)
-    env.declare_variable('Str', NativeFunction(lambda args, scope: hard_cast_string(file_path, args[0])), True)
-    env.declare_variable('Int', NativeFunction(lambda args, scope: hard_cast_integer(file_path, args[0])), True)
-    env.declare_variable('Real', NativeFunction(lambda args, scope: hard_cast_real(file_path, args[0])), True)
-    env.declare_variable('readFile', NativeFunction(lambda args, scope: read_file(file_path, args[0])), True)
-
-    # Move to modules
-    env.declare_variable('now', NativeFunction(lambda args, scope : now(file_path, )), True)
-    env.declare_variable('wait', NativeFunction(lambda args, scope : wait(file_path, args[0])), True)
+    env.declare_variable("output", NativeFunction(lambda args, scope : sys.stdout.write(str(output(args[0], file_path)) + "\n")), True)
+    env.declare_variable("input", NativeFunction(lambda args, scope : phi_input(file_path, args[0])), True)
+    env.declare_variable("type", NativeFunction(lambda args, scope : type_(file_path, args[0])), True)
+    env.declare_variable("hash", NativeFunction(lambda args, scope : hash(file_path, args[0])), True)
+    env.declare_variable("Str", NativeFunction(lambda args, scope: hard_cast_string(file_path, args[0])), True)
+    env.declare_variable("Int", NativeFunction(lambda args, scope: hard_cast_integer(file_path, args[0])), True)
+    env.declare_variable("Real", NativeFunction(lambda args, scope: hard_cast_real(file_path, args[0])), True)
+    env.declare_variable("readFile", NativeFunction(lambda args, scope: read_file(file_path, args[0])), True)
+    env.declare_variable("now", NativeFunction(lambda args, scope : now(file_path, )), True)
+    env.declare_variable("wait", NativeFunction(lambda args, scope : wait(file_path, args[0])), True)
+    env.declare_variable("eval", NativeFunction(lambda args, scope : phi_evaluate(file_path, args[0])), True)
 
     # variables
-    env.declare_variable('_', NullValue(), True)
-    env.declare_variable('?', UnknownValue(NullValue()))
-    env.declare_variable('T', BooleanValue("T"), True)
-    env.declare_variable('F', BooleanValue("F"), True)
+    env.declare_variable("_", NullValue(), True)
+    env.declare_variable("?", UnknownValue(NullValue()))
+    env.declare_variable("T", BooleanValue("T"), True)
+    env.declare_variable("F", BooleanValue("F"), True)
 
     return env
diff --git a/backend/Functions.py b/backend/Functions.py
@@ -28,6 +28,10 @@ def phi_input(file_path, arg:StringValue) -> StringValue:
     sys.stdout.write(arg.value)
     return StringValue(sys.stdin.readline().strip(), arg.line, arg.column)
 
+def phi_evaluate(file_path: str, arg:StringValue) -> NullValue:
+    from shell import run
+    return run(arg.value, file_path)
+
 def now(file_path) -> IntegerValue:
     return IntegerValue(time())