dshellInterpreter 0.1.22__tar.gz → 0.1.24__tar.gz

{dshellinterpreter-0.1.22 → dshellinterpreter-0.1.24}/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
 
 

{dshellinterpreter-0.1.22 → dshellinterpreter-0.1.24}/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(),

{dshellinterpreter-0.1.22 → dshellinterpreter-0.1.24}/Dshell/_DshellTokenizer/dshell_tokenizer.py

@@ -14,16 +14,16 @@ from .dshell_token_type import Token
 MASK_CHARACTER = '§'
 
 table_regex: dict[DTT, Pattern] = {
-    DTT.COMMENT: compile(r"::(.*)"),
-    # DTT.DICT: compile(r"\{(.*?)\}"),
-    DTT.CALL_ARGS: compile(r"\((.*?)\)"),
+    DTT.COMMENT: compile(r"::(.*?)"),
+    DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*)"),
+    DTT.STR: compile(r'"(.*?)"', flags=DOTALL),
     DTT.LIST: compile(r"\[(.*?)\]"),
-    DTT.STR: compile(r"\"(.*?)\"", flags=DOTALL),
+    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,19 +66,35 @@ 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 (
                             DTT.LIST,
-                            DTT.CALL_ARGS):  # si c'est un regrouppement de donnée, on tokenize ce qu'il contient
+                            DTT.CALL_ARGS):  # si c'est un regroupement de donnée, on tokenize ce qu'il contient
                         result = self.tokenizer([token.value])
                         token.value = result[0] if len(
                             result) > 0 else result  # gère si la structure de donnée est vide ou non
 
-                    len_match = len(match.group(0))
-                    ligne = ligne[:match.start()] + (MASK_CHARACTER * len_match) + ligne[
+                        for token_in_list in token.value:
+                            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] > 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))  # 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
@@ -86,6 +102,8 @@ class DshellTokenizer:
             if tokens_par_ligne:
                 tokens.append(tokens_par_ligne)
 
+            line_number += 1  # incrémente le numéro de ligne pour la prochaine ligne
+
         return tokens
 
     @staticmethod

{dshellinterpreter-0.1.22 → dshellinterpreter-0.1.24}/PKG-INFO

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

{dshellinterpreter-0.1.22 → dshellinterpreter-0.1.24}/dshellInterpreter.egg-info/PKG-INFO

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

{dshellinterpreter-0.1.22 → dshellinterpreter-0.1.24}/setup.py

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