--- Merging r16482 into '.':

U    rtl/objpas/sysutils/sysinth.inc
--- Merging r16744 into '.':
U    rtl/objpas/dateutil.inc
U    rtl/objpas/sysutils/sysstr.inc
U    rtl/objpas/sysutils/dati.inc
U    rtl/objpas/cvarutil.inc
U    rtl/objpas/fmtbcd.pp
--- Merging r16951 into '.':
G    rtl/objpas/fmtbcd.pp
--- Merging r16952 into '.':
G    rtl/objpas/fmtbcd.pp

# revisions: 16482,16744,16951,16952
------------------------------------------------------------------------
r16482 | marco | 2010-11-30 10:49:19 +0100 (Tue, 30 Nov 2010) | 4 lines
Changed paths:
   M /trunk/rtl/objpas/sysutils/sysinth.inc

 * Delphi XE (2010?) compatible alias for defaultformatsettings.
 * deprecated separate globals (Delphi XE). Causes some deprecated
      warnings in dati.inc that still have to be fixed.

------------------------------------------------------------------------
------------------------------------------------------------------------
r16744 | sergei | 2011-01-09 16:27:05 +0100 (Sun, 09 Jan 2011) | 2 lines
Changed paths:
   M /trunk/rtl/objpas/cvarutil.inc
   M /trunk/rtl/objpas/dateutil.inc
   M /trunk/rtl/objpas/fmtbcd.pp
   M /trunk/rtl/objpas/sysutils/dati.inc
   M /trunk/rtl/objpas/sysutils/sysstr.inc

* RTL: Replaced deprecated formatting symbols with their up-to-date counterparts, reduces compiler noise.
* Also removed some unused variables.
------------------------------------------------------------------------
------------------------------------------------------------------------
r16951 | joost | 2011-02-20 18:53:18 +0100 (Sun, 20 Feb 2011) | 1 line
Changed paths:
   M /trunk/rtl/objpas/fmtbcd.pp

 * TryStrToBcd now returns true when it succeeds, and false when it fails, not the other way around
------------------------------------------------------------------------
------------------------------------------------------------------------
r16952 | joost | 2011-02-20 18:59:12 +0100 (Sun, 20 Feb 2011) | 1 line
Changed paths:
   M /trunk/rtl/objpas/fmtbcd.pp

 * Fixed BCDToStr for values between -1 and 0
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@17586 -

rtl/objpas/cvarutil.inc

@@ -386,8 +386,8 @@ var
 begin
   j := 1;
   for i := 1 to Length(s) do
-    if s[i] <> ThousandSeparator then begin
-      if s[i] = DecimalSeparator then
+    if s[i] <> DefaultFormatSettings.ThousandSeparator then begin
+      if s[i] = DefaultFormatSettings.DecimalSeparator then
         s[j] := '.'
       else
         s[j] := s[i];

rtl/objpas/dateutil.inc

@@ -1946,12 +1946,12 @@ Var
 begin
   DecodeDateTime(ABasedate,Y,M,D,H,N,S,MS);
   Msg:=DoField(AYear,Y,'????');
-  Msg:=Msg+DateSeparator+DoField(AMonth,M,'??');
-  Msg:=Msg+DateSeparator+DoField(ADay,D,'??');
+  Msg:=Msg+DefaultFormatSettings.DateSeparator+DoField(AMonth,M,'??');
+  Msg:=Msg+DefaultFormatSettings.DateSeparator+DoField(ADay,D,'??');
   Msg:=Msg+' '+DoField(AHour,H,'??');
-  Msg:=Msg+TimeSeparator+DoField(AMinute,N,'??');
-  Msg:=Msg+TimeSeparator+Dofield(ASecond,S,'??');
-  Msg:=Msg+DecimalSeparator+DoField(AMilliSecond,MS,'???');
+  Msg:=Msg+DefaultFormatSettings.TimeSeparator+DoField(AMinute,N,'??');
+  Msg:=Msg+DefaultFormatSettings.TimeSeparator+Dofield(ASecond,S,'??');
+  Msg:=Msg+DefaultFormatSettings.DecimalSeparator+DoField(AMilliSecond,MS,'???');
   Raise EConvertError.CreateFmt(SErrInvalidTimeStamp,[Msg]);
 end;
 

rtl/objpas/fmtbcd.pp

@@ -1216,8 +1216,8 @@ IMPLEMENTATION
                                 end;
 { find out language-specific ? }
         DecimalPoint_is_System: begin
