dshellInterpreter 0.2.6__tar.gz → 0.2.7__tar.gz

{dshellinterpreter-0.2.6 → dshellinterpreter-0.2.7}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -42,7 +42,6 @@ class DshellInterpreteur:
             '__author_discriminator__': ctx.author.discriminator,
             '__author_bot__': ctx.author.bot,
             '__author_nick__': ctx.author.nick if hasattr(ctx.author, 'nick') else None,
-            '__author_avatar_url__': ctx.author.avatar.url if ctx.author.avatar else None,
             '__author_id__': ctx.author.id,
             '__message__': ctx.content,
             '__message_id__': ctx.id,
@@ -259,7 +258,14 @@ def eval_expression(tokens: list[Token], interpreter: DshellInterpreteur) -> Any
 
             else:
                 b = stack.pop()
-                a = stack.pop()
+                try:
+                    a = stack.pop()
+                except IndexError:
+                    if op == "-":
+                        a = 0
+                    else:
+                        raise SyntaxError(f"Invalid expression: {op} operator requires two operands, but only one was found.")
+
                 result = dshell_operators[op][0](a, b)
 
             stack.append(result)

{dshellinterpreter-0.2.6 → dshellinterpreter-0.2.7}/Dshell/_DshellParser/dshell_parser.py

@@ -268,7 +268,7 @@ def to_postfix(expression):
     operators: list[Token] = []
 
     for token in expression:
-        if token.type in (DTT.IDENT, DTT.CALL_ARGS, DTT.INT, DTT.FLOAT, DTT.LIST, DTT.STR):  # Si c'est un ident
+        if token.type in (DTT.IDENT, DTT.CALL_ARGS, DTT.INT, DTT.FLOAT, DTT.LIST, DTT.STR, DTT.BOOL):  # Si c'est un ident
             output.append(token)
         elif token.value in dshell_operators:
             while (operators and operators[-1].value in dshell_operators and
@@ -289,7 +289,7 @@ def parse_postfix_expression(postfix_tokens: list[Token]) -> list[IdentOperation
 
     for tok in postfix_tokens:
 
-        if tok.type in (DTT.IDENT, DTT.CALL_ARGS, DTT.INT, DTT.STR, DTT.LIST):
+        if tok.type in (DTT.IDENT, DTT.CALL_ARGS, DTT.INT, DTT.STR, DTT.LIST, DTT.FLOAT, DTT.BOOL):
             stack.append(tok)
 
         elif tok.type == DTT.MATHS_OPERATOR:

{dshellinterpreter-0.2.6 → dshellinterpreter-0.2.7}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -64,15 +64,6 @@ dshell_commands: dict[str, Callable] = {
 }
 
 dshell_mathematical_operators: dict[str, tuple[Callable, int]] = {
-    r"<": (lambda a, b: a < b, 4),
-    r"<=": (lambda a, b: a <= b, 4),
-    r"=<": (lambda a, b: a <= b, 4),
-    r"=": (lambda a, b: a == b, 4),
-    r"!=": (lambda a, b: a != b, 4),
-    r"=!": (lambda a, b: a != b, 4),
-    r">": (lambda a, b: a > b, 4),
-    r">=": (lambda a, b: a >= b, 4),
-    r"=>": (lambda a, b: a >= b, 4),
 
     r".": (lambda a, b: a.b, 9),
     r"->": (lambda a: a.at, 10),  # equivalent to calling .at(key)
@@ -89,6 +80,15 @@ dshell_mathematical_operators: dict[str, tuple[Callable, int]] = {
 
 dshell_logical_operators: dict[str, tuple[Callable, int]] = {
 
+    r"<": (lambda a, b: a < b, 4),
+    r"<=": (lambda a, b: a <= b, 4),
+    r"=<": (lambda a, b: a <= b, 4),
+    r"=": (lambda a, b: a == b, 4),
+    r"!=": (lambda a, b: a != b, 4),
+    r"=!": (lambda a, b: a != b, 4),
+    r">": (lambda a, b: a > b, 4),
+    r">=": (lambda a, b: a >= b, 4),
+    r"=>": (lambda a, b: a >= b, 4),
     r"and": (lambda a, b: bool(a and b), 2),
     r"&": (lambda a, b: a & b, 2),
     r"or": (lambda a, b: bool(a or b), 1),

{dshellinterpreter-0.2.6/dshellInterpreter.egg-info → dshellinterpreter-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.6
+Version: 0.2.7
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-0.2.6 → dshellinterpreter-0.2.7/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.6
+Version: 0.2.7
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-0.2.6 → dshellinterpreter-0.2.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="0.2.6",
+    version="0.2.7",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",