|
@@ -244,7 +244,8 @@ type
|
|
function AsInterface: IInterface;
|
|
function AsInterface: IInterface;
|
|
function AsPointer : Pointer;
|
|
function AsPointer : Pointer;
|
|
function AsVariant : Variant;
|
|
function AsVariant : Variant;
|
|
- function ToString: String;
|
|
|
|
|
|
+ function ToString: String; overload;
|
|
|
|
+ function ToString(aSettings: TFormatSettings): String; overload;
|
|
function GetArrayLength: SizeInt;
|
|
function GetArrayLength: SizeInt;
|
|
function GetArrayElement(AIndex: SizeInt): TValue;
|
|
function GetArrayElement(AIndex: SizeInt): TValue;
|
|
procedure SetArrayElement(AIndex: SizeInt; constref AValue: TValue);
|
|
procedure SetArrayElement(AIndex: SizeInt; constref AValue: TValue);
|
|
@@ -4516,6 +4517,13 @@ end;
|
|
|
|
|
|
function TValue.ToString: String;
|
|
function TValue.ToString: String;
|
|
|
|
|
|
|
|
+begin
|
|
|
|
+ Result:=ToString(TFormatSettings.Invariant);
|
|
|
|
+end;
|
|
|
|
+
|
|
|
|
+function TValue.ToString(aSettings : TFormatSettings): String;
|
|
|
|
+
|
|
|
|
+
|
|
function GetArrayElType(ATypeInfo: PTypeInfo): PTypeInfo;
|
|
function GetArrayElType(ATypeInfo: PTypeInfo): PTypeInfo;
|
|
begin
|
|
begin
|
|
case ATypeInfo^.Kind of
|
|
case ATypeInfo^.Kind of
|
|
@@ -4541,10 +4549,7 @@ begin
|
|
tkUString : result := AsUnicodeString;
|
|
tkUString : result := AsUnicodeString;
|
|
tkSString,
|
|
tkSString,
|
|
tkAString : result := AsAnsiString;
|
|
tkAString : result := AsAnsiString;
|
|
- tkFloat : begin
|
|
|
|
- Str(AsDouble:12:4,Result);
|
|
|
|
- Result:=TrimLeft(Result)
|
|
|
|
- end;
|
|
|
|
|
|
+ tkFloat : result := FloatToStr(asDouble,aSettings);
|
|
tkInteger : result := IntToStr(AsInteger);
|
|
tkInteger : result := IntToStr(AsInteger);
|
|
tkQWord : result := IntToStr(AsUInt64);
|
|
tkQWord : result := IntToStr(AsUInt64);
|
|
tkInt64 : result := IntToStr(AsInt64);
|
|
tkInt64 : result := IntToStr(AsInt64);
|