dshellInterpreter 0.2.18.9__py3-none-any.whl → 0.2.19.0__py3-none-any.whl

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -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):

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.9.dist-info → dshellinterpreter-0.2.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.18.9
+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.9.dist-info → dshellinterpreter-0.2.19.0.dist-info}/RECORD

@@ -16,17 +16,17 @@ Dshell/DISCORD_COMMANDS/utils/utils_permissions.py,sha256=Gi6vpCA2yXUZ20OCay5dkX
 Dshell/DISCORD_COMMANDS/utils/utils_string.py,sha256=2LvJG_PR_VkPdnsw0vKNTwhEQGNog-3gFd_rZIUpGKc,4709
 Dshell/DISCORD_COMMANDS/utils/utils_thread.py,sha256=tVl4msEwrWHY-0AytI6eY3JSs-eIFUigDSJfK9mT1ww,1457
 Dshell/_DshellInterpreteur/__init__.py,sha256=jl_gH8MoqerW--I-IHXwUZTo80JOtfr7AOA57xVgeGQ,58
-Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=zXvaZpeuz5JrIksNzhR7yD9V1fmvo4YMe3X6i9-6YCg,29789
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=EWmvyKXoZ97p4-TKRjjJ5U_wQoRU9AAJPItjFkQL384,29818
 Dshell/_DshellInterpreteur/errors.py,sha256=0PJz_VYZfNZeKR_PEHxw3tRkgKNNUerV0wwrq2r1luA,250
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=6SGRQ4wTniah90f-teCKg-l9q3yNzazIhi7Obm38Vow,19636
-Dshell/_DshellParser/dshell_parser.py,sha256=Rf6g8ZNoQjqCxDPvBRx0SnHfejsgLwNyia9cxjOoQ-I,19061
+Dshell/_DshellParser/dshell_parser.py,sha256=sJdrzJV7Voi_OKx3IazdQ9Yg_5Sk6jz2y02TmsV7T88,19080
 Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=TI5O6y6gAXpM_dKxCW9Fk0H8VR-gmyxxKKOURgcHsCg,7219
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=bkug7eBKjYofkOGmwzPnAH9rQlU14cO0PelZbT0kGoQ,1544
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=aSXdzEyhqoYYLpMLsLwRpeQPp84PA1F5cjm9O1EYBQs,7350
-dshellinterpreter-0.2.18.9.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.18.9.dist-info/METADATA,sha256=7Fnu3kG_LjmIZy-og1SUusjUmWr8OdZWXNlhUI8wLpM,1151
-dshellinterpreter-0.2.18.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.18.9.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.18.9.dist-info/RECORD,,
+dshellinterpreter-0.2.19.0.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.19.0.dist-info/METADATA,sha256=8sTRftB7cAWmI2S8mOHFHI6kiyER43otCq1hdhkuDzA,1151
+dshellinterpreter-0.2.19.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.19.0.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.19.0.dist-info/RECORD,,