+ Allow instantiation of connectors deriving from records.

+ Remove unnecessary error message. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15453 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 3, 2013 · 0069830 · 0069830
1 parent c4d11c3
commit 0069830
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Compiler/FrontEnd/Inst.mo b/Compiler/FrontEnd/Inst.mo
@@ -5016,7 +5016,7 @@ algorithm
         // false = valueEq(re, SCode.R_FUNCTION());
         false = valueEq(re, SCode.R_ENUMERATION());
         false = valueEq(re, SCode.R_PREDEFINED_ENUMERATION());
-        false = SCode.isConnector(re);
+        // false = SCode.isConnector(re);
         // check empty array dimensions
         true = boolOr(valueEq(ad, NONE()), valueEq(ad, SOME({})));
 
@@ -18733,7 +18733,8 @@ algorithm
 
       case(_, _, _)
         equation
-          print("Inst.getRecordConstructorFunction failed for " +& Absyn.pathString(inPath) +& "\n");
+          true = Flags.isSet(Flags.FAILTRACE);
+          Debug.fprint(Flags.FAILTRACE, "Inst.getRecordConstructorFunction failed for " +& Absyn.pathString(inPath) +& "\n");
         then
           fail();
 

diff --git a/Compiler/FrontEnd/Static.mo b/Compiler/FrontEnd/Static.mo
@@ -12895,8 +12895,8 @@ algorithm
   outPath := match(inType1)
   local     
     Absyn.Path path;
-    case (DAE.T_COMPLEX(ClassInf.RECORD(path),_, _,_)) then path;
-    case (DAE.T_ARRAY(DAE.T_COMPLEX(ClassInf.RECORD(path),_, _,_),_,_)) then path;
+    case (DAE.T_COMPLEX(ClassInf.RECORD(_),_, _,{path})) then path;
+    case (DAE.T_ARRAY(DAE.T_COMPLEX(ClassInf.RECORD(_),_, _,{path}),_,_)) then path;
     else fail();
   end match;