Changeset 13922 for branches/dev-mo-2530/Compiler/ModelicaFrontEnd/test/modelica/ConnectTests.mo

Timestamp:

Oct 31, 2019 2:22:32 PM (6 weeks ago)

Author:

molsson

Message:

Merged revision(s) 13898-13913 from branches/dev-mo-2617:
#5843 Moved type checking of conditional attributes so that it is always done.
........
#5843 Conditional attribute requires variability fixed parameter or less.
........
#5843 Updated error message NON_BOOLEAN_CONDITIONAL_GUARD to say Boolean instead of boolean.
........
#5843 Merged non-scalar and non-boolean conditional guard error messages.
........

Location:

branches/dev-mo-2530

Files:

• . (modified) (1 prop)
• Compiler/ModelicaFrontEnd/test/modelica/ConnectTests.mo (modified) (2 diffs)

branches/dev-mo-2530/Compiler/ModelicaFrontEnd/test/modelica/ConnectTests.mo

@@ -3101 +3101 @@
     connect(a.c, c);
 
-    annotation(__JModelica(UnitTesting(tests={
-        FlatteningTestCase(
-            name="ConditionalNoErrTest6",
-            description="Ensure that components in conditionaly false components aren't error checked due to connections",
-            flatModel="
+annotation(__JModelica(UnitTesting(tests={
+    FlatteningTestCase(
+        name="ConditionalNoErrTest6",
+        description="Ensure that components in conditionaly false components aren't error checked due to connections",
+        flatModel="
 fclass ConnectTests.ConditionalNoErrTest6
- parameter Boolean on = false /* false */;
+ structural parameter Boolean on = false /* false */;
  Real c;
 end ConnectTests.ConditionalNoErrTest6;
@@ -3162 +3162 @@
         flatModel="
 fclass ConnectTests.ConditionalCompInConnector1
- parameter Boolean c1.b = false /* false */;
+ structural parameter Boolean c1.b = false /* false */;
  potential Real c1.y;
- parameter Boolean c2.b = false /* false */;
+ structural parameter Boolean c2.b = false /* false */;
  potential Real c2.y;
 equation