Changeset 353923e8 in OpenModelica


Ignore:
Timestamp:
2021-01-20T15:51:50+01:00 (3 years ago)
Author:
GitHub <noreply@…>
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:
b7c74ad
Parents:
d67ca7d
git-author:
Martin Sjölund <martin@…> (01/20/21 15:51:50)
git-committer:
GitHub <noreply@…> (01/20/21 15:51:50)
Message:

Update --std (#7087)

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

Legend:

Unmodified
Added
Removed

  • OMCompiler/Compiler/Util/Config.mo

    r0df6e65 r353923e8  
    4848public
    4949
    50 type LanguageStandard = enumeration('1.x', '2.x', '3.0', '3.1', '3.2', '3.3', '3.4', latest, '3.5', experimental)
     50type LanguageStandard = enumeration('1.x', '2.x', '3.0', '3.1', '3.2', '3.3', '3.4', '3.5', latest, experimental)
    5151  "Defines the various modelica language versions that OMC can use.";
    5252
    … …  
    468468    case 33 then LanguageStandard.'3.3';
    469469    case 34 then LanguageStandard.'3.4';
     470    case 35 then LanguageStandard.'3.5';
    470471    case 1000 then LanguageStandard.latest;
    471     case 1035 then LanguageStandard.'3.5';
    472472    case 9999 then LanguageStandard.experimental;
    473473  end match;
    … …  
    478478  output String outString;
    479479protected
    480   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!*/);
     480  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!*/);
    481481algorithm
    482482  outString := lookup[inStandard];
    … …  
    547547    case "3" :: "0" :: _ then LanguageStandard.'3.0';
    548548    case "3" :: "1" :: _ then LanguageStandard.'3.1';
    549     //case "3" :: "2" :: "3" :: _ then LanguageStandard.'3.3';
    550     case "3" :: "2" :: _ then LanguageStandard.'3.2';
    551     case "3" :: "3" :: _ then LanguageStandard.'3.3';
    552     case "3" :: _ then LanguageStandard.latest;
     549    case "3" :: _ then LanguageStandard.'3.2';
     550    case "4" :: "0" :: _ then LanguageStandard.'3.4';
     551    case _ then LanguageStandard.latest;
    553552  end match;
    554553end versionStringToStd2;

  • OMCompiler/Compiler/Util/Flags.mo

    r97adc965 r353923e8  
    579579  ENUM_FLAG(1000,
    580580    {("1.x", 10), ("2.x", 20), ("3.0", 30), ("3.1", 31), ("3.2", 32), ("3.3", 33),
    581      ("3.4", 34), ("latest",1000), ("3.5", 1035), ("experimental", 9999)}),
    582   SOME(STRING_OPTION({"1.x", "2.x", "3.1", "3.2", "3.3", "3.4", "latest", "3.5", "experimental"})),
     581     ("3.4", 34), ("3.5", 35), ("latest",1000), ("experimental", 9999)}),
     582  SOME(STRING_OPTION({"1.x", "2.x", "3.1", "3.2", "3.3", "3.4", "3.5", "latest", "experimental"})),
    583583  Gettext.gettext("Sets the language standard that should be used."));
    584584

  • testsuite/simulation/modelica/synchronous/EventClock.mos

    r221b299 r353923e8  
    22// keywords: synchronous clocked equations
    33// status: correct
    4 // cflags: -d=-newInst
     4// cflags: -d=-newInst --std=3.3
    55
    6 loadModel(Modelica, {"3.2.2"}, languageStandard="3.3");getErrorString();
     6loadModel(Modelica, {"3.2.2"});getErrorString();
    77loadFile("EventClock.mo");getErrorString();
    88

  • testsuite/simulation/modelica/synchronous/EventClock_cpp.mos

    r221b299 r353923e8  
    22// keywords: synchronous clocked equations
    33// status: correct
    4 // cflags: -d=-newInst
     4// cflags: -d=-newInst --std=3.3
    55
    6 loadModel(Modelica, {"3.2.2"}, languageStandard="3.3");getErrorString();
     6loadModel(Modelica, {"3.2.2"});getErrorString();
    77loadFile("EventClock.mo");getErrorString();
    88

  • testsuite/simulation/modelica/synchronous/WhenClocks.mos

    r221b299 r353923e8  
    22// keywords: synchronous features
    33// status: correct
    4 // cflags: -d=-newInst
     4// cflags: -d=-newInst --std=3.3
    55//
    66
    7 loadModel(Modelica, languageStandard="3.3"); getErrorString();
     7loadModel(Modelica); getErrorString();
    88
    99setCommandLineOptions("+d=dumpSynchronous"); getErrorString();

  • testsuite/simulation/modelica/synchronous/boolSubClocks.mos

    r221b299 r353923e8  
    22// keywords: synchronous features, cpp
    33// status: correct
    4 // cflags: -d=-newInst
     4// cflags: -d=-newInst --std=3.3
    55//
    6 loadModel(Modelica, languageStandard="3.3");getErrorString();
     6loadModel(Modelica);getErrorString();
    77
    88loadFile("boolSubClocks.mo");
Note: See TracChangeset for help on using the changeset viewer.