+ Type functions before typing classes.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14780 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 15, 2013 · e8b019e · e8b019e
1 parent 12f58e4
commit e8b019e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Compiler/FrontEnd/NFSCodeInst.mo b/Compiler/FrontEnd/NFSCodeInst.mo
@@ -164,6 +164,11 @@ algorithm
 
         // Mark structural parameters.
         (cls, symtab) = assignParamTypes(cls, symtab);
+
+        // Type all instantiated functions.
+        ((functions, symtab)) = List.fold(BaseHashTable.hashTableKeyList(functions),
+          NFTyping.typeFunction, (functions, symtab));
+
         // Type the instantiated class.
         (cls, symtab) = NFTyping.typeClass(cls, NFTyping.CONTEXT_MODEL(), symtab, functions);
 
@@ -176,10 +181,6 @@ algorithm
         // Type the instantiated class again, to type any instantiated
         // conditional components that might have been added.
         (cls, symtab) = NFTyping.typeClass(cls, NFTyping.CONTEXT_MODEL(), symtab, functions);
-
-        // Type all instantiated functions.
-        ((functions, symtab)) = List.fold(BaseHashTable.hashTableKeyList(functions),
-          NFTyping.typeFunction, (functions, symtab));
 
         // Type check the typed class components.
         (cls, symtab) = NFTypeCheck.checkClassComponents(cls, NFTyping.CONTEXT_MODEL(), symtab);