paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-07 17:20:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

laz2_dom: fixed enumerator

Browse Source 
git-svn-id: trunk@35249 -
This commit is contained in:
mattias 2012-02-08 22:52:23 +00:00
parent e88c4ccc31
commit 895280ea4a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/lazutils/laz2_dom.pas
View File

@ -203,6 +203,7 @@ type
TDOMNodeEnumerator = class
private
FNode: TDOMNode;
FCurrent: TDOMNode;
public
constructor Create(Node: TDOMNode);
@ -214,6 +215,7 @@ type
TDOMNodeAllChildEnumerator = class
private
FNode: TDOMNode;
FCurrent: TDOMNode;
FEnd: TDOMNode;
public
@ -866,15 +868,17 @@ type
constructor TDOMNodeAllChildEnumerator.Create(Node: TDOMNode);
begin
FCurrent:=Node.GetNextNode;
FNode:=Node;
FEnd:=Node.GetNextNodeSkipChildren;
end;
function TDOMNodeAllChildEnumerator.MoveNext: boolean;
begin
if FCurrent=FEnd then exit(false);
FCurrent:=FCurrent.GetNextNode;
Result:=true;
if FCurrent=nil then
FCurrent:=FNode.GetNextNode
else
FCurrent:=FCurrent.GetNextNode;
Result:=FCurrent<>FEnd;
end;
function TDOMNodeAllChildEnumerator.GetEnumerator: TDOMNodeAllChildEnumerator;
@ -886,12 +890,15 @@ end;
constructor TDOMNodeEnumerator.Create(Node: TDOMNode);
begin
FCurrent:=Node.FirstChild;
FNode:=Node;
end;
function TDOMNodeEnumerator.MoveNext: boolean;
begin
FCurrent:=FCurrent.NextSibling;
if FCurrent=nil then
FCurrent:=FNode.FirstChild
else
FCurrent:=FCurrent.NextSibling;
Result:=FCurrent<>nil;
end;