Changeset 77c8dbfa in OpenModelica

Timestamp:

2021-01-19T16:34:14+01:00 (3 years ago)

Author:

Martin Sjölund <martin@…>

Children:

f7410a0d

Parents:

c8233fa

Message:

Update --std

• Added logic for MSL 4.0.x and 4.x.y
• Consider the 3.5 standard as released (it's a release candidate now)

Location:

OMCompiler/Compiler/Util

Files:

• Config.mo (modified) (4 diffs)
• Flags.mo (modified) (1 diff)

OMCompiler/Compiler/Util/Config.mo

@@ -48 +48 @@
 public
 
-type LanguageStandard = enumeration('1.x', '2.x', '3.0', '3.1', '3.2', '3.3', '3.4', latest, '3.5', experimental)
+type LanguageStandard = enumeration('1.x', '2.x', '3.0', '3.1', '3.2', '3.3', '3.4', '3.5', latest, experimental)
   "Defines the various modelica language versions that OMC can use.";
 
@@ -468 +468 @@
     case 33 then LanguageStandard.'3.3';
     case 34 then LanguageStandard.'3.4';
+    case 35 then LanguageStandard.'3.5';
     case 1000 then LanguageStandard.latest;
-    case 1035 then LanguageStandard.'3.5';
     case 9999 then LanguageStandard.experimental;
   end match;
@@ -478 +478 @@
   output String outString;
 protected
-  constant String lookup[LanguageStandard] = array("1.x","2.x","3.0","3.1","3.2","3.3","3.4","3.4","3.5","experimental" /*Change this to latest version if you add more versions!*/);
+  constant String lookup[LanguageStandard] = array("1.x","2.x","3.0","3.1","3.2","3.3","3.4","3.5","3.5","experimental" /*Change this to latest version if you add more versions!*/);
 algorithm
   outString := lookup[inStandard];
@@ -547 +547 @@
     case "3" :: "0" :: _ then LanguageStandard.'3.0';
     case "3" :: "1" :: _ then LanguageStandard.'3.1';
-    //case "3" :: "2" :: "3" :: _ then LanguageStandard.'3.3';
-    case "3" :: "2" :: _ then LanguageStandard.'3.2';
-    case "3" :: "3" :: _ then LanguageStandard.'3.3';
-    case "3" :: _ then LanguageStandard.latest;
+    case "3" :: _ then LanguageStandard.'3.2';
+    case "4" :: "0" :: _ then LanguageStandard.'3.4';
+    case _ then LanguageStandard.latest;
   end match;
 end versionStringToStd2;

OMCompiler/Compiler/Util/Flags.mo

@@ -579 +579 @@
   ENUM_FLAG(1000,
     {("1.x", 10), ("2.x", 20), ("3.0", 30), ("3.1", 31), ("3.2", 32), ("3.3", 33),
-     ("3.4", 34), ("latest",1000), ("3.5", 1035), ("experimental", 9999)}),
-  SOME(STRING_OPTION({"1.x", "2.x", "3.1", "3.2", "3.3", "3.4", "latest", "3.5", "experimental"})),
+     ("3.4", 34), ("3.5", 35), ("latest",1000), ("experimental", 9999)}),
+  SOME(STRING_OPTION({"1.x", "2.x", "3.1", "3.2", "3.3", "3.4", "3.5", "latest", "experimental"})),
   Gettext.gettext("Sets the language standard that should be used."));