ynerant
/
tfjm-discord-bot
mirror of https://gitlab.com/ddorn/tfjm-discord-bot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

✨ calc: more functions and implicit multiplication

This commit is contained in:
ddorn 2020-06-03 15:18:00 +02:00
parent 62dc5b7fd7
commit a93181bcd8
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cogs/misc.py
View File

@ -11,7 +11,7 @@ import urllib
from collections import Counter, defaultdict from collections import Counter, defaultdict
from dataclasses import dataclass, field from dataclasses import dataclass, field
from functools import partial from functools import partial
from math import * import math
from operator import attrgetter, itemgetter from operator import attrgetter, itemgetter
from time import time from time import time
from typing import List, Set, Union from typing import List, Set, Union
@ -35,11 +35,13 @@ OPS = {
ast.Add: op.add, ast.Sub: op.sub, ast.Mult: op.mul, ast.Add: op.add, ast.Sub: op.sub, ast.Mult: op.mul,
ast.FloorDiv: op.floordiv, ast.Mod: op.mod, ast.FloorDiv: op.floordiv, ast.Mod: op.mod,
ast.Div: op.truediv, ast.Pow: op.pow, ast.BitXor: op.xor, ast.Div: op.truediv, ast.Pow: op.pow, ast.BitXor: op.xor,
ast.USub: op.neg, "sin": sin, "cos": cos, "pi": pi, "exp": exp, ast.USub: op.neg, "abs": abs, "π": math.pi, "τ": math.tau,
"log": log, "abs": abs, "sqrt": sqrt, "tau": 2*pi, "π": pi, "τ": 2*pi, "i": 1j,
"e": e, "i": 1j,
} }
for name in dir(math):
if not name.startswith("_"):
OPS[name] = getattr(math, name)
@dataclass @dataclass
class Joke(yaml.YAMLObject): class Joke(yaml.YAMLObject):
@ -225,7 +227,7 @@ class MiscCog(Cog, name="Divers"):
for prefix in ("! ", "!", "calc", "="): for prefix in ("! ", "!", "calc", "="):
if query.startswith(prefix): if query.startswith(prefix):
query = query[len(prefix):] query = query[len(prefix):]
query = re.sub(r"(\d)i", r"\1*i", query) query = re.sub(r"\b((\d)+(\.\d+)?)(?P<name>[a-zA-Z]+)\b", r"\1*\4", query)
query = query.strip().strip("`") query = query.strip().strip("`")