Add support for multidimensional arrays to IEC.

This commit is contained in:
Silcantar
2026-09-22 13:09:45 -05:00
parent 0a3b1069cc
commit 94922f09e8
2 changed files with 40 additions and 28 deletions

View File

@@ -24,13 +24,13 @@ class TestIEC(unittest.TestCase):
("CHAR", DataUnit.BIT, 8),
("INT", DataUnit.BIT, 16),
("BOOL", DataUnit.WORD, 1),
("ARRAY [0..10] OF INT", DataUnit.WORD, 11),
("ARRAY [1..10, 0..7] OF INT", DataUnit.WORD, 80),
("STRING[10]", DataUnit.WORD, 5),
("UNKNOWN_UDT", DataUnit.WORD, -1),
]
for data_type in data_types:
self.assertEqual(
get_data_length(data_type[0], data_type[1]), data_type[2], data_type
get_data_length(data_type[0], data_type[1]), data_type[2], data_type[0]
)
def test_iec_definitions(self):
@@ -43,7 +43,10 @@ class TestIECArray(unittest.TestCase):
def test_array_length(self):
good_array_specs = [
("ARRAY [0..3] OF INT", DataUnit.WORD, ceil, 4),
("ARRAY [0..0] OF REAL", DataUnit.WORD, ceil, 2),
("ARRAY [0..3, 0..3] OF INT", DataUnit.WORD, ceil, 16),
("array[15..20] of bool", DataUnit.BIT, ceil, 6),
("ARRAY [0..1, 0..2, 0..3, 0..4] OF INT", DataUnit.WORD, ceil, 120),
]
warning_array_specs = [
("array[15..20] of bool", DataUnit.WORD, ceil, 1),
@@ -51,12 +54,10 @@ class TestIECArray(unittest.TestCase):
]
with warnings.catch_warnings():
warnings.simplefilter("ignore")
self.assertTrue(
all(
IECArray(spec[0]).get_length(spec[1], spec[2]) == spec[3]
for spec in good_array_specs + warning_array_specs
for spec in good_array_specs + warning_array_specs:
self.assertEqual(
IECArray(spec[0]).get_length(spec[1], spec[2]), spec[3], spec[0]
)
)
for spec in warning_array_specs:
self.assertWarns(
RuntimeWarning, IECArray(spec[0]).get_length, spec[1], spec[2]
@@ -77,7 +78,8 @@ class TestIECArray(unittest.TestCase):
"array [1..7] of float", # Invalid data type
"array [5..1] of dint", # Lower bound greater than upper bound
)
self.assertTrue(all(IECArray(spec).is_valid() for spec in valid_array_specs))
for spec in valid_array_specs:
self.assertTrue(IECArray(spec).is_valid(), spec)
for spec in invalid_array_specs:
self.assertRaises(ValueError, IECArray, spec)
@@ -100,12 +102,10 @@ class TestIECString(unittest.TestCase):
]
with warnings.catch_warnings():
warnings.simplefilter("ignore")
self.assertTrue(
all(
IECString(spec[0]).get_length(spec[1], spec[2]) == spec[3]
for spec in good_string_specs + warning_string_specs
for spec in good_string_specs + warning_string_specs:
self.assertEqual(
IECString(spec[0]).get_length(spec[1], spec[2]), spec[3], spec[0]
)
)
for spec in warning_string_specs:
self.assertWarns(
RuntimeWarning, IECString(spec[0]).get_length, spec[1], spec[2]