dshellInterpreter 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -49,7 +49,7 @@ class DshellInterpreteur:
             '__channel_type__': ctx.channel.type.name if hasattr(ctx.channel, 'type') else None,
             '__channel_id__': ctx.channel.id,
             '__private_channel__': isinstance(ctx.channel, PrivateChannel),
-        }
+        } if ctx is not None else {}
         self.vars = vars if vars is not None else ''
         self.ctx: context = ctx
         if debug:
@@ -249,7 +249,7 @@ def eval_expression(tokens: list[Token], interpreter: DshellInterpreteur) -> Any
         if token.type in {DTT.INT, DTT.FLOAT, DTT.BOOL, DTT.STR, DTT.LIST, DTT.IDENT}:
             stack.append(interpreter.eval_data_token(token))
 
-        elif token.type in (DTT.MATHS_OPERATOR, DTT.LOGIC_OPERATOR):
+        elif token.type in (DTT.MATHS_OPERATOR, DTT.LOGIC_OPERATOR, DTT.LOGIC_WORD_OPERATOR):
             op = token.value
 
             if op == "not":
@@ -407,6 +407,7 @@ def build_permission(body: list[Token], interpreter: DshellInterpreteur) -> dict
 
     for i in args_permissions:
         i.pop('*')
+        i.pop('--*')
         permissions.update(DshellPermissions(i).get_permission_overwrite(interpreter.ctx.channel.guild))
 
     return permissions

Dshell/_DshellTokenizer/dshell_keywords.py

@@ -4,7 +4,8 @@ __all__ = [
     "dshell_commands",
     "dshell_mathematical_operators",
     "dshell_logical_operators",
-    "dshell_operators"
+    "dshell_operators",
+    "dshell_logical_word_operators"
 ]
 
 from typing import Callable
@@ -78,6 +79,13 @@ dshell_mathematical_operators: dict[str, tuple[Callable, int]] = {
     r"/": (lambda a, b: a / b, 7),
 }
 
+dshell_logical_word_operators: dict[str, tuple[Callable, int]] = {
+    r"and": (lambda a, b: bool(a and b), 2),
+    r"or": (lambda a, b: bool(a or b), 1),
+    r"not": (lambda a: not a, 3),
+    r"in": (lambda a, b: a in b, 4),
+}
+
 dshell_logical_operators: dict[str, tuple[Callable, int]] = {
 
     r"<": (lambda a, b: a < b, 4),
@@ -89,16 +97,13 @@ dshell_logical_operators: dict[str, tuple[Callable, int]] = {
     r">": (lambda a, b: a > b, 4),
     r">=": (lambda a, b: a >= b, 4),
     r"=>": (lambda a, b: a >= b, 4),
-    r"and": (lambda a, b: bool(a and b), 2),
     r"&": (lambda a, b: a & b, 2),
-    r"or": (lambda a, b: bool(a or b), 1),
     r"|": (lambda a, b: a | b, 1),
-    r"in": (lambda a, b: a in b, 4),
-    r"not": (lambda a: not a, 3),
 
 }
 
 dshell_operators: dict[str, tuple[Callable, int]] = dshell_logical_operators.copy()
+dshell_operators.update(dshell_logical_word_operators)
 dshell_operators.update(dshell_mathematical_operators)
 
 '''

Dshell/_DshellTokenizer/dshell_token_type.py

@@ -29,6 +29,7 @@ class DshellTokenType(Enum):
     SUB_SEPARATOR = auto(),  # ~~
     MATHS_OPERATOR = auto()  # ==, +, -, *, etc.
     LOGIC_OPERATOR = auto(),
+    LOGIC_WORD_OPERATOR = auto()  # and, or, not
     COMMENT = auto()  # lignes commençant par ##
 
 

Dshell/_DshellTokenizer/dshell_tokenizer.py

@@ -26,7 +26,8 @@ table_regex: dict[DTT, Pattern] = {
     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)"),
+    DTT.LOGIC_OPERATOR: compile(rf"({'|'.join([escape(i) for i in dshell_logical_operators.keys()])})"),
+    DTT.LOGIC_WORD_OPERATOR: compile(rf"({'|'.join([escape(i) for i in dshell_logical_word_operators.keys()])})"),
     DTT.FLOAT: compile(r"(\d+\.\d+)"),
     DTT.INT: compile(r"(\d+)"),
     DTT.BOOL: compile(r"(True|False)", flags=IGNORECASE),

{dshellinterpreter-0.2.7.dist-info → dshellinterpreter-0.2.8.dist-info}/METADATA

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

{dshellinterpreter-0.2.7.dist-info → dshellinterpreter-0.2.8.dist-info}/RECORD

@@ -7,16 +7,16 @@ Dshell/DISCORD_COMMANDS/dshell_message.py,sha256=SvX9I4nYMWm8ACE56QJBM5yEiZoXIKb
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py,sha256=TkWFGRRTvhhJgvwkDFx9Fz4UM2UUFwxyq0laMVx0mUk,881
 Dshell/DISCORD_COMMANDS/dshell_role.py,sha256=fotsYWGHebgIx157q-zRbcCd90Y7jIuKCZ8udQoEzSU,4970
 Dshell/_DshellInterpreteur/__init__.py,sha256=xy5-J-R3YmY99JF3NBHTRRLsComFxpjnCA5xacISctU,35
-Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=yFKK8n0hTP6hN1AexUyYsZwUBFG6Rz4UgSnCEyVJ-xw,22998
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=sYQ9qIVjRedwkfITEeVAFN0RdHjiY7RGO6z0j4D7eno,23072
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
 Dshell/_DshellParser/ast_nodes.py,sha256=2qwL_M0ELPia6L6gqwgV5hqprvyuo97cx3Zk2dVz09U,15341
 Dshell/_DshellParser/dshell_parser.py,sha256=RxS5GgmTel10pH9HII0X_8XZnVyIQGd9ThZZcZDpEqc,15545
 Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
-Dshell/_DshellTokenizer/dshell_keywords.py,sha256=q6Mi7Y_45YJ_0XdBOZTdUAk0ZTjvr3dMwTuD-2YyQbs,4891
-Dshell/_DshellTokenizer/dshell_token_type.py,sha256=pWzvmj6EFGkDwNHooOAjdyysi1vZRVEostFIZSW1Ais,1483
-Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=-EhwrfbcOcnAxOHWBE89531t25u6c6HmJuT1AKFn9Ew,7032
-dshellinterpreter-0.2.7.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.7.dist-info/METADATA,sha256=LARUNA64iPo4c79uHLyrbkgOTjY1d7qLaknadneM9xQ,1120
-dshellinterpreter-0.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.7.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.7.dist-info/RECORD,,
+Dshell/_DshellTokenizer/dshell_keywords.py,sha256=l8PZhSXLhFHpi8RRoBRm2NRvAyA_NoONw0vRU4bw3t0,5058
+Dshell/_DshellTokenizer/dshell_token_type.py,sha256=gYIb2XN2YcgeRgmar_rBDS5CGmwfmxihu8mOW_d6lbE,1533
+Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=3KZhysONhgFmB7olDEZh-fvLwpai1_Asbqu0IO2p400,7134
+dshellinterpreter-0.2.8.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.8.dist-info/METADATA,sha256=EXwmP5l2xkbC-eernwlaTW5hzUiEXGRMLyGBUo9cMWY,1120
+dshellinterpreter-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.8.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.8.dist-info/RECORD,,