dshellInterpreter 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

Dshell/DISCORD_COMMANDS/dshell_message.py

@@ -42,12 +42,12 @@ async def dshell_send_message(ctx: Message, message=None, delete=None, channel=N
     return sended_message.id
 
 
-async def dshell_delete_message(ctx: Message, message, reason=None, delay=0):
+async def dshell_delete_message(ctx: Message, message=None, reason=None, delay=0):
     """
     Deletes a message
     """
 
-    delete_message = ctx.channel.get_partial_message(message)  # builds a reference to the message (even if it doesn't exist)
+    delete_message = ctx if message is None else ctx.channel.get_partial_message(message)  # builds a reference to the message (even if it doesn't exist)
 
     if delay > 3600:
         raise Exception(f'The message deletion delay is too long! ({delay} seconds)')

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -186,6 +186,8 @@ def get_params(node: ParamNode, interpreter: DshellInterpreteur) -> dict[str, An
         if regrouped_args[key] == '*':
             raise Exception(f"'{key}' is an obligatory parameter, but no value was given for it.")
 
+    print(regrouped_args)
+
     return regrouped_args
 
 def eval_expression_inline(if_node: IfNode, interpreter: DshellInterpreteur) -> Token:
@@ -278,6 +280,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
 
     i = 0
     while i < n:
+
         if body[i].type == DTT.SEPARATOR and body[
             i + 1].type == DTT.IDENT:  # Check if it's a separator and if the next token is an IDENT
             current_arg = body[i + 1].value  # change the current argument. It will be impossible to return to '*'
@@ -291,7 +294,15 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
                     type_=DTT.SEPARATOR, value=body[i].value, position=body[i].position)
                 ] + body[i + 1:], interpreter
             )  # add a sub-dictionary for sub-commands
-            return list_tokens
+            #return list_tokens
+
+        elif (body[i].type == DTT.SEPARATOR and
+              (body[i + 1].type == DTT.MATHS_OPERATOR and body[i + 1].value == '*') and
+              body[i + 2].type == DTT.IDENT and
+              body[i + 3].type == DTT.ENGLOBE_SEPARATOR):
+            current_arg = body[i + 2].value  # change the current argument
+            tokens[current_arg] = body[i + 3].value
+            i += 4
 
         else:
             if current_arg == '*':
@@ -299,6 +310,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
             else:
                 tokens[current_arg] = interpreter.eval_data_token(body[i])  # add the token to the current argument
             i += 1
+
     return list_tokens
 
 

Dshell/_DshellTokenizer/dshell_token_type.py

@@ -25,6 +25,7 @@ class DshellTokenType(Enum):
     DISCORD_KEYWORD = auto()  # embed, #embed...
     COMMAND = auto()
     SEPARATOR = auto()  # --
+    ENGLOBE_SEPARATOR = auto(),  # --*
     SUB_SEPARATOR = auto(),  # ~~
     MATHS_OPERATOR = auto()  # ==, +, -, *, etc.
     LOGIC_OPERATOR = auto(),

Dshell/_DshellTokenizer/dshell_tokenizer.py

@@ -15,15 +15,15 @@ MASK_CHARACTER = '§'
 
 table_regex: dict[DTT, Pattern] = {
     DTT.COMMENT: compile(r"::(.*?)"),
-    # DTT.DICT: compile(r"\{(.*?)\}"),
+    DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*)"),
     DTT.STR: compile(r'"(.*?)"', flags=DOTALL),
     DTT.LIST: compile(r"\[(.*?)\]"),
     DTT.CALL_ARGS: compile(r"\((.*?)\)"),
     DTT.MENTION: compile(r'<(?:@!?|@&|#)([0-9]+)>'),
-    DTT.KEYWORD: compile(rf"(?<!\w)(#?{'|'.join(dshell_keyword)})(?!\w)"),
-    DTT.DISCORD_KEYWORD: compile(rf"(?<!\w|-)(#?{'|'.join(dshell_discord_keyword)})(?!\w|-)"),
     DTT.SEPARATOR: compile(rf"(--)"),
     DTT.SUB_SEPARATOR: compile(rf"(~~)"),
+    DTT.KEYWORD: compile(rf"(?<!\w)(#?{'|'.join(dshell_keyword)})(?!\w)"),
+    DTT.DISCORD_KEYWORD: compile(rf"(?<!\w|-)(#?{'|'.join(dshell_discord_keyword)})(?!\w|-)"),
     DTT.COMMAND: compile(rf"\b({'|'.join(dshell_commands.keys())})\b"),
     DTT.MATHS_OPERATOR: compile(rf"({'|'.join([escape(i) for i in dshell_mathematical_operators.keys()])})"),
     DTT.LOGIC_OPERATOR: compile(rf"(?<!\w)({'|'.join([escape(i) for i in dshell_logical_operators.keys()])})(?<!\w)"),
@@ -66,8 +66,13 @@ class DshellTokenizer:
             for token_type, pattern in table_regex.items():  # iter la table de régex pour tous les tester sur la ligne
 
                 for match in finditer(pattern, ligne):  # iter les résultat du match pour avoir leur position
