From e2f94fe97b6ba0a8a6d5f5a770b7b10180474a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=96stlund?= <perost86@gmail.com>
Date: Wed, 29 Nov 2017 17:07:43 +0100
Subject: [PATCH] Update nfinst tests.

Belonging to [master]:
  - OpenModelica/OMCompiler#2060
  - OpenModelica/OpenModelica-testsuite#798
---
 flattening/modelica/scodeinst/FuncBuiltinChange.mo | 4 ++++
 flattening/modelica/scodeinst/FuncBuiltinPre.mo    | 4 ++++
 flattening/modelica/scodeinst/ReinitInvalid1.mo    | 8 ++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/flattening/modelica/scodeinst/FuncBuiltinChange.mo b/flattening/modelica/scodeinst/FuncBuiltinChange.mo
index 935afcc4038..39af1208112 100644
--- a/flattening/modelica/scodeinst/FuncBuiltinChange.mo
+++ b/flattening/modelica/scodeinst/FuncBuiltinChange.mo
@@ -9,11 +9,15 @@
 model FuncBuiltinChange
   discrete Real x;
   Boolean y = change(x);
+  Boolean b;
+  Boolean z = change(b);
 end FuncBuiltinChange;
 
 // Result:
 // class FuncBuiltinChange
 //   discrete Real x;
 //   Boolean y = change(x);
+//   Boolean b;
+//   Boolean z = change(b);
 // end FuncBuiltinChange;
 // endResult
diff --git a/flattening/modelica/scodeinst/FuncBuiltinPre.mo b/flattening/modelica/scodeinst/FuncBuiltinPre.mo
index af56d2a9fa1..5fbfd57267f 100644
--- a/flattening/modelica/scodeinst/FuncBuiltinPre.mo
+++ b/flattening/modelica/scodeinst/FuncBuiltinPre.mo
@@ -9,11 +9,15 @@
 model FuncBuiltinPre
   discrete Real x;
   Real y = pre(x);
+  Integer i;
+  Real z = pre(i);
 end FuncBuiltinPre;
 
 // Result:
 // class FuncBuiltinPre
 //   discrete Real x;
 //   Real y = pre(x);
+//   Integer i;
+//   Real z = pre(i);
 // end FuncBuiltinPre;
 // endResult
diff --git a/flattening/modelica/scodeinst/ReinitInvalid1.mo b/flattening/modelica/scodeinst/ReinitInvalid1.mo
index 7c2b2d6a0a3..b811343566c 100644
--- a/flattening/modelica/scodeinst/ReinitInvalid1.mo
+++ b/flattening/modelica/scodeinst/ReinitInvalid1.mo
@@ -5,16 +5,16 @@
 //
 
 class ReinitInvalid1
-  Boolean b(start = false);
+  discrete Real x = 1.0;
 equation
-  when b then
-    reinit(b, true);
+  when time > 1.0 then
+    reinit(x, 2.0);
   end when;
 end ReinitInvalid1;
 
 // Result:
 // Error processing file: ReinitInvalid1.mo
-// [flattening/modelica/scodeinst/ReinitInvalid1.mo:11:5-11:20:writable] Error: The first argument to reinit must be a subtype of Real, but b has type Boolean.
+// [flattening/modelica/scodeinst/ReinitInvalid1.mo:11:5-11:19:writable] Error: The first argument to reinit must be a continuous time variable, but x is discrete.
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.