Fixes for ticket:4007

Updated cseTestCall1.mos, which used an illegal function call. Added a test case for tuples not on the LHS.
OpenModelica · Sep 7, 2016 · 07e45ab · 07e45ab
1 parent 9f36c1c
commit 07e45ab
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/flattening/modelica/algorithms-functions/Makefile b/flattening/modelica/algorithms-functions/Makefile
@@ -96,6 +96,7 @@ Summation.mo \
 SumSeriesWhile.mo \
 SumVectorForIf.mo \
 TestGravityAcceleration.mo \
+TupleError.mo \
 TupleSingleAssign.mo \
 TupleAssignmentMismatch1.mo \
 tupleSubset.mo \

diff --git a/flattening/modelica/algorithms-functions/TupleError.mo b/flattening/modelica/algorithms-functions/TupleError.mo
@@ -0,0 +1,16 @@
+// status: incorrect
+// Based on ticket:4007
+
+model TupleError
+  Real a = (0,25)*(0,25);
+end TupleError;
+// Result:
+// Error processing file: TupleError.mo
+// [flattening/modelica/algorithms-functions/TupleError.mo:5:3-5:25:writable] Error: Tuple expressions may only occur on the left side of an assignment or equation with a single function call on the right side. Got the following expression: (0, 25).
+// Error: Error occurred while flattening model TupleError
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult
diff --git a/simulation/modelica/commonSubExp/cseTestCall1.mos b/simulation/modelica/commonSubExp/cseTestCall1.mos
@@ -11,7 +11,7 @@ package CSE
     Real C = time+1.0;
     Real D;
     Real E;
-    
+
     function f
       input Real s;
       output Real a;
@@ -22,7 +22,7 @@ package CSE
     end f;
 
   equation
-    f(time) = (x,y);
+    (x,y) = f(time);
     A = B*C;
     D = log(B*C);
     E = B*C + log(log(log(B*C)));