dshellInterpreter 0.2.18.7__tar.gz → 0.2.19.0__tar.gz

{dshellinterpreter-0.2.18.7 → dshellinterpreter-0.2.19.0}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -223,7 +223,7 @@ class DshellInterpreteur:
                 return self.env[token.value]
             return token.value
         elif token.type == DTT.EVAL_GROUP:
-            await self.execute(token.value)
+            await self.execute(parse([token.value], StartNode([]))[0]) # obliger de parser car ce il n'est pas dejà un AST
             return self.env['__ret__']
         elif token.type == DTT.STR:
             for match in findall(rf"\$({'|'.join(self.env.keys())})", token.value):
@@ -302,12 +302,12 @@ async def eval_expression(tokens: list[Token], interpreter: DshellInterpreteur)
     :param tokens: A list of tokens representing the expression.
     :param interpreter: The Dshell interpreter instance.
     """
-    postfix = to_postfix(tokens)
+    postfix = to_postfix(tokens, interpreter)
     stack = []
 
     for token in postfix:
 
-        if token.type in {DTT.INT, DTT.FLOAT, DTT.BOOL, DTT.STR, DTT.LIST, DTT.IDENT}:
+        if token.type in {DTT.INT, DTT.FLOAT, DTT.BOOL, DTT.STR, DTT.LIST, DTT.IDENT, DTT.EVAL_GROUP}:
             stack.append(await interpreter.eval_data_token(token))
 
         elif token.type in (DTT.MATHS_OPERATOR, DTT.LOGIC_OPERATOR, DTT.LOGIC_WORD_OPERATOR):

{dshellinterpreter-0.2.18.7 → dshellinterpreter-0.2.19.0}/Dshell/_DshellParser/dshell_parser.py

@@ -318,7 +318,7 @@ def parser_inline(tokens: list[Token]) -> tuple[list[list[Token]], bool]:
     return result, True
 
 
-def to_postfix(expression):
+def to_postfix(expression, interpreter=None):
     """
     Transforme l'expression en notation postfixée (RPN)
     :param expression: l'expression donné par le tokenizer
@@ -328,7 +328,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, DTT.BOOL):  # Si c'est un ident
+        if token.type in (DTT.IDENT, DTT.INT, DTT.FLOAT, DTT.LIST, DTT.STR, DTT.BOOL, DTT.EVAL_GROUP):  # Si c'est un ident
             output.append(token)
         elif token.value in dshell_operators:
             while (operators and operators[-1].value in dshell_operators and

{dshellinterpreter-0.2.18.7/dshellInterpreter.egg-info → dshellinterpreter-0.2.19.0}/PKG-INFO

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

{dshellinterpreter-0.2.18.7 → dshellinterpreter-0.2.19.0/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-0.2.18.7 → dshellinterpreter-0.2.19.0}/setup.py

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