-                                 dp := DecimalSeparator;
-                                 dc := ThousandSeparator;
+                                 dp := DefaultFormatSettings.DecimalSeparator;
+                                 dc := DefaultFormatSettings.ThousandSeparator;
                                 end;
        end;
      end;
@@ -1417,7 +1417,7 @@ IMPLEMENTATION
                end;
 
     begin
-      result := False;
+      result := True;
       FillChar ( lvars, SizeOf ( lvars ), #0 );
       BCD := NullBCD;
       lav := Length ( aValue );
@@ -1468,31 +1468,31 @@ IMPLEMENTATION
                         '.': if ch = dp
                                then begin
                                  if inife <> inint
-                                   then result := True
+                                   then result := False
                                    else inife := infrac;
                                 end;
                         'e',
                         'E': if inife = inexp
-                               then result := True
+                               then result := False
                                else inife := inexp;
                         '+',
                         '-': if ( inife = inexp ) AND ( fp[inexp] = 0 )
                                then pse := i
-                               else result := True;
+                               else result := False;
                         else begin
-                          result := True;
+                          result := False;
                           errp := i;
                          end;
                        end;
                      end;
-                  if result
+                  if not result
                     then begin
-                      result := False;
+                      result := True;
                       for i := errp TO lav do
                         if aValue[i] <> ' '
-                          then result := True;
+                          then result := False;
                      end;
-                  if result
+                  if not result
                     then EXIT;
 
                   if ps <> 0
@@ -1503,15 +1503,15 @@ IMPLEMENTATION
                     then begin
                       exp := 0;
                       for i := fp[inexp] TO lp[inexp] do
-                        if NOT result
+                        if result
                           then
                             if aValue[i] <> dc
                               then begin
                                 exp := exp * 10 + ( Ord ( aValue[i] ) - Ord ( '0' ) );
                                 if exp > 999
-                                  then result := True;
+                                  then result := False;
                                end;
-                      if result
+                      if not result
                         then EXIT;
 
                       if pse <> 0
@@ -1545,16 +1545,16 @@ IMPLEMENTATION
                                 Dec ( p );
                                 Singles[p] := Ord ( aValue[i] ) - Ord ( '0' );
                                end
-                              else result := True;
+                              else result := False;
                            end;
-                  if result
+                  if not result
                     then EXIT;
 
                   FDig := p;
                   if LDig < 0
                     then LDig := 0;
                   Plac := LDig;
-                  result := NOT pack_BCD ( bh, BCD );
+                  result := pack_BCD ( bh, BCD );
                  end;
              end;
      end;
@@ -1565,7 +1565,7 @@ IMPLEMENTATION
       BCD : tBCD;
 
     begin
-      if TryStrToBCD ( aValue, BCD )
+      if not TryStrToBCD ( aValue, BCD )
         then begin
           RAISE eBCDOverflowException.create ( 'in StrToBCD' );
          end
@@ -1727,7 +1727,10 @@ IMPLEMENTATION
             then begin
 {$ifndef use_ansistring}
               Inc ( l );
-              result[1] := '0';
+              if Neg then
+                result[2] := '0'
+              else
+                result[1] := '0'
 {$else}
               result := result + '0';
 {$endif}

rtl/objpas/sysutils/dati.inc

@@ -510,22 +510,22 @@ end;
 
 function StrToDate(const S: ShortString; separator : char): TDateTime;
 begin
-    result := StrToDate(@S[1],Length(s),ShortDateFormat,separator)
+    result := StrToDate(@S[1],Length(s),DefaultFormatSettings.ShortDateFormat,separator)
 end;
 
 function StrToDate(const S: ShortString): TDateTime;
 begin
-    result := StrToDate(@S[1],Length(s),ShortDateFormat,#0);
+    result := StrToDate(@S[1],Length(s),DefaultFormatSettings.ShortDateFormat,#0);
 end;
 
 function StrToDate(const S: AnsiString; separator : char): TDateTime;
 begin
-    result := StrToDate(@S[1],Length(s),ShortDateFormat,separator)
+    result := StrToDate(@S[1],Length(s),DefaultFormatSettings.ShortDateFormat,separator)
 end;
 
 function StrToDate(const S: AnsiString): TDateTime;
 begin
-    result := StrToDate(@S[1],Length(s),ShortDateFormat,#0);
+    result := StrToDate(@S[1],Length(s),DefaultFormatSettings.ShortDateFormat,#0);
 end;
 
 {   StrToTime converts the string S to a TDateTime value
@@ -736,7 +736,7 @@ function StrToDateTime(const s: string): TDateTime;
 var
   I: integer;
 begin
-  I:=Pos(TimeSeparator,S);
+  I:=Pos(DefaultFormatSettings.TimeSeparator,S);
   If (I>0) then
     begin
     While (I>0) and (S[I]<>' ') do
@@ -754,7 +754,7 @@ function StrToDateTime(const s: AnsiString; const UseFormat : TFormatSettings):
 var
   I: integer;
 begin
-  I:=Pos(TimeSeparator,S);
+  I:=Pos(UseFormat.TimeSeparator,S);
   If (I>0) then
     begin
     While (I>0) and (S[I]<>' ') do
@@ -773,7 +773,7 @@ function StrToDateTime(const s: ShortString; const UseFormat : TFormatSettings):
 var
   I: integer;
 begin
-  I:=Pos(TimeSeparator,S);
+  I:=Pos(UseFormat.TimeSeparator,S);
   If (I>0) then
     begin
     While (I>0) and (S[I]<>' ') do
@@ -1196,19 +1196,19 @@ end;
 
 function TryStrToDate(const S: ShortString; out Value: TDateTime; separator : char): Boolean;
 begin
-  Result:=TryStrToDate(S,Value,ShortDateFormat,Separator);
+  Result:=TryStrToDate(S,Value,DefaultFormatSettings.ShortDateFormat,Separator);
 end;
 
 
 function TryStrToDate(const S: AnsiString; out Value: TDateTime): Boolean;
 begin
-  Result:=TryStrToDate(S,Value,ShortDateFormat,#0);
+  Result:=TryStrToDate(S,Value,DefaultFormatSettings.ShortDateFormat,#0);
 end;
 
 function TryStrToDate(const S: AnsiString; out Value: TDateTime; separator : char): Boolean;
 
 begin
-  Result:=TryStrToDate(S,Value,ShortDateFormat,Separator);
+  Result:=TryStrToDate(S,Value,DefaultFormatSettings.ShortDateFormat,Separator);
 end;
 
 function TryStrToDate(const S: string; out Value: TDateTime; const FormatSettings: TFormatSettings): Boolean;

rtl/objpas/sysutils/sysinth.inc

@@ -78,6 +78,8 @@ var
     LongDayNames:  ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
     TwoDigitYearCenturyWindow: 50;
   );
+
+  FormatSettings : TFormatSettings absolute DefaultFormatSettings;
 { ---------------------------------------------------------------------
     Date formatting settings
   ---------------------------------------------------------------------}
@@ -85,41 +87,41 @@ var
 Var
 
    { Character to be put between date, month and year }
-   DateSeparator: char absolute DefaultFormatSettings.DateSeparator;
+   DateSeparator: char absolute DefaultFormatSettings.DateSeparator deprecated;
 
    { Format used for short date notation }
-   ShortDateFormat: string absolute DefaultFormatSettings.ShortDateFormat;
+   ShortDateFormat: string absolute DefaultFormatSettings.ShortDateFormat deprecated;
 
    { Format used for long date notation }
-   LongDateFormat: string absolute DefaultFormatSettings.LongDateFormat;
+   LongDateFormat: string absolute DefaultFormatSettings.LongDateFormat deprecated;
 
 
    { Short names of months. }
-   ShortMonthNames: TMonthNameArray absolute DefaultFormatSettings.ShortMonthNames;
+   ShortMonthNames: TMonthNameArray absolute DefaultFormatSettings.ShortMonthNames deprecated;
 
    { Long names of months. }
-   LongMonthNames: TMonthNameArray absolute DefaultFormatSettings.LongMonthNames;
+   LongMonthNames: TMonthNameArray absolute DefaultFormatSettings.LongMonthNames deprecated;
 
    { Short names of days }
-   ShortDayNames: TWeekNameArray absolute DefaultFormatSettings.ShortDayNames;
+   ShortDayNames: TWeekNameArray absolute DefaultFormatSettings.ShortDayNames deprecated;
 
    { Full names of days }
-   LongDayNames: TWeekNameArray absolute DefaultFormatSettings.LongDayNames;
+   LongDayNames: TWeekNameArray absolute DefaultFormatSettings.LongDayNames deprecated;
 
    { Format used for short time notation }
-   ShortTimeFormat: string absolute DefaultFormatSettings.ShortTimeFormat;
+   ShortTimeFormat: string absolute DefaultFormatSettings.ShortTimeFormat deprecated;
 
    { Format used for long time notation }
-   LongTimeFormat: string absolute DefaultFormatSettings.LongTimeFormat;
+   LongTimeFormat: string absolute DefaultFormatSettings.LongTimeFormat deprecated;
 
    { Character to be put between hours and minutes }
-   TimeSeparator: char absolute DefaultFormatSettings.TimeSeparator;
+   TimeSeparator: char absolute DefaultFormatSettings.TimeSeparator deprecated;
 
    { String to indicate AM time when using 12 hour clock. }
-   TimeAMString: string absolute DefaultFormatSettings.TimeAMString;
+   TimeAMString: string absolute DefaultFormatSettings.TimeAMString deprecated;
 
    { String to indicate PM time when using 12 hour clock. }
-   TimePMString: string absolute DefaultFormatSettings.TimePMString;
+   TimePMString: string absolute DefaultFormatSettings.TimePMString deprecated;
 
 
 
@@ -129,13 +131,13 @@ Var
 
 
   { Character that comes between integer and fractional part of a number }
-  DecimalSeparator : Char absolute DefaultFormatSettings.DecimalSeparator; 
+  DecimalSeparator : Char absolute DefaultFormatSettings.DecimalSeparator deprecated;
 
   { Character that is put every 3 numbers in a currency }
-  ThousandSeparator : Char absolute DefaultFormatSettings.ThousandSeparator;
+  ThousandSeparator : Char absolute DefaultFormatSettings.ThousandSeparator deprecated;
 
   { Number of decimals to use when formatting a currency.  }
-  CurrencyDecimals : Byte absolute DefaultFormatSettings.CurrencyDecimals;
+  CurrencyDecimals : Byte absolute DefaultFormatSettings.CurrencyDecimals deprecated;
 
   { Format to use when formatting currency :
     0 = $1
@@ -144,7 +146,7 @@ Var
     3 = 1 $
     4 = Currency string replaces decimal indicator. e.g. 1$50
    }
-  CurrencyFormat : Byte absolute DefaultFormatSettings.CurrencyFormat;
+  CurrencyFormat : Byte absolute DefaultFormatSettings.CurrencyFormat deprecated;
 
   { Same as above, only for negative currencies:
     0 = ($1)
@@ -159,12 +161,12 @@ Var
     9 = -$ 1
     10 = $ 1-
    }
-  NegCurrFormat : Byte absolute DefaultFormatSettings.NegCurrFormat;
+  NegCurrFormat : Byte absolute DefaultFormatSettings.NegCurrFormat deprecated;
 
   { Currency notation. Default is $ for dollars. }
-  CurrencyString : String absolute DefaultFormatSettings.CurrencyString;
+  CurrencyString : String absolute DefaultFormatSettings.CurrencyString deprecated;
 
-  ListSeparator: Char absolute DefaultFormatSettings.ListSeparator;
+  ListSeparator: Char absolute DefaultFormatSettings.ListSeparator deprecated;
 
 type
   TSysLocale = record

rtl/objpas/sysutils/sysstr.inc

@@ -1169,9 +1169,7 @@ Var
   // removes negative sign in case when result is zero eg. -0.00
   var
     i: PtrInt;
-    S: String;
     TS: Char;
-    B: Boolean;
     StartPos: PtrInt;
   begin
     Result := False;
@@ -1180,7 +1178,6 @@ Var
     else
       StartPos := 2;
     TS := FormatSettings.ThousandSeparator;
-    S := '';
     for i := StartPos to length(AValue) do
     begin
       Result := (AValue[i] in ['0', DS, 'E', '+', TS]);
@@ -1430,7 +1427,7 @@ Begin
         End
         Else
         Begin
-          Case NegCurrFormat Of
+          Case FormatSettings.NegCurrFormat Of
             0: Result := '(' + FormatSettings.CurrencyString + Result + ')';
             1: Result := '-' + FormatSettings.CurrencyString + Result;
             2: Result := FormatSettings.CurrencyString + '-' + Result;
@@ -2899,7 +2896,7 @@ function sscanf(const s: string; const fmt : string;const Pointers : array of Po
       while (Length(s) > n) and (s[n] = ' ')  do
         inc(n);
       while (Length(s) >= n) and
-            (s[n] in ['0'..'9', '+', '-', DecimalSeparator, 'e', 'E']) do
+            (s[n] in ['0'..'9', '+', '-', FormatSettings.DecimalSeparator, 'e', 'E']) do
         begin
           s1 := s1+s[n];
           inc(n);