Let's use unique field names

rusefi · May 27, 2024 · bd90ce8 · bd90ce8
1 parent 2698a8f
commit bd90ce8
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java b/reader/src/main/java/com/rusefi/can/reader/dbc/DbcFile.java
@@ -35,6 +35,7 @@ public void read(BufferedReader reader) throws IOException {
         DbcPacket currentPacket = null;
         String line;
         int lineIndex = -1;
+        Set<String> fieldNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
         while ((line = reader.readLine()) != null) {
             lineIndex++;
             line = line.trim();
@@ -72,11 +73,19 @@ public void read(BufferedReader reader) throws IOException {
 
 
             } else if (line.startsWith("SG_")) {
-                DbcField field = DbcField.parseField(currentPacket, line);
+                DbcField field;
+                try {
+                    field = DbcField.parseField(currentPacket, line);
+                } catch (Throwable e) {
+                    throw new IllegalStateException("During [" + line + "]", e);
+                }
                 if (debugEnabled)
                     System.out.println("Found " + field);
-                if (field != null)
+                if (field != null) {
+                    if (!fieldNames.add(field.getName()))
+                        throw new IllegalArgumentException("Let's use unique field names: " + field.getName());
                     currentPacket.add(field);
+                }
 
             } else {
                 // skipping useless line