dshellInterpreter 0.2.0__tar.gz → 0.2.1__tar.gz

{dshellinterpreter-0.2.0 → dshellinterpreter-0.2.1}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -184,11 +184,15 @@ def get_params(node: ParamNode, interpreter: DshellInterpreteur) -> dict[str, An
     if len(gived_variables) > 0:
         for key in englobe_args.keys():
             regrouped_args[key] = ' '.join([str(i) for i in gived_variables])
+            del englobe_args[key]
+            break
 
     for key, englobe_gived_key, englobe_gived_value in zip(englobe_args.keys(), englobe_gived_variables.keys(), englobe_gived_variables.values()):
         if key == englobe_gived_key:
             regrouped_args[key] = englobe_gived_value
 
+    regrouped_args.update(englobe_args)  # add the englobe args to the regrouped args
+
     for key, value in env_give_variables.items():
         if key in regrouped_args:
             regrouped_args[key] = value  # update the regrouped args with the env variables

{dshellinterpreter-0.2.0 → dshellinterpreter-0.2.1}/Dshell/_DshellTokenizer/dshell_tokenizer.py

@@ -15,7 +15,7 @@ MASK_CHARACTER = '§'
 
 table_regex: dict[DTT, Pattern] = {
     DTT.COMMENT: compile(r"::(.*?)"),
-    DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*)"),
+    DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*?)\s*(?=--|$)"),
     DTT.STR: compile(r'"(.*?)"', flags=DOTALL),
     DTT.LIST: compile(r"\[(.*?)\]"),
     DTT.CALL_ARGS: compile(r"\((.*?)\)"),

{dshellinterpreter-0.2.0 → dshellinterpreter-0.2.1}/PKG-INFO

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

{dshellinterpreter-0.2.0 → dshellinterpreter-0.2.1}/dshellInterpreter.egg-info/PKG-INFO

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

{dshellinterpreter-0.2.0 → dshellinterpreter-0.2.1}/setup.py

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