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

- reverted r11751, 11755 and 11759 because

Browse Source 
a) they should not be necessary and only hide the symptoms of a not
      understood bug on some platforms
   b) doing so breaks things on some other platforms

git-svn-id: trunk@11951 -
This commit is contained in:
Jonas Maebe 2008-10-23 14:22:00 +00:00
parent acf20fe7db
commit 0cad00fbdb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/fcl-xml/src/xmlread.pp
View File

@ -404,7 +404,7 @@ type
procedure ValidateDTD; procedure ValidateDTD;
procedure ValidateRoot; procedure ValidateRoot;
procedure ValidationError(const Msg: string; const args: array of const; LineOffs: Integer = -1); procedure ValidationError(const Msg: string; const args: array of const; LineOffs: Integer = -1);
procedure DoAttrText(ch: PWideChar; Count: Integer); procedure DoAttrText(ch: PWideChar; Count: Integer);
procedure DTDReloadHook; procedure DTDReloadHook;
procedure ConvertSource(SrcIn: TXMLInputSource; out SrcOut: TXMLCharSource); procedure ConvertSource(SrcIn: TXMLInputSource; out SrcOut: TXMLCharSource);
// Some SAX-alike stuff (at a very early stage) // Some SAX-alike stuff (at a very early stage)
@ -662,7 +662,7 @@ begin
node := Context.ParentNode node := Context.ParentNode
else else
node := Context; node := Context;
// TODO: replacing document isn't yet supported // TODO: replacing document isn't yet supported
if (Action = xaReplaceChildren) and (node.NodeType = DOCUMENT_NODE) then if (Action = xaReplaceChildren) and (node.NodeType = DOCUMENT_NODE) then
raise EDOMNotSupported.Create('DOMParser.ParseWithContext'); raise EDOMNotSupported.Create('DOMParser.ParseWithContext');
@ -964,7 +964,7 @@ begin
Move(OldBuf^, FCharBuf^, Remainder); Move(OldBuf^, FCharBuf^, Remainder);
BytesRead := FStream.Read(FAllocated[Slack-4], FCapacity); BytesRead := FStream.Read(FAllocated[Slack-4], FCapacity);
FCharBufEnd := FAllocated + (Slack-4) + BytesRead; FCharBufEnd := FAllocated + (Slack-4) + BytesRead;
Unaligned(PWideChar(FCharBufEnd)^) := #0; PWideChar(FCharBufEnd)^ := #0;
end; end;
{ TXMLFileInputSource } { TXMLFileInputSource }
@ -1492,7 +1492,7 @@ begin
if (FCurChar = #10) or (FCurChar = #9) or (FCurChar = #13) then if (FCurChar = #10) or (FCurChar = #9) or (FCurChar = #13) then
BufAppend(FValue, #32) // don't change FCurChar, needed for correct location reporting BufAppend(FValue, #32) // don't change FCurChar, needed for correct location reporting
else else
BufAppend(FValue, FCurChar); BufAppend(FValue, FCurChar);
GetChar; GetChar;
end end
else else
@ -1522,7 +1522,7 @@ begin
ParseContent; ParseContent;
if FCurChar <> #0 then if FCurChar <> #0 then
FatalError('End-tag is not allowed here'); FatalError('End-tag is not allowed here');
// SAX: ContentHandler.EndDocument() - here? or somewhere in destructor? // SAX: ContentHandler.EndDocument() - here? or somewhere in destructor?
end; end;
function TXMLReader.ContextPush(AEntity: TDOMEntityEx): Boolean; function TXMLReader.ContextPush(AEntity: TDOMEntityEx): Boolean;
@ -1534,7 +1534,7 @@ begin
Result := ResolveEntity(AEntity.SystemID, AEntity.PublicID, Src); Result := ResolveEntity(AEntity.SystemID, AEntity.PublicID, Src);
if not Result then if not Result then
begin begin
// TODO: a detailed message like SysErrorMessage(GetLastError) would be great here // TODO: a detailed message like SysErrorMessage(GetLastError) would be great here
ValidationError('Unable to resolve external entity ''%s''', [AEntity.NodeName]); ValidationError('Unable to resolve external entity ''%s''', [AEntity.NodeName]);
Exit; Exit;
end; end;
@ -1578,7 +1578,7 @@ begin
FSource.Free; FSource.Free;
FSource := Src; FSource := Src;
FCurChar := FSource.FBuf^; FCurChar := FSource.FBuf^;
// correct position of this error is after PE reference // correct position of this error is after PE reference
if Error then if Error then
BadPENesting(esFatal); BadPENesting(esFatal);
end; end;
@ -3000,9 +3000,9 @@ begin
Inc(FNesting); Inc(FNesting);
if FNesting >= Length(FValidator) then if FNesting >= Length(FValidator) then
SetLength(FValidator, FNesting * 2); SetLength(FValidator, FNesting * 2);
unaligned(FValidator[FNesting].FElementDef) := aElDef; FValidator[FNesting].FElementDef := aElDef;
unaligned(FValidator[FNesting].FCurCP) := nil; FValidator[FNesting].FCurCP := nil;
unaligned(FValidator[FNesting].FFailed) := False; FValidator[FNesting].FFailed := False;
UpdateConstraints; UpdateConstraints;
end; end;