Skip to content

Commit 9f58e5d

Browse files
committed
- Bump MSL version Constrain Universal and Revolute now seem to fail
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14715 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 6581f59 commit 9f58e5d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Compiler/FrontEnd/InstSection.mo

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3731,12 +3731,12 @@ public function isExpandableConnectorType
37313731
input DAE.Type ty;
37323732
output Boolean isExpandable;
37333733
algorithm
3734-
isExpandable := matchcontinue(ty)
3734+
isExpandable := match (ty)
37353735
case (DAE.T_COMPLEX(complexClassType = ClassInf.CONNECTOR(_,true))) then true;
37363736
// TODO! check if subtype is needed here
37373737
case (DAE.T_SUBTYPE_BASIC(complexClassType = ClassInf.CONNECTOR(_,true))) then true;
37383738
case (_) then false;
3739-
end matchcontinue;
3739+
end match;
37403740
end isExpandableConnectorType;
37413741

37423742
protected function getStateFromType
@@ -3746,15 +3746,15 @@ protected function getStateFromType
37463746
input DAE.Type ty;
37473747
output ClassInf.State outState;
37483748
algorithm
3749-
outState := matchcontinue(ty)
3749+
outState := match (ty)
37503750
local
37513751
ClassInf.State state;
37523752
case (DAE.T_COMPLEX(complexClassType = state)) then state;
37533753
// TODO! check if subtype is needed here
37543754
case (DAE.T_SUBTYPE_BASIC(complexClassType = state)) then state;
37553755
// adpo: TODO! FIXME! add a debug print here!
37563756
case (_) then fail();
3757-
end matchcontinue;
3757+
end match;
37583758
end getStateFromType;
37593759

37603760
protected function isConnectorType
@@ -3763,12 +3763,12 @@ protected function isConnectorType
37633763
input DAE.Type ty;
37643764
output Boolean isConnector;
37653765
algorithm
3766-
isConnector := matchcontinue(ty)
3766+
isConnector := match (ty)
37673767
case (DAE.T_COMPLEX(complexClassType = ClassInf.CONNECTOR(_,false))) then true;
37683768
// TODO! check if subtype is needed here
37693769
case (DAE.T_SUBTYPE_BASIC(complexClassType = ClassInf.CONNECTOR(_,false))) then true;
37703770
case (_) then false;
3771-
end matchcontinue;
3771+
end match;
37723772
end isConnectorType;
37733773

37743774
protected function flipDirection

Examples/BuildModelRecursive.mos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
setCommandLineOptions({"+g=Modelica","+d=nogen"});
44
OpenModelica.Scripting.Internal.Time.timerTick(OpenModelica.Scripting.Internal.Time.RT_CLOCK_USER_RESERVED);
55
log:="BuildModelRecursive.html";
6-
MSLVersion:="3.1";
6+
MSLVersion:="3.2";
77
runModelicaTest:=false;
88
ulimitOmc:="1200"; // 20 minutes to generate the C-code
99
ulimitExe:="180"; // 3 minutes to initialize and run the simulation

0 commit comments

Comments
 (0)