paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-01 21:09:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Uncommented some int64 functions, now that int64 support is ok

Browse Source
This commit is contained in:
marco 2000-08-09 07:48:05 +00:00
parent 65e50beb55
commit 91d1665de3
2 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
rtl/objpas/sysstr.inc
View File

@ -519,9 +519,16 @@ end ;
function IntToStr(Value: integer): string;
begin
System.Str(Value, result);
System.Str(Value, result);
end ;
function IntToStr(Value: int64): string;
begin
System.Str(Value, result);
end ;
{ IntToHex returns a string representing the hexadecimal value of Value }
const
@ -530,11 +537,24 @@ const
function IntToHex(Value: integer; Digits: integer): string;
var i: integer;
begin
SetLength(result, digits);
for i := 0 to digits - 1 do begin
SetLength(result, digits);
for i := 0 to digits - 1 do
begin
result[digits - i] := HexDigits[value and 15];
value := value shr 4;
end ;
end ;
end ;
function IntToHex(Value: int64; Digits: integer): string;
var i: integer;
begin
SetLength(result, digits);
for i := 0 to digits - 1 do
begin
result[digits - i] := HexDigits[value and 15];
value := value shr 4;
end ;
end ;
{ StrToInt converts the string S to an integer value,
@ -549,6 +569,17 @@ begin
if Error <> 0 then raise EConvertError.createfmt(SInValidInteger,[S]);
end ;
function StrToInt64(const S: string): int64;
var Error: word;
begin
Val(S, result, Error);
if Error <> 0 then raise EConvertError.createfmt(SInValidInteger,[S]);
end ;
{ StrToIntDef converts the string S to an integer value,
Default is returned in case S does not represent a valid integer value }
@ -559,6 +590,17 @@ Val(S, result, Error);
if Error <> 0 then result := Default;
end ;
{ StrToIntDef converts the string S to an integer value,
Default is returned in case S does not represent a valid integer value }
function StrToInt64Def(const S: string; Default: int64): int64;
var Error: word;
begin
Val(S, result, Error);
if Error <> 0 then result := Default;
end ;
{ LoadStr returns the string resource Ident. }
function LoadStr(Ident: integer): string;
@ -1175,7 +1217,10 @@ const
{
$Log$
Revision 1.2 2000-07-13 11:33:51 michael
Revision 1.3 2000-08-09 07:48:05 marco
* Uncommented some int64 functions, now that int64 support is ok
Revision 1.2 2000/07/13 11:33:51 michael
+ removed logs
}

13
rtl/objpas/sysstrh.inc
View File

@ -65,13 +65,13 @@ function AnsiExtractQuotedStr(Const Src: PChar; Quote: Char): string;
function AdjustLineBreaks(const S: string): string;
function IsValidIdent(const Ident: string): boolean;
function IntToStr(Value: integer): string;
// function IntToStr(Value: Int64): string;
function IntToStr(Value: Int64): string;
function IntToHex(Value: integer; Digits: integer): string;
// function IntToHex(Value: Int64; Digits: integer): string;
function IntToHex(Value: Int64; Digits: integer): string;
function StrToInt(const s: string): integer;
// function StrToInt64(const s: string): int64;
function StrToInt64(const s: string): int64;
function StrToIntDef(const S: string; Default: integer): integer;
// function StrToInt64Def(const S: string; Default: int64): int64;
function StrToInt64Def(const S: string; Default: int64): int64;
function LoadStr(Ident: integer): string;
// function FmtLoadStr(Ident: integer; const Args: array of const): string;
Function Format (Const Fmt : String; const Args : Array of const) : String;
@ -94,7 +94,10 @@ function BCDToInt(Value: integer): integer;
{
$Log$
Revision 1.2 2000-07-13 11:33:51 michael
Revision 1.3 2000-08-09 07:48:05 marco
* Uncommented some int64 functions, now that int64 support is ok
Revision 1.2 2000/07/13 11:33:51 michael
+ removed logs
}