dshellInterpreter 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of dshellInterpreter might be problematic. Click here for more details.

Files changed (7) hide show
  1. Dshell/_DshellInterpreteur/dshell_interpreter.py +5 -1
  2. Dshell/_DshellTokenizer/dshell_tokenizer.py +1 -1
  3. {dshellinterpreter-0.2.0.dist-info → dshellinterpreter-0.2.2.dist-info}/METADATA +1 -1
  4. {dshellinterpreter-0.2.0.dist-info → dshellinterpreter-0.2.2.dist-info}/RECORD +7 -7
  5. {dshellinterpreter-0.2.0.dist-info → dshellinterpreter-0.2.2.dist-info}/WHEEL +0 -0
  6. {dshellinterpreter-0.2.0.dist-info → dshellinterpreter-0.2.2.dist-info}/licenses/LICENSE +0 -0
  7. {dshellinterpreter-0.2.0.dist-info → dshellinterpreter-0.2.2.dist-info}/top_level.txt +0 -0
Dshell/_DshellInterpreteur/dshell_interpreter.py CHANGED
@@ -71,7 +71,7 @@ class DshellInterpreteur:
71
71
  elif_valid = False
72
72
  if eval_expression(node.condition, self):
73
73
  await self.execute(node.body)
74
- return
74
+ continue
75
75
  elif node.elif_nodes:
76
76
 
77
77
  for i in node.elif_nodes:
@@ -184,11 +184,15 @@ def get_params(node: ParamNode, interpreter: DshellInterpreteur) -> dict[str, An
184
184
  if len(gived_variables) > 0:
185
185
  for key in englobe_args.keys():
186
186
  regrouped_args[key] = ' '.join([str(i) for i in gived_variables])
187
+ del englobe_args[key]
188
+ break
187
189
 
188
190
  for key, englobe_gived_key, englobe_gived_value in zip(englobe_args.keys(), englobe_gived_variables.keys(), englobe_gived_variables.values()):
189
191
  if key == englobe_gived_key:
190
192
  regrouped_args[key] = englobe_gived_value
191
193
 
194
+ regrouped_args.update(englobe_args) # add the englobe args to the regrouped args
195
+
192
196
  for key, value in env_give_variables.items():
193
197
  if key in regrouped_args:
194
198
  regrouped_args[key] = value # update the regrouped args with the env variables
Dshell/_DshellTokenizer/dshell_tokenizer.py CHANGED
@@ -15,7 +15,7 @@ MASK_CHARACTER = '§'
15
15
 
16
16
  table_regex: dict[DTT, Pattern] = {
17
17
  DTT.COMMENT: compile(r"::(.*?)"),
18
- DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*)"),
18
+ DTT.ENGLOBE_SEPARATOR: compile(rf"--\*\w+\s*(.*?)\s*(?=--|$)"),
19
19
  DTT.STR: compile(r'"(.*?)"', flags=DOTALL),
20
20
  DTT.LIST: compile(r"\[(.*?)\]"),
21
21
  DTT.CALL_ARGS: compile(r"\((.*?)\)"),
{dshellinterpreter-0.2.0.dist-info → dshellinterpreter-0.2.2.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dshellInterpreter
3
- Version: 0.2.0
3
+ Version: 0.2.2
4
4
  Summary: A Discord bot interpreter for creating custom commands and automations.
5
5
  Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
6
6
  Author: Chronos
{dshellinterpreter-0.2.0.dist-info → dshellinterpreter-0.2.2.dist-info}/RECORD RENAMED
@@ -4,16 +4,16 @@ Dshell/DISCORD_COMMANDS/dshell_channel.py,sha256=_qHfhVaeXLQMI926AJI3uYpjDXxVNF3
4
4
  Dshell/DISCORD_COMMANDS/dshell_member.py,sha256=4cmpcu9RGHVUOGcF9pSnnxh7kEJQWAel4BBQ6Vicvbs,3126
5
5
  Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=L5upeKAsski5bNjQTwzMNc2fVnUoz5_9TitQ5qJMuF0,4460
6
6
  Dshell/_DshellInterpreteur/__init__.py,sha256=xy5-J-R3YmY99JF3NBHTRRLsComFxpjnCA5xacISctU,35
7
- Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=qlTsGX2iPQDxAjfVHs9HTRILrw0OgcwsRhYGq6C8BcY,20714
7
+ Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=Amk1Q7KM8OD6Za_pbXZs7W6rXe6BPVqG_1NRejRlccs,20859
8
8
  Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
9
9
  Dshell/_DshellParser/ast_nodes.py,sha256=-zFmSeb6FnvcXd2gB3koy93apVJ-PiCY8PTUFj-_bG8,15307
10
10
  Dshell/_DshellParser/dshell_parser.py,sha256=jCnwxY_J-_u1W_tEotQznp4_Y0aeAH4pTcPl6_Fx9f8,15525
11
11
  Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
12
12
  Dshell/_DshellTokenizer/dshell_keywords.py,sha256=10VctszIRg8AX5Nsr7kwRIjdwzUgTfrrJYbD7QfYR5s,4253
13
13
  Dshell/_DshellTokenizer/dshell_token_type.py,sha256=pWzvmj6EFGkDwNHooOAjdyysi1vZRVEostFIZSW1Ais,1483
14
- Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=a4HJdeIT3HP0a5ekUwq5Nb9Wohnjk5A44yGEneCUBjQ,7020
15
- dshellinterpreter-0.2.0.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
16
- dshellinterpreter-0.2.0.dist-info/METADATA,sha256=s9DhtQjdURBZNyB4NcA8uDz_pv1ut250MbJzExWMxQU,1095
17
- dshellinterpreter-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
18
- dshellinterpreter-0.2.0.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
19
- dshellinterpreter-0.2.0.dist-info/RECORD,,
14
+ Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=-EhwrfbcOcnAxOHWBE89531t25u6c6HmJuT1AKFn9Ew,7032
15
+ dshellinterpreter-0.2.2.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
16
+ dshellinterpreter-0.2.2.dist-info/METADATA,sha256=FHBHS3RDbndDp8iF1WanbDw8NXV52P4qijbIKt3gSdk,1095
17
+ dshellinterpreter-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
18
+ dshellinterpreter-0.2.2.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
19
+ dshellinterpreter-0.2.2.dist-info/RECORD,,