+
+                    start_match = match.start()  # position de début du match
+                    if token_type == DTT.ENGLOBE_SEPARATOR:
+                        start_match += len(match.group(0)) - len(match.group(1))  # si c'est un séparateur englobant, on enlève les --* du début
+
                     if token_type != DTT.COMMENT:  # si ce n'est pas un commentaire
-                        token = Token(token_type, match.group(1), (line_number, match.start()))  # on enregistre son token
+                        token = Token(token_type, match.group(1), (line_number, start_match))  # on enregistre son token
                         tokens_par_ligne.append(token)
 
                     if token_type in (
@@ -81,15 +86,15 @@ class DshellTokenizer:
                             token_in_list.position = (line_number, token_in_list.position[1])
 
                         for token_in_line in range(len(tokens_par_ligne)-1):
-                            if tokens_par_ligne[token_in_line].position[1] > match.start():
+                            if tokens_par_ligne[token_in_line].position[1] > start_match:
                                 str_tokens_in_list = tokens_par_ligne[token_in_line:-1]
                                 tokens_par_ligne = tokens_par_ligne[:token_in_line] + [tokens_par_ligne[-1]]
                                 token.value.extend(str_tokens_in_list)
                                 token.value.sort(key=lambda t: t.position[1])  # trie les tokens par rapport à leur position
                                 break
 
-                    len_match = len(match.group(0))
-                    ligne = ligne[:match.start()] + (MASK_CHARACTER * len_match) + ligne[
+                    len_match = len(match.group(0))  # longueur du match trouvé
+                    ligne = ligne[:start_match] + (MASK_CHARACTER * len_match) + ligne[
                                                                                    match.end():]  # remplace la match qui vient d'avoir lieu pour ne pas le rematch une seconde fois
 
             tokens_par_ligne.sort(key=lambda

{dshellinterpreter-0.1.23.dist-info → dshellinterpreter-0.1.25.dist-info}/METADATA

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

{dshellinterpreter-0.1.23.dist-info → dshellinterpreter-0.1.25.dist-info}/RECORD

@@ -2,18 +2,18 @@ Dshell/__init__.py,sha256=UPvXnewe_8FX9aoevMA78UN1k8AY-u8LTY3vEVxaDxw,72
 Dshell/DISCORD_COMMANDS/__init__.py,sha256=unbZE4sxFCbUQ4Qptr1BhWu-nwhvI2oRzcDLtRmX6Ug,92
 Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=_qHfhVaeXLQMI926AJI3uYpjDXxVNF3sZ84EwWU-jz0,6450
 Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=4cmpcu9RGHVUOGcF9pSnnxh7kEJQWAel4BBQ6Vicvbs,3126
-Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=OPyKWKyGRdTB9KkgPW-WcxnPjNrDlJLNjgJm_KeHkD8,4427
+Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=L5upeKAsski5bNjQTwzMNc2fVnUoz5_9TitQ5qJMuF0,4460
 Dshell/_DshellInterpreteur/__init__.py,sha256=xy5-J-R3YmY99JF3NBHTRRLsComFxpjnCA5xacISctU,35
-Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=viZBYDF7rw1Juasu-B4Fc7Kvdm4j_7SGhOeR_DZpL00,19485
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=5TzoiFZWXKBKdLmUZrAqSoScAffp5qrlqFQZ0UMuvvk,19916
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=-zFmSeb6FnvcXd2gB3koy93apVJ-PiCY8PTUFj-_bG8,15307
 Dshell/_DshellParser/dshell_parser.py,sha256=jCnwxY_J-_u1W_tEotQznp4_Y0aeAH4pTcPl6_Fx9f8,15525
 Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=10VctszIRg8AX5Nsr7kwRIjdwzUgTfrrJYbD7QfYR5s,4253
-Dshell/_DshellTokenizer/dshell_token_type.py,sha256=Q8Jpil9S3-Tin1sXEHW7cnNdDdUh7Fiv8_lki0OWC0E,1443
-Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=CMRUXLkRPGUmsyT3Rkal-INQ7tTneFFH0WYQ-2ItMv8,6686
-dshellinterpreter-0.1.23.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.1.23.dist-info/METADATA,sha256=HLrQ28EL8AiKBPqHpZMLvMizGDn6Q0nM574b5DKElMY,1096
-dshellinterpreter-0.1.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.1.23.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.1.23.dist-info/RECORD,,
+Dshell/_DshellTokenizer/dshell_token_type.py,sha256=pWzvmj6EFGkDwNHooOAjdyysi1vZRVEostFIZSW1Ais,1483
+Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=a4HJdeIT3HP0a5ekUwq5Nb9Wohnjk5A44yGEneCUBjQ,7020
+dshellinterpreter-0.1.25.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.1.25.dist-info/METADATA,sha256=mHOnOkPg00JKNG1J9ku8d6RehNiUJqzvkQD74vsrnw8,1096
+dshellinterpreter-0.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.1.25.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.1.25.dist-info/RECORD,,