Browse Source

+ Now EConvertError is used everywhere in conversions

michael 26 years ago
parent
commit
e7994c7195
1 changed files with 10 additions and 4 deletions
  1. 10 4
      rtl/objpas/dati.inc

+ 10 - 4
rtl/objpas/dati.inc

@@ -352,7 +352,8 @@ var
          end
          end
       else if (S[Current] = TimeSeparator) or (S[Current] = ' ') then
       else if (S[Current] = TimeSeparator) or (S[Current] = ' ') then
          Inc(Current)
          Inc(Current)
-      else exit; // raise EConvertError.Create();
+      else 
+        raise EConvertError.Create('Invalid Time format');
       end ;
       end ;
    end ;
    end ;
 
 
@@ -488,7 +489,8 @@ var
                   if Hour < 12 then StoreStr('a', 1)
                   if Hour < 12 then StoreStr('a', 1)
                   else StoreStr('p', 1);
                   else StoreStr('p', 1);
                   end
                   end
-               else Raise Exception.Create('Illegal character in format string');
+               else 
+                 Raise EConvertError.Create('Illegal character in format string');
                end ;
                end ;
             '/': StoreStr(@DateSeparator, 1);
             '/': StoreStr(@DateSeparator, 1);
             ':': StoreStr(@TimeSeparator, 1);
             ':': StoreStr(@TimeSeparator, 1);
@@ -548,7 +550,8 @@ var
                      'C': StoreFormat(ShortDateFormat + ' ' + ShortTimeFormat);
                      'C': StoreFormat(ShortDateFormat + ' ' + ShortTimeFormat);
                   end ;
                   end ;
                end ;
                end ;
-            else Raise Exception.Create('Illegal character in format string');
+            else 
+              Raise EConvertError.Create('Illegal character in format string');
          end ;
          end ;
       FormatCurrent := FormatCurrent + Count;
       FormatCurrent := FormatCurrent + Count;
       end ;
       end ;
@@ -603,7 +606,10 @@ end;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.9  1999-04-08 11:31:02  peter
+  Revision 1.10  1999-04-18 19:03:03  michael
+  + Now EConvertError is used everywhere in conversions
+
+  Revision 1.9  1999/04/08 11:31:02  peter
     * removed warnings
     * removed warnings
 
 
   Revision 1.8  1999/02/24 15:56:28  michael
   Revision 1.8  1999/02/24 15:56:28  michael