Changeset 2506 in Sophya for trunk/SophyaLib/NTools/dates.cc

Timestamp:

Mar 15, 2004, 5:46:56 PM (22 years ago)

Author:

ansari

Message:

Remplacement THROW par throw - Reza 15/03/2004

File:

• trunk/SophyaLib/NTools/dates.cc (modified) (18 diffs)

trunk/SophyaLib/NTools/dates.cc

@@ -44 +44 @@
 #endif
   SetZone(p);
-  END_CONSTRUCTOR;
 }
 
@@ -54 +53 @@
 {
   SetZone(nom);
-  END_CONSTRUCTOR
 }
 
@@ -94 +92 @@
     dstStopMonth   = Date::mois_Mars;
     dstOffset      = 1;
-  } else THROW(parmErr);
+  } else throw ParmError("TimeZone::SetZone() ");
 }
 
@@ -104 +102 @@
 {
   Date dt = date;
-  if (dt.MM < 0 || dt.JJ < 0) THROW(inconsistentErr)
+  if (dt.MM < 0 || dt.JJ < 0) throw ParmError(PExcLongMessage(""));
   if (dt.hh >= 0) dt += gmtOffset/24.0; // date "fictive" en local d'hiver
   else dt.ss = dt.hh = dt.mm = 0;       // minuit local si heure indeterminee
@@ -185 +183 @@
 //--
 {
-  if (mois<1 || mois>12) THROW(inconsistentErr);
+  if (mois<1 || mois>12) throw ParmError(PExcLongMessage(""));
   
   switch(mois) {
@@ -265 +263 @@
 //--
 {
-   if (UndetTime() && !AllUndetTime()) THROW(inconsistentErr);
-   if (UndetDate() && !AllUndetDate()) THROW(inconsistentErr);
+   if (UndetTime() && !AllUndetTime()) throw ParmError(PExcLongMessage(""));
+   if (UndetDate() && !AllUndetDate()) throw ParmError(PExcLongMessage(""));
    double t=0;
    if (!UndetDate()) {
@@ -341 +339 @@
   ss = TM->tm_sec;
   nuit = 0;
-  END_CONSTRUCTOR
 }
 
@@ -351 +348 @@
 : JJ(J), MM(M), AA(A), hh(h), mm(m), ss(s), timeZone(gTimeZone), nuit(0)
 {
-  END_CONSTRUCTOR
 }
 
@@ -364 +360 @@
 {
   Set(t);
-  END_CONSTRUCTOR
 }
 
@@ -388 +383 @@
 {
   Set(date,heure,tOpt);
-  END_CONSTRUCTOR
 }
 
@@ -403 +397 @@
 {
   Set(date,heure,tOpt);
-  END_CONSTRUCTOR
 }
 
@@ -435 +428 @@
     if (p[0] == '?' && (p[1] == '?' || p[1] == '/'))   JJ = -1;
     else {
-      if (!isdigit(p[0])) THROW(inconsistentErr);
-      if (!isdigit(p[1]) && p[1] != '/') THROW(inconsistentErr);
+      if (!isdigit(p[0])) ParmError(PExcLongMessage(""));
+      if (!isdigit(p[1]) && p[1] != '/') ParmError(PExcLongMessage(""));
       JJ = atoi(p);
-      if (JJ <= 0) THROW(inconsistentErr);
+      if (JJ <= 0) ParmError(PExcLongMessage(""));
     }
     
     if (p[1] == '/') p += 2;
     else if (p[2] == '/') p+= 3;
-    else THROW(inconsistentErr);
+    else ParmError(PExcLongMessage(""));
 
     if (p[0] == '?' && (p[1] == '?' || p[1] == '/'))   MM = -1;
     else {
-      if (!isdigit(p[0])) THROW(inconsistentErr);
-      if (!isdigit(p[1]) && p[1] != '/') THROW(inconsistentErr);
+      if (!isdigit(p[0])) ParmError(PExcLongMessage(""));
+      if (!isdigit(p[1]) && p[1] != '/') ParmError(PExcLongMessage(""));
       MM = atoi(p);
-      if (MM <= 0 || MM >12) THROW(inconsistentErr);
+      if (MM <= 0 || MM >12) ParmError(PExcLongMessage(""));
     }
 
     if (p[1] == '/') p += 2;
     else if (p[2] == '/') p+= 3;
-    else THROW(inconsistentErr);
+    else ParmError(PExcLongMessage(""));
 
     if (p[0] == '?')  AA = -1;
     else {
-      if (!isdigit(p[0])) THROW(inconsistentErr);
-      if (!isdigit(p[1])) THROW(inconsistentErr);
+      if (!isdigit(p[0])) ParmError(PExcLongMessage(""));
+      if (!isdigit(p[1])) ParmError(PExcLongMessage(""));
       AA = atoi(p);
       if (AA < 100 && AA >= 0 && date[6] != '0') AA += 1900;
     }
     
-    if (AA > 0 && MM > 0 && JJ > 0 && JJ > MonthDays(MM,AA)) THROW(inconsistentErr);
+    if (AA > 0 && MM > 0 && JJ > 0 && JJ > MonthDays(MM,AA)) ParmError(PExcLongMessage(""));
     
    } else if (strlen(date)==4) {      // Code EROS de date
      if (date[0] == '?') AA = -1;
      else {
-       if (!isdigit(date[0])) THROW(inconsistentErr);
+       if (!isdigit(date[0])) ParmError(PExcLongMessage(""));
        AA = 1990 + date[0] - '0';
      }
@@ -476 +469 @@
      if (date[1] == '?') MM = -1;
      else {
-       if (!isalpha(date[1])) THROW(inconsistentErr);
+       if (!isalpha(date[1])) ParmError(PExcLongMessage(""));
        if (islower(date[1]))
          MM = date[1] - 'a' + 1;
        else
          MM = date[1] - 'A' + 1;
-       if (MM<1 || MM>12) THROW(inconsistentErr);
+       if (MM<1 || MM>12) ParmError(PExcLongMessage(""));
      }
      
      if (date[2] == '?' && date[3] == '?') JJ = -1;
      else {
-       if (!isdigit(date[2])) THROW(inconsistentErr);
-       if (!isdigit(date[3])) THROW(inconsistentErr);
+       if (!isdigit(date[2])) ParmError(PExcLongMessage(""));
+       if (!isdigit(date[3])) ParmError(PExcLongMessage(""));
        JJ = atoi(date+2);
      }
      
-     if (AA > 0 && MM > 0 && JJ > 0 && JJ > MonthDays(MM,AA)) THROW(inconsistentErr);
+     if (AA > 0 && MM > 0 && JJ > 0 && JJ > MonthDays(MM,AA)) ParmError(PExcLongMessage(""));
      nuit = 1;
-   } else THROW(inconsistentErr);   // Mauvaise longueur
+   } else ParmError(PExcLongMessage(""));   // Mauvaise longueur
   } else {                          // Pas de date
     JJ = MM = AA = -1;
@@ -502 +495 @@
     if (p[0] == '?' && (p[1] == '?' || p[1] == ':'))   hh = -1;
     else {
-      if (!isdigit(p[0])) THROW(inconsistentErr);
-      if (!isdigit(p[1]) && p[1] != ':') THROW(inconsistentErr);
+      if (!isdigit(p[0])) ParmError(PExcLongMessage(""));
+      if (!isdigit(p[1]) && p[1] != ':') ParmError(PExcLongMessage(""));
       hh = atoi(p);
     }
@@ -509 +502 @@
     if (p[1] == ':') p += 2;
     else if (p[2] == ':') p+= 3;
-    else THROW(inconsistentErr);
+    else ParmError(PExcLongMessage(""));
 
     if (p[0] == '?' && (p[1] == '?' || p[1] == ':'))   mm = -1;
     else {
-      if (!isdigit(p[0])) THROW(inconsistentErr);
-      if (!isdigit(p[1]) && p[1] != '/') THROW(inconsistentErr);
+      if (!isdigit(p[0])) ParmError(PExcLongMessage(""));
+      if (!isdigit(p[1]) && p[1] != '/') ParmError(PExcLongMessage(""));
       mm = atoi(p);
     }
@@ -520 +513 @@
     if (p[1] == ':') p += 2;
     else if (p[2] == ':') p+= 3;
-    else THROW(inconsistentErr);
+    else ParmError(PExcLongMessage(""));
 
     if (p[0] == '?')   ss = -1;
     else {
-      if (!isdigit(p[0])) THROW(inconsistentErr);
+      if (!isdigit(p[0])) ParmError(PExcLongMessage(""));
       ss = atoi(p);
     }
@@ -585 +578 @@
 
   if (dt.AA != -1) {
-    if (dt.AA < 1990 || dt.AA > 2016) THROW(inconsistentErr);
+    if (dt.AA < 1990 || dt.AA > 2016) ParmError(PExcLongMessage(""));
     int i = dt.AA - 1990;
     if (i<10)
@@ -771 +764 @@
 //--
 {
-  if (a.UndetTime() != b.UndetTime()) THROW(inconsistentErr);
-  if (a.UndetDate() != b.UndetDate()) THROW(inconsistentErr);
+  if (a.UndetTime() != b.UndetTime()) ParmError(PExcLongMessage(""));
+  if (a.UndetDate() != b.UndetDate()) ParmError(PExcLongMessage(""));
   return a.GetDays() - b.GetDays();
 }