|
@@ -682,12 +682,10 @@ begin
|
|
end ;
|
|
end ;
|
|
|
|
|
|
|
|
|
|
-{$IFNDEF VIRTUALPASCAL}
|
|
|
|
function IntToStr(Value: int64): string;
|
|
function IntToStr(Value: int64): string;
|
|
begin
|
|
begin
|
|
System.Str(Value, result);
|
|
System.Str(Value, result);
|
|
end ;
|
|
end ;
|
|
-{$ENDIF}
|
|
|
|
|
|
|
|
function IntToStr(Value: QWord): string;
|
|
function IntToStr(Value: QWord): string;
|
|
begin
|
|
begin
|
|
@@ -715,7 +713,6 @@ begin
|
|
end;
|
|
end;
|
|
end ;
|
|
end ;
|
|
|
|
|
|
-{$IFNDEF VIRTUALPASCAL} // overloading
|
|
|
|
function IntToHex(Value: int64; Digits: integer): string;
|
|
function IntToHex(Value: int64; Digits: integer): string;
|
|
var i: integer;
|
|
var i: integer;
|
|
begin
|
|
begin
|
|
@@ -730,7 +727,6 @@ begin
|
|
value := value shr 4;
|
|
value := value shr 4;
|
|
end;
|
|
end;
|
|
end ;
|
|
end ;
|
|
-{$ENDIF}
|
|
|
|
|
|
|
|
|
|
|
|
function TryStrToInt(const s: string; var i : integer) : boolean;
|
|
function TryStrToInt(const s: string; var i : integer) : boolean;
|
|
@@ -744,11 +740,7 @@ end;
|
|
if S does not represent a valid integer value EConvertError is raised }
|
|
if S does not represent a valid integer value EConvertError is raised }
|
|
|
|
|
|
function StrToInt(const S: string): integer;
|
|
function StrToInt(const S: string): integer;
|
|
-{$IFDEF VIRTUALPASCAL}
|
|
|
|
-var Error: longint;
|
|
|
|
-{$ELSE}
|
|
|
|
var Error: word;
|
|
var Error: word;
|
|
-{$ENDIF}
|
|
|
|
begin
|
|
begin
|
|
Val(S, result, Error);
|
|
Val(S, result, Error);
|
|
if Error <> 0 then raise EConvertError.createfmt(SInValidInteger,[S]);
|
|
if Error <> 0 then raise EConvertError.createfmt(SInValidInteger,[S]);
|
|
@@ -756,11 +748,7 @@ end ;
|
|
|
|
|
|
|
|
|
|
function StrToInt64(const S: string): int64;
|
|
function StrToInt64(const S: string): int64;
|
|
-{$IFDEF VIRTUALPASCAL}
|
|
|
|
-var Error: longint;
|
|
|
|
-{$ELSE}
|
|
|
|
var Error: word;
|
|
var Error: word;
|
|
-{$ENDIF}
|
|
|
|
|
|
|
|
begin
|
|
begin
|
|
Val(S, result, Error);
|
|
Val(S, result, Error);
|
|
@@ -781,11 +769,7 @@ end;
|
|
Default is returned in case S does not represent a valid integer value }
|
|
Default is returned in case S does not represent a valid integer value }
|
|
|
|
|
|
function StrToIntDef(const S: string; Default: integer): integer;
|
|
function StrToIntDef(const S: string; Default: integer): integer;
|
|
-{$IFDEF VIRTUALPASCAL}
|
|
|
|
-var Error: longint;
|
|
|
|
-{$ELSE}
|
|
|
|
var Error: word;
|
|
var Error: word;
|
|
-{$ENDIF}
|
|
|
|
begin
|
|
begin
|
|
Val(S, result, Error);
|
|
Val(S, result, Error);
|
|
if Error <> 0 then result := Default;
|
|
if Error <> 0 then result := Default;
|
|
@@ -795,11 +779,7 @@ end ;
|
|
Default is returned in case S does not represent a valid integer value }
|
|
Default is returned in case S does not represent a valid integer value }
|
|
|
|
|
|
function StrToInt64Def(const S: string; Default: int64): int64;
|
|
function StrToInt64Def(const S: string; Default: int64): int64;
|
|
-{$IFDEF VIRTUALPASCAL}
|
|
|
|
-var Error: longint;
|
|
|
|
-{$ELSE}
|
|
|
|
var Error: word;
|
|
var Error: word;
|
|
-{$ENDIF}
|
|
|
|
begin
|
|
begin
|
|
Val(S, result, Error);
|
|
Val(S, result, Error);
|
|
if Error <> 0 then result := Default;
|
|
if Error <> 0 then result := Default;
|
|
@@ -1197,11 +1177,7 @@ function StrToBool(const S: string): Boolean;
|
|
Var
|
|
Var
|
|
Temp : String;
|
|
Temp : String;
|
|
D : Double;
|
|
D : Double;
|
|
-{$IFDEF VIRTUALPASCAL}
|
|
|
|
- Code: longint;
|
|
|
|
-{$ELSE}
|
|
|
|
Code: word;
|
|
Code: word;
|
|
-{$ENDIF}
|
|
|
|
|
|
|
|
begin
|
|
begin
|
|
Temp:=upcase(S);
|
|
Temp:=upcase(S);
|