Merge pull request #118 from openxc/Errorhandling

Firmware Error Handling

Author: pjt0620

openxc/generator/structures.py

@@ -103,6 +103,14 @@ def id(self, value):
     def merge_message(self, data):
         self.bus_name = self.bus_name or data.get('bus', None)
 
+        message_attributes = dir(self)
+        message_attributes = [a.replace('bus_name', 'bus') for a in message_attributes]
+        data_attributes = list(data.keys())
+        extra_attributes = set(data_attributes) - set(message_attributes)
+
+        if extra_attributes:
+            fatal_error('ERROR: Message %s has unrecognized attributes: %s' % (data.get('id'), ', '.join(extra_attributes)))
+
         if getattr(self, 'message_set'):
             self.bus = self.message_set.lookup_bus(name=self.bus_name)
             if not self.bus.valid():

openxc/utils.py

@@ -90,10 +90,20 @@ def find_file(filename, search_paths):
             filename, search_paths))
 
 
+def dict_raise_on_duplicates(ordered_pairs):
+    """Reject duplicate keys."""
+    d = {}
+    for k, v in ordered_pairs:
+        if k in d:
+           raise ValueError("duplicate key: %r" % (k,))
+        else:
+           d[k] = v
+    return d
+
 def load_json_from_search_path(filename, search_paths):
     with open(find_file(filename, search_paths)) as json_file:
         try:
-            data = json.load(json_file)
+            data = json.load(json_file, object_pairs_hook=dict_raise_on_duplicates)
         except ValueError as e:
             fatal_error("%s does not contain valid JSON: \n%s\n" %
                     (filename, e))