mirror of
https://gitlab.com/freepascal.org/fpc/pas2js.git
synced 2025-08-28 21:40:15 +02:00
* Get rid of warnings
This commit is contained in:
parent
378fedc319
commit
3f4c2c9252
@ -2136,12 +2136,12 @@ Var
|
|||||||
begin
|
begin
|
||||||
DecodeDateTime(ABasedate,Y,M,D,H,N,S,MS);
|
DecodeDateTime(ABasedate,Y,M,D,H,N,S,MS);
|
||||||
Msg:=DoField(AYear,Y,'????');
|
Msg:=DoField(AYear,Y,'????');
|
||||||
Msg:=Msg+DateSeparator+DoField(AMonth,M,'??');
|
Msg:=Msg+FormatSettings.DateSeparator+DoField(AMonth,M,'??');
|
||||||
Msg:=Msg+DateSeparator+DoField(ADay,D,'??');
|
Msg:=Msg+FormatSettings.DateSeparator+DoField(ADay,D,'??');
|
||||||
Msg:=Msg+' '+DoField(AHour,H,'??');
|
Msg:=Msg+' '+DoField(AHour,H,'??');
|
||||||
Msg:=Msg+TimeSeparator+DoField(AMinute,N,'??');
|
Msg:=Msg+FormatSettings.TimeSeparator+DoField(AMinute,N,'??');
|
||||||
Msg:=Msg+TimeSeparator+Dofield(ASecond,S,'??');
|
Msg:=Msg+FormatSettings.TimeSeparator+Dofield(ASecond,S,'??');
|
||||||
Msg:=Msg+DecimalSeparator+DoField(AMilliSecond,MS,'???');
|
Msg:=Msg+FormatSettings.DecimalSeparator+DoField(AMilliSecond,MS,'???');
|
||||||
Raise EConvertError.CreateFmt(SErrInvalidTimeStamp,[Msg]);
|
Raise EConvertError.CreateFmt(SErrInvalidTimeStamp,[Msg]);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -2624,10 +2624,10 @@ begin
|
|||||||
i:=ScanPatternLength;
|
i:=ScanPatternLength;
|
||||||
case i of
|
case i of
|
||||||
1,2 : FD:=scanfixedint(2);
|
1,2 : FD:=scanfixedint(2);
|
||||||
3 : FD:=findmatch(shortDayNames);
|
3 : FD:=findmatch(FormatSettings.shortDayNames);
|
||||||
4 : FD:=findmatch(longDayNames);
|
4 : FD:=findmatch(FormatSettings.longDayNames);
|
||||||
5 : matchpattern(shortdateformat);
|
5 : matchpattern(FormatSettings.shortdateformat);
|
||||||
6 : matchpattern(longdateformat);
|
6 : matchpattern(FormatSettings.longdateformat);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -2658,8 +2658,8 @@ begin
|
|||||||
I:=ScanPatternLength;
|
I:=ScanPatternLength;
|
||||||
case i of
|
case i of
|
||||||
1,2: FM:=scanfixedint(2);
|
1,2: FM:=scanfixedint(2);
|
||||||
3: FM:=findmatch(ShortMonthNames);
|
3: FM:=findmatch(FormatSettings.ShortMonthNames);
|
||||||
4: FM:=findmatch(LongMonthNames);
|
4: FM:=findmatch(FormatSettings.LongMonthNames);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -2671,17 +2671,17 @@ Var
|
|||||||
begin
|
begin
|
||||||
i:=ScanPatternLength;
|
i:=ScanPatternLength;
|
||||||
case i of
|
case i of
|
||||||
1: matchpattern(ShortTimeFormat);
|
1: matchpattern(FormatSettings.ShortTimeFormat);
|
||||||
2: matchpattern(LongTimeFormat);
|
2: matchpattern(FormatSettings.LongTimeFormat);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TDateTimeScanner.DoDateTime;
|
procedure TDateTimeScanner.DoDateTime;
|
||||||
|
|
||||||
begin
|
begin
|
||||||
MatchPattern(ShortDateFormat);
|
MatchPattern(FormatSettings.ShortDateFormat);
|
||||||
MatchPattern(#9);
|
MatchPattern(#9);
|
||||||
MatchPattern(LongTimeFormat);
|
MatchPattern(FormatSettings.LongTimeFormat);
|
||||||
inc(FPatternPos);
|
inc(FPatternPos);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -2718,12 +2718,12 @@ begin
|
|||||||
end;
|
end;
|
||||||
2:
|
2:
|
||||||
begin
|
begin
|
||||||
i:=FindIMatch([timeamstring,timepmstring],Copy(FText,FPos,5));
|
i:=FindIMatch([FormatSettings.TimeAMString,FormatSettings.TimePMString],Copy(FText,FPos,5));
|
||||||
case i of
|
case i of
|
||||||
0: inc(FPos,length(timeamstring));
|
0: inc(FPos,length(FormatSettings.TimeAMString));
|
||||||
1: begin
|
1: begin
|
||||||
FTimeval:=FTimeval+12*hrfactor;
|
FTimeval:=FTimeval+12*hrfactor;
|
||||||
inc(FPos,length(timepmstring));
|
inc(FPos,length(FormatSettings.TimePMString));
|
||||||
end;
|
end;
|
||||||
else
|
else
|
||||||
arraymatcherror
|
arraymatcherror
|
||||||
@ -2786,9 +2786,9 @@ begin
|
|||||||
'S': FTimeval:=FTimeval+scanfixedint(2)* secfactor;
|
'S': FTimeval:=FTimeval+scanfixedint(2)* secfactor;
|
||||||
'Z': FTimeval:=FTimeval+scanfixedint(3)* mssecfactor;
|
'Z': FTimeval:=FTimeval+scanfixedint(3)* mssecfactor;
|
||||||
'A': DoAMPM;
|
'A': DoAMPM;
|
||||||
'/': MatchChar(DateSeparator);
|
'/': MatchChar(FormatSettings.DateSeparator);
|
||||||
':': begin
|
':': begin
|
||||||
MatchChar(TimeSeparator);
|
MatchChar(FormatSettings.TimeSeparator);
|
||||||
lch:=lasttoken;
|
lch:=lasttoken;
|
||||||
end;
|
end;
|
||||||
#39,'"' :
|
#39,'"' :
|
||||||
|
Loading…
Reference in New Issue
Block a user