Fixed issue with small matrices being parsed incorrectly.

Fixed issue with doing operations on raw matrices.

ast.py

@@ -24,8 +24,7 @@ def _fixed(self, node):
                 del node.matched[i]
 
         # This flattens rules with a single matched rule.
-        # TODO: Flattening messes up smaller matrices ([1], [1,2], [1|2], etc.).
-        if len(node.matched) is 1 and isinstance(node.matched[0], RuleMatch):
+        if len(node.matched) is 1 and isinstance(node.matched[0], RuleMatch) and node.name not in ('mbd', 'mrw'):  # The last condition fixes small matrices like [1], [1,2], and [1|2].
             return self._fixed(node.matched[0])
 
         # This makes left-associative operations left-associative.

calculator.py

@@ -33,6 +33,7 @@ def evaluate(self, eqtn: str, verbose=True) -> Value:
                 return res
 
             elif isinstance(res, dict):
+                print(ast)
                 self.vrs.update(res)
 
     def _tokenize(self, eqtn: str) -> List[Token]:

common.py

@@ -67,10 +67,19 @@ def _str(self, node, depth=0) -> str:
 
 class ImmutableIndexedDict:
     def __init__(self, data):
-        self._keys = tuple(item[0] for item in data)
-        self._key_indices = {key: self._keys.index(key) for key in self._keys}  # Caching indices cuts down on runtime.
-        self._len = len(self._keys)
-        self._data = dict(data)
+        self._keys = tuple(item[0].lstrip('^') for item in data)
+        self._data = {key.lstrip('^'): values for key, values in data}
+
+        # Caching indices cuts down on runtime.
+        idx = 0
+        self._key_indices = {}
+
+        for key in tuple(item[0] for item in data):
+            if not key.startswith('^'):
+                self._key_indices[key] = idx
+                idx += 1
+
+        self._len = len(self._key_indices)
 
     def __getitem__(self, key):
         return self._data[key]
@@ -86,18 +95,18 @@ def key_at(self, i):
 
 
 rules_map = ImmutableIndexedDict((
-    ('asn', ('IDT EQL mat',)),
-    ('mat', ('LBR mbd RBR',)),
-    ('mbd', ('mrw PPE mbd', 'mrw')),
-    ('mrw', ('add CMA mrw', 'add')),
+    ('asn', ('IDT EQL add',)),
     ('add', ('mul ADD add',)),
     ('mui', ('pow mul',)),
     ('mul', ('pow MUL mul',)),
     ('pow', ('opr POW pow',)),
-    ('opr', ('OPR LPA mat RPA',)),
+    ('opr', ('OPR LPA add RPA',)),
     ('neg', ('ADD num', 'ADD opr')),
     ('var', ('IDT',)),
     ('num', ('NUM', 'LPA add RPA')),
+    ('mat', ('LBR mbd RBR',)),
+    ('^mbd', ('mrw PPE mbd', 'mrw')),
+    ('^mrw', ('add CMA mrw', 'add')),
 ))
 
 

vartypes.py

@@ -149,7 +149,7 @@ def __str__(self):
     def mul(self, other):
         if isinstance(other, NumberValue):
             # Number * Matrix
-            return MatrixValue([[cell * other.value for cell in row] for row in other.value])
+            return MatrixValue([[cell * other.value for cell in row] for row in self.value])
 
         elif isinstance(other, MatrixValue):
             # Matrix * Matrix