[WIP] Comma split for .sym enumerations

src/canmatrix/formats/sym.py

@@ -33,6 +33,7 @@
 from builtins import *
 
 import attr
+import re
 
 import canmatrix
 import canmatrix.utils
@@ -323,6 +324,8 @@ class Mode(object):
     db.add_signal_defines("HexadecimalOutput", 'BOOL False True')
     db.add_signal_defines("DisplayDecimalPlaces", 'INT 0 65535')
     db.add_signal_defines("LongName", 'STR')
+
+    kvpair_splitting_pattern = re.compile(r'(\",)(\d+=)')
 
     for line_count, line in enumerate(f, 1):
         try:
@@ -360,7 +363,7 @@ class Mode(object):
                     line = line.split('//')[0]
                     temp_array = line[5:].strip().rstrip(')').split('(', 1)
                     val_table_name = temp_array[0]
-                    split = canmatrix.utils.quote_aware_space_split(temp_array[1])
+                    split = canmatrix.utils.quote_aware_space_split(re.sub(kvpair_splitting_pattern, r'\1 \2', temp_array[1]))
                     temp_array = [s.rstrip(',') for s in split]
                     temp_val_table = {}
                     for entry in temp_array:

src/canmatrix/tests/test_sym.py

@@ -141,3 +141,61 @@ def tests_parse_float(variable_type, bit_length):
     frame = matrix.frames[0]
     signal = frame.signals[0]
     assert signal.is_float
+
+
+def tests_value_tables():
+    f = io.BytesIO(
+        textwrap.dedent(
+            '''\
+            FormatVersion=5.0 // Do not edit this line!
+            Title="AFE_CAN_ID0"
+
+            {ENUMS}
+            enum State(0="Power On Reset, and a quoted comma", 1=",Ready,set,go", 2="Following",3="Fault",
+              4="Forming" , 5="N/A", 6="N/A",7="N/A",8="N/A",9="N/A", 10="N/A",11="N/A",
+              12="N/A", 13="N/A",14="N/A", 15="N/A")
+            enum Relay(0="Open", 1="Closed",2="Error",3="N/A")
+
+            {SENDRECEIVE}
+            [StatusBits]
+            ID=0CFFC3F7h
+            Type=Extended
+            DLC=8
+            Var=State_status unsigned 0,16 /e:State
+            Var=MX2Permissive_status unsigned 32,16 /e:Relay
+            '''
+        ).encode('utf-8'),
+    )
+
+    matrix = canmatrix.formats.sym.load(f)
+
+    assert matrix.load_errors == []
+
+    expected = {
+        'Relay': {
+            0: 'Open',
+            1: 'Closed',
+            2: 'Error',
+            3: 'N/A',
+        },
+        'State': {
+            0:"Power On Reset, and a quoted comma",
+            1: ",Ready,set,go",
+            2: "Following",
+            3: "Fault",
+            4: "Forming",
+            5: "N/A",
+            6: "N/A",
+            7: "N/A",
+            8: "N/A",
+            9: "N/A",
+            10: "N/A",
+            11: "N/A",
+            12: "N/A",
+            13: "N/A",
+            14: "N/A",
+            15: "N/A",
+        }
+    }
+
+    assert matrix.value_tables == expected

src/canmatrix/tests/test_utils.py

@@ -10,7 +10,14 @@ def test_utils_guess_value():
     assert canmatrix.utils.guess_value("False") == "0"
     assert canmatrix.utils.guess_value("faLse") == "0"
 
+
 def test_decode_number():
     assert canmatrix.utils.decode_number("0x10") == 16
     assert canmatrix.utils.decode_number("0b10") == 2
     assert canmatrix.utils.decode_number("10") == 10
+
+
+def test_quote_aware_comma_split():
+    example = '"a,b", c"d,e", f'
+    split = canmatrix.utils.quote_aware_comma_split(example)
+    assert split == ['a,b', 'c"d,e"', 'f']