From 05591447fb84dde0bd3c6b2bec26be697783e06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=96stlund?= Date: Mon, 21 May 2018 12:10:35 +0200 Subject: [PATCH] [NF] Add more record evaluation tests. Belonging to [master]: - OpenModelica/OMCompiler#2447 - OpenModelica/OpenModelica-testsuite#950 --- flattening/modelica/scodeinst/CevalRecord5.mo | 25 +++++++++++++++++ flattening/modelica/scodeinst/CevalRecord6.mo | 27 +++++++++++++++++++ flattening/modelica/scodeinst/Makefile | 2 ++ 3 files changed, 54 insertions(+) create mode 100644 flattening/modelica/scodeinst/CevalRecord5.mo create mode 100644 flattening/modelica/scodeinst/CevalRecord6.mo diff --git a/flattening/modelica/scodeinst/CevalRecord5.mo b/flattening/modelica/scodeinst/CevalRecord5.mo new file mode 100644 index 00000000000..54dfcac4661 --- /dev/null +++ b/flattening/modelica/scodeinst/CevalRecord5.mo @@ -0,0 +1,25 @@ +// name: CevalRecord5 +// keywords: +// status: correct +// cflags: -d=newInst +// + +record R + Real x = 1.0; + Real y = 2.0; + Real z = 3.0; +end R; + +model CevalRecord5 + constant R r1 = R(4.0, 5.0, 6.0); + Real x = r1.x; +end CevalRecord5; + +// Result: +// class CevalRecord5 +// constant Real r1.x = 4.0; +// constant Real r1.y = 5.0; +// constant Real r1.z = 6.0; +// Real x = 4.0; +// end CevalRecord5; +// endResult diff --git a/flattening/modelica/scodeinst/CevalRecord6.mo b/flattening/modelica/scodeinst/CevalRecord6.mo new file mode 100644 index 00000000000..8a601857acf --- /dev/null +++ b/flattening/modelica/scodeinst/CevalRecord6.mo @@ -0,0 +1,27 @@ +// name: CevalRecord6 +// keywords: +// status: correct +// cflags: -d=newInst +// + +record R + Real x = 1.0; + Real y; + Real z = 3.0; +end R; + +model CevalRecord6 + constant R r1; + Real x = r1.x; + Real z = r1.z; +end CevalRecord6; + +// Result: +// class CevalRecord6 +// constant Real r1.x = 1.0; +// constant Real r1.y; +// constant Real r1.z = 3.0; +// Real x = 1.0; +// Real z = 3.0; +// end CevalRecord6; +// endResult diff --git a/flattening/modelica/scodeinst/Makefile b/flattening/modelica/scodeinst/Makefile index 04b8f9f6002..5791ecfcbbc 100644 --- a/flattening/modelica/scodeinst/Makefile +++ b/flattening/modelica/scodeinst/Makefile @@ -110,6 +110,8 @@ CevalRecord1.mo \ CevalRecord2.mo \ CevalRecord3.mo \ CevalRecord4.mo \ +CevalRecord5.mo \ +CevalRecord6.mo \ CevalReduction1.mo \ CevalReduction2.mo \ CevalRelation1.mo \