Rename TimeType components

beutlich · beutlich · commit eeeee8171294 · 2019-12-05T20:45:08.000+01:00
diff --git a/Modelica/Utilities/Time.mo b/Modelica/Utilities/Time.mo
@@ -6,7 +6,7 @@ package Time "Functions to work with date and time"
     extends Modelica.Icons.Function;
     output Types.TimeType now "Current time";
   algorithm
-    (now.ms, now.sec, now.min, now.hour, now.day, now.mon, now.year) := Internal.Time.getTime();
+    (now.millisecond, now.second, now.minute, now.hour, now.day, now.month, now.year) := Internal.Time.getTime();
     annotation (__ModelicaAssociation_Impure=true,
 Documentation(info="<html>
 <h4>Syntax</h4>
diff --git a/Modelica/Utilities/Types.mo b/Modelica/Utilities/Types.mo
@@ -38,12 +38,12 @@ package Types "Type definitions used in package Modelica.Utilities"
 
   record TimeType "Record containing date and time components"
     extends Modelica.Icons.Record;
-    Integer ms(min=0, max=999) "Millisecond" annotation(absoluteValue=true);
-    Integer sec(min=0, max=61) "Second" annotation(absoluteValue=true);
-    Integer min(min=0, max=59) "Minute" annotation(absoluteValue=true);
+    Integer millisecond(min=0, max=999) "Millisecond" annotation(absoluteValue=true);
+    Integer second(min=0, max=61) "Second" annotation(absoluteValue=true);
+    Integer minute(min=0, max=59) "Minute" annotation(absoluteValue=true);
     Integer hour(min=0, max=23) "Hour" annotation(absoluteValue=true);
     Integer day(min=1, max=31) "Day" annotation(absoluteValue=true);
-    Integer mon(min=1, max=12) "Month" annotation(absoluteValue=true);
+    Integer month(min=1, max=12) "Month" annotation(absoluteValue=true);
     Integer year "Year" annotation(absoluteValue=true);
     annotation (Documentation(info="<html>
 <blockquote>
diff --git a/ModelicaTest/Utilities.mo b/ModelicaTest/Utilities.mo
@@ -389,12 +389,12 @@ extends Modelica.Icons.ExamplesPackage;
     Streams.print("... Test of Modelica.Utilities.Time", logFile);
 
     now := Modelica.Utilities.Time.getTime();
-    Streams.print("    ms   = " + String(now.ms));
-    Streams.print("    sec  = " + String(now.sec));
-    Streams.print("    min  = " + String(now.min));
+    Streams.print("    ms   = " + String(now.millisecond));
+    Streams.print("    sec  = " + String(now.second));
+    Streams.print("    min  = " + String(now.minute));
     Streams.print("    hour = " + String(now.hour));
     Streams.print("    day  = " + String(now.day));
-    Streams.print("    mon  = " + String(now.mon));
+    Streams.print("    mon  = " + String(now.month));
     Streams.print("    year = " + String(now.year));
 
     assert(not Modelica.Utilities.Time.isLeapYear(1900), "Time.isLeapYear failed");
