Changeset 1049 for XIOS/trunk

Timestamp:

02/03/17 14:26:51 (7 years ago)

Author:

rlacroix

Message:

Fix: Do not allow redefining the same duration unit.

For example "4d 7d" used to be parsed as "7d", now an error will be thrown.

Fixes ticket #115.

File:

• XIOS/trunk/src/duration.cpp (modified) (4 diffs)

XIOS/trunk/src/duration.cpp

@@ -38 +38 @@
         char   c = '/';
         bool   invalidUnit = false;
+        CDuration sentinel = NoneDu;
+
+#define setDuration(unit, value)                                                  \
+        {                                                                         \
+          if (sentinel.unit)                                                      \
+            ERROR("StdIStream& operator>>(StdIStream& in , CDuration& duration)", \
+                  << "Bad duration format: " #unit " has already been set.");      \
+                                                                                  \
+          duration.unit = value;                                                  \
+          sentinel.unit = 1.0;                                                    \
+        }
 
         do
@@ -48 +59 @@
           switch (c)
           {
-            case 'y': duration.year   = v; break;
-            case 'd': duration.day    = v; break;
-            case 'h': duration.hour   = v; break;
-            case 's': duration.second = v; break;
+            case 'y': setDuration(year, v) break;
+            case 'd': setDuration(day, v) break;
+            case 'h': setDuration(hour, v) break;
+            case 's': setDuration(second, v) break;
             case 'm':
             {
               in >> c;
-              if      (c == 'i') duration.minute = v;
-              else if (c == 'o') duration.month  = v;
+              if      (c == 'i') setDuration(minute, v)
+              else if (c == 'o') setDuration(month, v)
               else invalidUnit = true;
               break;
@@ -63 +74 @@
             {
               in >> c;
-              if (c == 's') duration.timestep = v;
+              if (c == 's') setDuration(timestep, v)
               else invalidUnit = true;
               break;
@@ -76 +87 @@
                   << "Bad duration format: invalid unit, unexpected '" << c << "' character.");
         } while (in.peek() != EOF); // check whether there is a next character to read
+
+#undef setDuration
 
         return in;