allow even more special characters #330

Author: ebroecker

src/canmatrix/formats/dbc.py

@@ -761,7 +761,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
                 substring = decoded[7:].strip()
                 define_type = substring[:3]
                 substring = substring[3:].strip()
-                pattern = r"^\"([A-Za-z0-9\-_\ ]+)\" +(.+);"
+                pattern = r"^\"(.+)\" +(.+);"
                 regexp = re.compile(pattern)
                 regexp_raw = re.compile(pattern.encode(dbcImportEncoding))
                 temp = regexp.match(substring)
@@ -778,7 +778,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
                         db.add_env_defines(temp.group(1), temp_raw.group(2).decode(dbcImportEncoding))
 
             elif decoded.startswith("BA_DEF_ "):
-                pattern = r"^BA_DEF_ +\"([A-Za-z0-9\-_]+)\" +(.+);"
+                pattern = r"^BA_DEF_ +\"(.+)\" +(.+);"
                 regexp = re.compile(pattern)
                 regexp_raw = re.compile(pattern.encode(dbcImportEncoding))
                 temp = regexp.match(decoded)
@@ -792,7 +792,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
                 tempba = regexp.match(decoded)
 
                 if tempba.group(1).strip().startswith("BO_ "):
-                    regexp = re.compile(r"^BA_ +\"(.*)\" +BO_ +(\w+) +(.+);")
+                    regexp = re.compile(r"^BA_ +\"(.*)\" +BO_ +(.+) +(.+);")
                     temp = regexp.match(decoded)
                     get_frame_by_id(canmatrix.ArbitrationId.from_compound_integer(int(temp.group(2)))).add_attribute(
                         temp.group(1), temp.group(3))
@@ -816,7 +816,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
                         temp.group(3))
                 else:
                     regexp = re.compile(
-                        r"^BA_ +\"([A-Za-z0-9\-_]+)\" +([\"A-Za-z0-9\-_\.]+);")
+                        r"^BA_ +\"([A-Za-z0-9\-_]+)\" +([\"\w\-\.]+);")
                     temp = regexp.match(decoded)
                     if temp:
                         db.add_attribute(temp.group(1), temp.group(2))
@@ -839,7 +839,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
     #                SIG_VALTYPE_ 0 float : 1;
 
             elif decoded.startswith("BA_DEF_DEF_ "):
-                pattern = r"^BA_DEF_DEF_ +\"([A-Za-z0-9\-_\.]+)\" +(.+)\;"
+                pattern = r"^BA_DEF_DEF_ +\"([\w\-\.]+)\" +(.+)\;"
                 regexp = re.compile(pattern)
                 regexp_raw = re.compile(pattern.encode(dbcImportEncoding))
                 temp = regexp.match(decoded)
@@ -848,7 +848,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
                     db.add_define_default(temp.group(1),
                                           temp_raw.group(2).decode(dbcImportEncoding))
             elif decoded.startswith("SG_MUL_VAL_ "):
-                pattern = r"^SG_MUL_VAL_ +([0-9]+) +([A-Za-z0-9\-_]+) +([A-Za-z0-9\-_]+) +([0-9]+)\-([0-9]+) *;"
+                pattern = r"^SG_MUL_VAL_ +([0-9]+) +([\w\-]+) +([\w\-]+) +([0-9]+)\-([0-9]+) *;"
                 regexp = re.compile(pattern)
                 regexp_raw = re.compile(pattern.encode(dbcImportEncoding))
                 temp = regexp.match(decoded)
@@ -867,7 +867,7 @@ def add_frame_by_id(frame):  # type: (canmatrix.Frame) -> None
                         signal.mux_val_min = muxValMin
                         signal.mux_val_max = muxValMax
             elif decoded.startswith("EV_ "):
-                pattern = r"^EV_ +([A-Za-z0-9\-_]+) *\: +([0-9]+) +\[([0-9.+\-eE]+)\|([0-9.+\-eE]+)\] +\"(\w*)\" +([0-9.+\-eE]+) +([0-9.+\-eE]+) +([A-Za-z0-9\-_]+) +(.*);"
+                pattern = r"^EV_ +([\w\-]+) *\: +([0-9]+) +\[([0-9.+\-eE]+)\|([0-9.+\-eE]+)\] +\"(\w*)\" +([0-9.+\-eE]+) +([0-9.+\-eE]+) +([\w\-]+) +(.*);"
                 regexp = re.compile(pattern)
                 temp = regexp.match(decoded)
 

src/canmatrix/tests/test_dbc.py

@@ -243,6 +243,6 @@ def test_defines_with_spaces():
     assert matrix.ecu_defines["Node Address"].min == 0
     assert matrix.ecu_defines["Node Address"].max == 255
     assert matrix.frame_defines["Period [ms]"].min == 0
-    assert matrix.frame_defines["Period [ms]"].max == 3000
-
+    assert matrix.frame_defines["Period [ms]"].max == 5000
+    assert matrix.frames[0].attributes["Period [ms]"] == '3000'