[NF] Add if-expression tests.

Belonging to [master]:
  - OpenModelica/OMCompiler#2342
  - OpenModelica/OpenModelica-testsuite#914

flattening/modelica/scodeinst/IfExpression1.mo

@@ -0,0 +1,15 @@
+// name: IfExpression1
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+model IfExpression1
+  Real x = if true then 1 else 2;
+end IfExpression1;
+
+// Result:
+// class IfExpression1
+//   Real x = 1.0;
+// end IfExpression1;
+// endResult

flattening/modelica/scodeinst/IfExpression2.mo

@@ -0,0 +1,15 @@
+// name: IfExpression2
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+model IfExpression2
+  Real x = if time > 1 then 1 else 2;
+end IfExpression2;
+
+// Result:
+// class IfExpression2
+//   Real x = /*Real*/(if time > 1.0 then 1 else 2);
+// end IfExpression2;
+// endResult

flattening/modelica/scodeinst/IfExpression3.mo

@@ -0,0 +1,17 @@
+// name: IfExpression3
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+model IfExpression3
+  parameter Boolean b = true;
+  Real x = if b then 1 else 2;
+end IfExpression3;
+
+// Result:
+// class IfExpression3
+//   parameter Boolean b = true;
+//   Real x = /*Real*/(if b then 1 else 2);
+// end IfExpression3;
+// endResult

flattening/modelica/scodeinst/IfExpression4.mo

@@ -0,0 +1,20 @@
+// name: IfExpression4
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+model IfExpression4
+  parameter Boolean b = true;
+  Real x[2] = if b then {1, 2} else {3, 4, 5};
+end IfExpression4;
+
+// Result:
+// class IfExpression4
+//   parameter Boolean b = true;
+//   Real x[1];
+//   Real x[2];
+// equation
+//   x = {1.0, 2.0};
+// end IfExpression4;
+// endResult

flattening/modelica/scodeinst/IfExpression5.mo

@@ -0,0 +1,19 @@
+// name: IfExpression5
+// keywords:
+// status: incorrect
+// cflags: -d=newInst
+//
+
+model IfExpression5
+  Real x[2] = if time > 1 then {1, 2} else {3, 4, 5};
+end IfExpression5;
+
+// Result:
+// Error processing file: IfExpression5.mo
+// [flattening/modelica/scodeinst/IfExpression5.mo:8:3-8:53:writable] Error: Type mismatch in if-expression in component . True branch: {1, 2} has type Integer[2], false branch: {3, 4, 5} has type Integer[3].
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult

flattening/modelica/scodeinst/IfExpression6.mo

@@ -0,0 +1,24 @@
+// name: IfExpression6
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+model M
+  parameter Boolean b;
+  Real x[if b then 2 else 3] = if b then {1, 2} else {3, 4, 5};
+end M;
+
+model IfExpression6
+  M m[2](b = {true, false});
+end IfExpression6;
+
+// Result:
+// class IfExpression4
+//   parameter Boolean b = true;
+//   Real x[1];
+//   Real x[2];
+// equation
+//   x = {1.0, 2.0};
+// end IfExpression4;
+// endResult

flattening/modelica/scodeinst/Makefile

@@ -387,6 +387,11 @@ IfEquation1.mo \
 IfEquation2.mo \
 IfEquation3.mo \
 IfEquation4.mo \
+IfExpression1.mo \
+IfExpression2.mo \
+IfExpression3.mo \
+IfExpression4.mo \
+IfExpression5.mo \
 IfEquationInvalidCond1.mo \
 ih1.mo \
 ih2.mo \
@@ -624,6 +629,7 @@ Wild1.mo \
 # test that currently fail. Move up when fixed.
 # Run make testfailing
 FAILINGTESTFILES=\
+IfExpression6.mo \
 TupleOperation3.mo \
 RedeclareConstant1.mo \
 BuiltinAttribute13.mo \

flattening/modelica/scodeinst/ceval6.mo

@@ -34,7 +34,7 @@ end A;
 //   parameter Boolean b9 = 1 == 0;
 //   parameter Boolean b10 = 1 <> 0;
 //   parameter Boolean b = false or false and not true or true and false and not false or true and not true and not false and true;
-//   parameter Integer n = if false then 2 else 3;
+//   parameter Integer n = 3;
 //   Real x[1];
 //   Real x[2];
 //   Real x[3];