Changeset 0df6e65 in OpenModelica

Timestamp:

2020-06-03T17:49:49+02:00 (4 years ago)

Author:

perost <perost86@…>

Branches:

Added-citation-metadata, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

59c0cf1, afc001c8

Parents:

58b509d7

git-author:

Per Östlund <perost86@…> (06/03/20 14:29:11)

git-committer:

perost <perost86@…> (06/03/20 17:49:49)

Message:

Add more language standards.

• Add 3.4, 3.5, and experimental as language standards.
• Change LanguageStandard.latest to mean 3.4.

Location:

OMCompiler/Compiler/Util

Files:

• Config.mo (modified) (8 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', latest)
+type LanguageStandard = enumeration('1.x', '2.x', '3.0', '3.1', '3.2', '3.3', '3.4', latest, '3.5', experimental)
   "Defines the various modelica language versions that OMC can use.";
 
@@ -451 +451 @@
   output Integer outValue;
 protected
-  constant Integer lookup[LanguageStandard] = array(10, 20, 30, 31, 32, 33, 1000);
+  constant Integer lookup[LanguageStandard] = array(10, 20, 30, 31, 32, 33, 34, 1000, 1035, 9999);
 algorithm
   outValue := lookup[inStandard];
@@ -467 +467 @@
     case 32 then LanguageStandard.'3.2';
     case 33 then LanguageStandard.'3.3';
+    case 34 then LanguageStandard.'3.4';
     case 1000 then LanguageStandard.latest;
+    case 1035 then LanguageStandard.'3.5';
+    case 9999 then LanguageStandard.experimental;
   end match;
 end intLanguageStandard;
@@ -475 +478 @@
   output String outString;
 protected
-  constant String lookup[LanguageStandard] = array("1.x","2.x","3.0","3.1","3.2","3.3","3.3" /*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.4","3.5","experimental" /*Change this to latest version if you add more versions!*/);
 algorithm
   outString := lookup[inStandard];
@@ -493 +496 @@
   _ := matchcontinue(inLibraryName)
     local
-      String version, new_std_str;
+      String version;
       LanguageStandard new_std;
-      Boolean show_warning;
 
     case _
@@ -501 +503 @@
         "Modelica" :: version :: _ := System.strtok(inLibraryName, " ");
         new_std := versionStringToStd(version);
-        if new_std==current_std then
-          return;
-        end if;
-        setLanguageStandard(new_std);
-        show_warning := hasLanguageStandardChanged(current_std);
-        new_std_str := languageStandardString(new_std);
-        if show_warning then
-          Error.addMessage(Error.CHANGED_STD_VERSION, {new_std_str, version});
+
+        if new_std <> current_std then
+          setLanguageStandard(new_std);
+
+          if hasLanguageStandardChanged(current_std) then
+            Error.addMessage(Error.CHANGED_STD_VERSION,
+              {languageStandardString(new_std), version});
+          end if;
         end if;
       then ();
@@ -545 +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';
@@ -636 +639 @@
 "@autor: adrpo
  checks returns true if language standard is above or equal to Modelica 3.3"
-  output Boolean outRes;
-protected
-  LanguageStandard std = getLanguageStandard();
-algorithm
-  outRes := intGe(languageStandardInt(std), 33);
+  output Boolean outRes = getLanguageStandard() >= LanguageStandard.'3.3';
 end synchronousFeaturesAllowed;
 

OMCompiler/Compiler/Util/Flags.mo

@@ -595 +595 @@
 constant ConfigFlag LANGUAGE_STANDARD = CONFIG_FLAG(8, "std", NONE(), EXTERNAL(),
   ENUM_FLAG(1000,
-    {("1.x", 10), ("2.x", 20), ("3.0", 30), ("3.1", 31), ("3.2", 32), ("3.3", 33), ("latest",1000)}),
-  SOME(STRING_OPTION({"1.x", "2.x", "3.1", "3.2", "3.3", "latest"})),
+    {("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"})),
   Gettext.gettext("Sets the language standard that should be used."));