paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 14:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support for ansistring and better debug outpu

Browse Source
This commit is contained in:
michael 2003-11-04 23:15:58 +00:00
parent 1ebc8d1195
commit 7312e7e4e4
1 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
rtl/objpas/cvarutil.inc
View File

@ -425,12 +425,46 @@ end;
Function VariantToAnsiString(Const VargSrc : TVarData) : AnsiString; Function VariantToAnsiString(Const VargSrc : TVarData) : AnsiString;
Const
BS : Array[Boolean] of AnsiString = ('False','True');
begin begin
Try
With VargSrc do
Case (VType and VarTypeMask) of
VarSmallInt : Result:=IntTostr(VSmallint);
VarShortInt : Result:=IntToStr(VShortInt);
VarInteger : Result:=IntToStr(VInteger);
VarSingle : Result:=FloatToStr(VSingle);
VarDouble : Result:=FloatToStr(VDouble);
VarCurrency : Result:=FloatToStr(VCurrency);
VarDate : Result:=DateTimeToStr(VDate);
VarOleStr : Result:=WideCharToString(VOleStr);
VarBoolean : Result:=BS[VBoolean];
VarByte : Result:=IntToStr(VByte);
VarWord : Result:=IntToStr(VWord);
VarLongWord : Result:=IntToStr(VLongWord);
VarInt64 : Result:=IntToStr(VInt64);
VarQword : Result:=IntToStr(VQWord);
else
VariantTypeMismatch;
end;
except
On EConvertError do
VariantTypeMismatch;
else
Raise;
end;
end; end;
Function VariantToShortString(Const VargSrc : TVarData) : ShortString; Function VariantToShortString(Const VargSrc : TVarData) : ShortString;
Var
S : AnsiString;
begin begin
S:=VariantToAnsiString(VArgSrc);
Result:=S;
end; end;
{ --------------------------------------------------------------------- { ---------------------------------------------------------------------
@ -495,6 +529,9 @@ Const
Procedure DumpVariant(Var F : Text; Const VArgSrc : TVarData); Procedure DumpVariant(Var F : Text; Const VArgSrc : TVarData);
Var
W : WideString;
begin begin
If VArgSrc.vType in [varEmpty..varqword] then If VArgSrc.vType in [varEmpty..varqword] then
Writeln(F,'Variant has type : ',VarTypeStrings[VArgSrc.vType]) Writeln(F,'Variant has type : ',VarTypeStrings[VArgSrc.vType])
@ -525,7 +562,10 @@ begin
vardouble : Write(F,vdouble); vardouble : Write(F,vdouble);
varcurrency : Write(F,vcurrency) ; varcurrency : Write(F,vcurrency) ;
vardate : Write(F,vdate) ; vardate : Write(F,vdate) ;
varolestr : Write(F,Pchar(vOleStr)) ; varolestr : begin
W:=vOleStr;
Write(F,W) ;
end;
vardispatch : Write(F,'Not suppordted') ; vardispatch : Write(F,'Not suppordted') ;
varerror : Write(F,'Error') ; varerror : Write(F,'Error') ;
varboolean : Write(F,vboolean) ; varboolean : Write(F,vboolean) ;
@ -547,7 +587,10 @@ end;
{ {
$Log$ $Log$
Revision 1.9 2003-11-04 22:53:55 michael Revision 1.10 2003-11-04 23:15:58 michael
Support for ansistring and better debug outpu
Revision 1.9 2003/11/04 22:53:55 michael
+ Removed debug statements + Removed debug statements
Revision 1.8 2003/11/04 22:27:43 michael Revision 1.8 2003/11/04 22:27:43 michael