paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 13:30:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

sax_xml.pp:

Browse Source 
* Recognize only five predefined XML entities, not all the stuff defined for HTML.
* Recognize character refs in hex notation only using lowercase 'x'.

git-svn-id: trunk@13376 -
This commit is contained in:
sergei 2009-07-09 23:12:16 +00:00
parent 79f139bff7
commit 26366263f1
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/fcl-xml/src/sax_xml.pp
View File

@ -107,6 +107,11 @@ uses htmldefs; // for entities...
const
WhitespaceChars = [#9, #10, #13, ' '];
char_lt: SAXChar = '<';
char_gt: SAXChar = '>';
char_quot: SAXChar = '"';
char_apos: SAXChar = '''';
char_amp: SAXChar = '&';
constructor TSAXXMLReader.Create;
@ -343,9 +348,21 @@ begin
DoCharacters(PSAXChar(TokenText), 0, Length(TokenText));
scEntityReference:
begin
// TODO: xml must NOT recognize HTML entities, except 5 defined for xml.
if ResolveHTMLEntityReference(TokenText, Ent) then
DoCharacters(@Ent, 0, 1)
if (Length(TokenText) >= 2) and (TokenText[1] = '#') and
(((TokenText[2] >= '0') and (TokenText[2] <= '9')) or (TokenText[2]='x')) and
// here actually using it to resolve character references
ResolveHTMLEntityReference(TokenText, Ent) then
DoCharacters(@Ent, 0, 1)
else if TokenText = 'lt' then
DoCharacters(@char_lt, 0, 1)
else if TokenText = 'gt' then
DoCharacters(@char_gt, 0, 1)
else if TokenText = 'amp' then
DoCharacters(@char_amp, 0, 1)
else if TokenText = 'quot' then
DoCharacters(@char_quot, 0, 1)
else if TokenText = 'apos' then
DoCharacters(@char_apos, 0, 1)
else
DoSkippedEntity(TokenText);
end;