pascal/simplexml
1
0
Fork 0
mirror of https://github.com/Kirill/simplexml.git synced 2025-07-05 13:48:59 +02:00
Code Issues Releases Activity

Add support for Delphi 7

Browse Source
This commit is contained in:
Kirill Krasnov
2017-08-18 08:04:04 +02:00
parent e101bd63b8
commit 1f37a5f4fd
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
SimpleXML.pas
View File

@ -24,6 +24,13 @@ const
NODE_DOCUMENT_FRAGMENT = $0000000B; NODE_DOCUMENT_FRAGMENT = $0000000B;
NODE_NOTATION = $0000000C; NODE_NOTATION = $0000000C;
{$if CompilerVersion < 20}
type
UnicodeString = WideString;
RawByteString = AnsiString;
PByte = PAnsiChar;
{$ifend}
type type
IXmlDocument = interface; IXmlDocument = interface;
IXmlElement = interface; IXmlElement = interface;
@ -397,7 +404,9 @@ type
const aData: String): IXmlProcessingInstruction; overload; const aData: String): IXmlProcessingInstruction; overload;
procedure LoadXML(const anXml: String); overload; procedure LoadXML(const anXml: String); overload;
{$if CompilerVersion >= 20}
procedure LoadXML(const anXml: RawByteString); overload; procedure LoadXML(const anXml: RawByteString); overload;
{$ifend}
procedure LoadBinaryXML(const anXml: RawByteString); procedure LoadBinaryXML(const anXml: RawByteString);
procedure Load(aStream: TStream); overload; procedure Load(aStream: TStream); overload;
@ -585,11 +594,13 @@ end;
function XSTRToFloat(s: String): Double; function XSTRToFloat(s: String): Double;
var var
aPos: Integer; aPos: Integer;
fmt : TFormatSettings;
begin begin
if '.' = FormatSettings.DecimalSeparator then begin GetLocaleFormatSettings(LOCALE_SYSTEM_DEFAULT, fmt);
if '.' = fmt.DecimalSeparator then begin
aPos := Pos(',', s) aPos := Pos(',', s)
end end
else if ',' = FormatSettings.DecimalSeparator then begin else if ',' = fmt.DecimalSeparator then begin
aPos := Pos('.', s) aPos := Pos('.', s)
end end
else begin else begin
@ -600,7 +611,7 @@ begin
end; end;
if aPos <> 0 then begin if aPos <> 0 then begin
s[aPos] := FormatSettings.DecimalSeparator; s[aPos] := fmt.DecimalSeparator;
end; end;
Result := StrToFloat(s); Result := StrToFloat(s);
end; end;
@ -608,9 +619,11 @@ end;
function FloatToXSTR(v: Double): String; function FloatToXSTR(v: Double): String;
var var
aPos: Integer; aPos: Integer;
fmt : TFormatSettings;
begin begin
Result := FloatToStr(v); Result := FloatToStr(v);
aPos := Pos(FormatSettings.DecimalSeparator, Result); GetLocaleFormatSettings(LOCALE_SYSTEM_DEFAULT, fmt);
aPos := Pos(fmt.DecimalSeparator, Result);
if aPos <> 0 then begin if aPos <> 0 then begin
Result[aPos] := '.'; Result[aPos] := '.';
end; end;
@ -682,7 +695,9 @@ begin
varLongWord: Result := IntToStr(v.VLongWord); varLongWord: Result := IntToStr(v.VLongWord);
varInt64: Result := IntToStr(v.VInt64); varInt64: Result := IntToStr(v.VInt64);
varString: Result := String(AnsiString(v.VString)); varString: Result := String(AnsiString(v.VString));
{$if CompilerVersion >= 20}
varUString: Result := String(v.VString); varUString: Result := String(v.VString);
{$ifend}
varArray + varByte: begin varArray + varByte: begin
p := VarArrayLock(Variant(v)); p := VarArrayLock(Variant(v));
try try
@ -1587,7 +1602,9 @@ type
function CreateProcessingInstruction(aTargetID: Integer; function CreateProcessingInstruction(aTargetID: Integer;
const aData: String): IXmlProcessingInstruction; overload; const aData: String): IXmlProcessingInstruction; overload;
procedure LoadXML(const anXml: String); overload; procedure LoadXML(const anXml: String); overload;
{$if CompilerVersion >= 20}
procedure LoadXML(const anXml: RawByteString); overload; procedure LoadXML(const anXml: RawByteString); overload;
{$ifend}
procedure Load(aStream: TStream); overload; procedure Load(aStream: TStream); overload;
procedure Load(const aFileName: String); overload; procedure Load(const aFileName: String); overload;
@ -3877,6 +3894,7 @@ begin
end end
end; end;
{$if CompilerVersion >= 20}
procedure TXmlDocument.LoadXML(const anXml: RawByteString); procedure TXmlDocument.LoadXML(const anXml: RawByteString);
var var
aSource: TStringXmlSource; aSource: TStringXmlSource;
@ -3895,6 +3913,7 @@ begin
end end
end end
end; end;
{$ifend}
function TXmlDocument.NewDocument(const aVersion, anEncoding, function TXmlDocument.NewDocument(const aVersion, anEncoding,
aRootElementName: String): IXmlElement; aRootElementName: String): IXmlElement;