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

* Applied correct patch from bugs 37295

Browse Source 
git-svn-id: trunk@47366 -
This commit is contained in:
michael 2020-11-09 19:43:58 +00:00
parent 664283af9e
commit 9dc92e1c36
1 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,17 +175,6 @@ begin
'<':
begin
Inc(BufferPos);
if (Buffer[BufferPos]='!') and (Buffer[BufferPos + 1]='[') then
begin
Inc(BufferPos, 8);
EnterNewScannerContext(scCData);
end
else if (Buffer[BufferPos]='!') and (Buffer[BufferPos + 1]='-') then
begin
Inc(BufferPos, 3);
EnterNewScannerContext(scComment);
end
else
EnterNewScannerContext(scTag);
end;
else
@ -206,17 +195,6 @@ begin
'<':
begin
Inc(BufferPos);
if (Buffer[BufferPos]='!') and (Buffer[BufferPos + 1]='[') then
begin
Inc(BufferPos, 8);
EnterNewScannerContext(scCData);
end
else if (Buffer[BufferPos]='!') and (Buffer[BufferPos + 1]='-') then
begin
Inc(BufferPos, 3);
EnterNewScannerContext(scComment);
end
else
EnterNewScannerContext(scTag);
end;
else
@ -232,17 +210,6 @@ begin
'<':
begin
Inc(BufferPos);
if (Buffer[BufferPos]='!') and (Buffer[BufferPos + 1]='[') then
begin
Inc(BufferPos, 8);
EnterNewScannerContext(scCData);
end
else if (Buffer[BufferPos]='!') and (Buffer[BufferPos + 1]='-') then
begin
Inc(BufferPos, 3);
EnterNewScannerContext(scComment);
end
else
EnterNewScannerContext(scTag);
end;
else
@ -252,9 +219,15 @@ begin
end;
end;
scCData:
if (Buffer[BufferPos] = ']') and (Buffer[BufferPos + 1]=']') and (Buffer[BufferPos + 2]='>') then
if (Length(FRawTokenText) = 0) and (Buffer[BufferPos] = '-') then
begin
Inc(BufferPos, 3);
Inc(BufferPos);
EnterNewScannerContext(scComment);
end
else if (Buffer[BufferPos] = '>') and (RightStr(FRawTokenText, 2) = ']]') then
begin
FRawTokenText := Copy(FRawTokenText, 8, Length(FRawTokenText)-9); //delete '[CDATA[' and ']]' from text
Inc(BufferPos);
EnterNewScannerContext(scUnknown);
end
else
@ -263,9 +236,10 @@ begin
Inc(BufferPos);
end;
scComment:
if (Buffer[BufferPos] = '-') and (Buffer[BufferPos + 1]='-') and (Buffer[BufferPos + 2]='>') then
if (Buffer[BufferPos] = '>') and (RightStr(FRawTokenText, 2) = '--') then
begin
Inc(BufferPos, 3);
FRawTokenText := Copy(FRawTokenText, 2, Length(FRawTokenText)-3); //delete '-' and '--' from text
Inc(BufferPos);
EnterNewScannerContext(scUnknown);
end
else
@ -309,6 +283,11 @@ begin
FRawTokenText := FRawTokenText + Buffer[BufferPos];
Inc(BufferPos);
end;
'!':
begin
Inc(BufferPos);
EnterNewScannerContext(scCData);
end;
'>':
begin
Inc(BufferPos);