Support PEP 465, A dedicated infix operator for matrix multiplication

baron/formatting_grouper.py

@@ -24,6 +24,7 @@ BOTH = (
     "DOUBLE_SLASH",
     "PLUS",
     "MINUS",
+    "AT",
     "LEFT_SHIFT",
     "RIGHT_SHIFT",
     "AMPER",
@@ -46,6 +47,7 @@ BOTH = (
     "PLUS_EQUAL",
     "MINUS_EQUAL",
     "STAR_EQUAL",
+    "AT_EQUAL",
     "SLASH_EQUAL",
     "PERCENT_EQUAL",
     "AMPER_EQUAL",

baron/grammator_operators.py

@@ -34,6 +34,7 @@ def include_operators(pg):
     @pg.production("augassign_operator : SLASH_EQUAL")
     @pg.production("augassign_operator : PERCENT_EQUAL")
     @pg.production("augassign_operator : AMPER_EQUAL")
+    @pg.production("augassign_operator : AT_EQUAL")    
     @pg.production("augassign_operator : VBAR_EQUAL")
     @pg.production("augassign_operator : CIRCUMFLEX_EQUAL")
     @pg.production("augassign_operator : LEFT_SHIFT_EQUAL")

baron/grouper.py

@@ -12,6 +12,7 @@ to_group = (
     ("&", "="),
     ("|", "="),
     ("^", "="),
+    ("@", "="),
     ("/", "/"),
     ("*", "*"),
     ("<", "<"),

baron/inner_formatting_grouper.py

@@ -67,11 +67,13 @@ GROUP_ON = (
     "NOT",
     "AND",
     "OR",
+    "AT",
     "IF",
     "ELSE",
     "EQUAL",
     "PLUS_EQUAL",
     "MINUS_EQUAL",
+    "AT_EQUAL",
     "STAR_EQUAL",
     "SLASH_EQUAL",
     "PERCENT_EQUAL",

baron/tokenizer.py

@@ -40,6 +40,7 @@ TOKENS = (
     (r'/', 'SLASH'),
     (r'\|', 'VBAR'),
     (r'&', 'AMPER'),
+    (r'@', 'AT'),
     (r'<', 'LESS'),
     (r'>', 'GREATER'),
     (r'=', 'EQUAL'),
@@ -61,6 +62,7 @@ TOKENS = (
     (r'\*\*', 'DOUBLE_STAR'),
     (r'\+=', 'PLUS_EQUAL'),
     (r'-=', 'MINUS_EQUAL'),
+    (r'@=', 'AT_EQUAL'),
     (r'\*=', 'STAR_EQUAL'),
     (r'/=', 'SLASH_EQUAL'),
     (r'%=', 'PERCENT_EQUAL'),

tests/test_formatting_grouper.py

@@ -2148,6 +2148,7 @@ augmented_assignment_tokens = (
     ('SLASH_EQUAL', '/='),
     ('PERCENT_EQUAL', '%='),
     ('AMPER_EQUAL', '&='),
+    ('AT_EQUAL', '@='),
     ('VBAR_EQUAL', '|='),
     ('CIRCUMFLEX_EQUAL', '^='),
     ('LEFT_SHIFT_EQUAL', '<<='),

tests/test_grammator_operators.py

@@ -7658,6 +7658,7 @@ augmented_assignment_tokens = (
     ('SLASH_EQUAL', '/='),
     ('PERCENT_EQUAL', '%='),
     ('AMPER_EQUAL', '&='),
+    ('AT_EQUAL', '@='),    
     ('VBAR_EQUAL', '|='),
     ('CIRCUMFLEX_EQUAL', '^='),
     ('LEFT_SHIFT_EQUAL', '<<='),

tests/test_tokenizer.py

@@ -230,6 +230,10 @@ def test_amper_equal():
     match('&=', 'AMPER_EQUAL')
+def test_at_equal():
+    match('@=', 'AT_EQUAL')
+
+
 def test_vbar_equal():
     match('|=', 'VBAR_EQUAL')