✨

gwendolyn/funcs/other/roll/lexer.py

@@ -2,18 +2,22 @@
 from string import ascii_letters, digits
 from rply import LexerGenerator
 
-VALID_CHARACTERS = ascii_letters[:3]+ascii_letters[4:]+"_"+digits
+VALID_CHARACTERS = ascii_letters+"_"+digits
 
 TOKENS = [
     ("ROLL_DIE",            r"d"),
-    ("ROLL_KEEP_HIGHEST",   r"kh"),
     ("ROLL_KEEP_LOWEST",    r"kl"),
+    ("ROLL_KEEP_HIGHEST",   r"kh?"),
+    ("ROLL_REROLL_ONCE",    r"ro"),
+    ("ROLL_REROLL",         r"r"),
     ("ROLL_MIN",            r"min"),
     ("ROLL_MAX",            r"max"),
     ("ROLL_EXPLODE",        r"!"),
 
     ("SYMBOL_LE",           r"\<\="),
-    # ("SYMBOL_GE",           r"\>\="),
+    ("SYMBOL_GE",           r"\>\="),
+    ("SYMBOL_LT",           r"\<"),
+    ("SYMBOL_GT",           r"\>"),
     ("SYMBOL_EQUALS",       r"\="),
     ("SYMBOL_ARROW",        r"\-\>"),
     ("SYMBOL_BACKSLASH",    r"\\"),