Updated expected results for uniontype typevars

OpenModelica · Mar 7, 2016 · cd42b44 · cd42b44
1 parent c8f269f
commit cd42b44
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/flattening/modelica/records/NestedRecordTestConstructor.mos b/flattening/modelica/records/NestedRecordTestConstructor.mos
@@ -67,13 +67,13 @@ res:=RecordTest.MULT_PLUS(plus1,plus2,plus3);
 // end RecordTest.ADD;
 // end RecordTest.PLUS;
 // record RecordTest.PLUS
-//     _left = record RecordTest.ADD
-//     _a1 = 1.0,
-//     _a2 = 2.0
+//     left = record RecordTest.ADD
+//     a1 = 1.0,
+//     a2 = 2.0
 // end RecordTest.ADD;,
-//     _right = record RecordTest.ADD
-//     _a1 = 3.0,
-//     _a2 = 4.0
+//     right = record RecordTest.ADD
+//     a1 = 3.0,
+//     a2 = 4.0
 // end RecordTest.ADD;
 // end RecordTest.PLUS;
 // record RecordTest.MULT_PLUS

diff --git a/flattening/modelica/records/SimpleRecordTestConstructor.mos b/flattening/modelica/records/SimpleRecordTestConstructor.mos
@@ -27,8 +27,8 @@ a:=RecordTest.ADD(1.0,2.0);
 //     a2 = 2.0
 // end RecordTest.ADD;
 // record RecordTest.ADD
-//     _a1 = 1.0,
-//     _a2 = 2.0
+//     a1 = 1.0,
+//     a2 = 2.0
 // end RecordTest.ADD;
 // record RecordTest.ADD
 //     a1 = 1.0,

diff --git a/metamodelica/meta/ErrorInvalidComplexType.mo b/metamodelica/meta/ErrorInvalidComplexType.mo
@@ -9,6 +9,7 @@ end ErrorInvalidComplexType;
 
 // Result:
 // Error processing file: ErrorInvalidComplexType.mo
+// [metamodelica/meta/ErrorInvalidComplexType.mo:6:1-6:37:writable] Error: Class option not found in scope ErrorInvalidComplexType.option.
 // [metamodelica/meta/ErrorInvalidComplexType.mo:6:1-6:37:writable] Error: Invalid complex type name: option<String>
 // Error: Error occurred while flattening model ErrorInvalidComplexType
 //

diff --git a/metamodelica/meta/Uniontype13.mos b/metamodelica/meta/Uniontype13.mos
@@ -17,7 +17,7 @@ g:=Uniontype13.fooIdent(f);
 //     x = 3
 // end Uniontype13.UT.REC1;
 // record Uniontype13.foo
-//     _ut = record Uniontype13.UT.REC1
+//     ut = record Uniontype13.UT.REC1
 //     x = 3
 // end Uniontype13.UT.REC1;
 // end Uniontype13.foo;