Merge remote-tracking branch 'rlane/explicit-inheritance2'
Conflicts:
loxi_front_end/frontend.py
loxi_front_end/parser.py
loxi_ir.py
diff --git a/loxi_ir.py b/loxi_ir.py
index aeefa74..9e266eb 100644
--- a/loxi_ir.py
+++ b/loxi_ir.py
@@ -76,7 +76,7 @@
@param super_class name of the super class
@param params optional dictionary of parameters
"""
-class OFClass(namedtuple('OFClass', ['name', 'members', 'super_class', 'params'])):
+class OFClass(namedtuple('OFClass', ['name', 'members', 'superclass', 'params'])):
def member_by_name(self, name):
return find(self.members, lambda m: hasattr(m, "name") and m.name == name)