Changeset 9625

Timestamp:

Feb 8, 2017 12:38:07 PM (3 years ago)

Author:

Zimon Kuhs

Message:

#5284

Fixed a lookup issue introduced in r9609.

File:

• trunk/Compiler/ModelicaFrontEnd/src/jastadd/instance/InstLookupClasses.jrag (modified) (1 diff)

trunk/Compiler/ModelicaFrontEnd/src/jastadd/instance/InstLookupClasses.jrag

@@ -118 +118 @@
     inh InstLookupResult<InstClassDecl> InstReplacingExtendsShortClass.lookupInstClassInChain(String name);
 
-    /*
-     * Default to using normal lookup.
-     */
-    eq List.getChild(int index).lookupInstClassInChain(String name) {
-        InstLookupResult<InstClassDecl> result = null;
-        for (ASTNode child : this) {
-            result = ((InstNode) child).lookupInstClass(name);
-            if (result.successful()) {
-                return result;
-            }
-        }
-        return result;
-    }
-    eq InstNode.getChild(int index).lookupInstClassInChain(String name) {
-        return ((InstNode) getChild(index)).lookupInstClass(name);
-    }
+    eq InstNode.getInstClassDecl(int index).lookupInstClassInChain(String name)             =
+            getInstClassDecl(index).lookupInstClass(name);
+    eq InstNode.getInstExtends(int index).lookupInstClassInChain(String name)               =
+            getInstExtends(index).lookupInstClass(name);
+    eq InstNode.getRedeclaredInstClassDecl(int index).lookupInstClassInChain(String name)   =
+            getRedeclaredInstClassDecl(index).lookupInstClass(name);
+    eq InstNode.getInstComponentDecl(int index).lookupInstClassInChain(String name)         =
+            getInstComponentDecl(index).lookupInstClass(name);
+
     eq InstRecordConstructor.getInstComponentDecl().lookupInstClassInChain(String name)    = 
         myInstClassDecl().genericLookupInstClass(name);