diff --git a/src/Markdig/Syntax/MarkdownObjectExtensions.cs b/src/Markdig/Syntax/MarkdownObjectExtensions.cs
index c7fac83f..4875ae09 100644
--- a/src/Markdig/Syntax/MarkdownObjectExtensions.cs
+++ b/src/Markdig/Syntax/MarkdownObjectExtensions.cs
@@ -1,131 +1,131 @@
-// Copyright (c) Alexandre Mutel. All rights reserved.
-// This file is licensed under the BSD-Clause 2 license.
-// See the license.txt file in the project root for more information.
-
-using System.Collections.Generic;
-using Markdig.Syntax.Inlines;
-
-namespace Markdig.Syntax
-{
- ///
- /// Extensions for visiting or
- ///
- public static class MarkdownObjectExtensions
- {
- ///
- /// Iterates over the descendant elements for the specified markdown element, including and .
- ///
- /// The markdown object.
- /// An iteration over the descendant elements
- public static IEnumerable Descendants(this MarkdownObject markdownObject)
- {
- // TODO: implement a recursiveless method
-
- var block = markdownObject as ContainerBlock;
- if (block != null)
- {
- foreach (var subBlock in block)
- {
- yield return subBlock;
-
- foreach (var sub in subBlock.Descendants())
- {
- yield return sub;
- }
-
- // Visit leaf block that have inlines
- var leafBlock = subBlock as LeafBlock;
- if (leafBlock?.Inline != null)
- {
- foreach (var subInline in Descendants(leafBlock.Inline))
- {
- yield return subInline;
- }
- }
- }
- }
- else
- {
- var inline = markdownObject as ContainerInline;
- if (inline != null)
- {
- var child = inline.FirstChild;
- while (child != null)
- {
- var next = child.NextSibling;
- yield return child;
-
- foreach (var sub in child.Descendants())
- {
- yield return sub;
- }
-
- child = next;
- }
- }
- }
- }
-
- ///
- /// Iterates over the descendant elements for the specified markdown element and filters by the type {T}.
- ///
- /// Type to use for filtering the descendants
- /// The inline markdown object.
- ///
- /// An iteration over the descendant elements
- ///
- public static IEnumerable Descendants(this ContainerInline inline) where T : Inline
- {
- var child = inline.FirstChild;
- while (child != null)
- {
- var next = child.NextSibling;
- var childT = child as T;
- if (childT != null)
- {
- yield return childT;
- }
-
- var subContainer = child as ContainerInline;
- if (subContainer != null)
- {
- foreach (var sub in subContainer.Descendants())
- {
- yield return sub;
- }
- }
-
- child = next;
- }
- }
-
- ///
- /// Iterates over the descendant elements for the specified markdown element and filters by the type {T}.
- ///
- /// Type to use for filtering the descendants
- /// The markdown object.
- ///
- /// An iteration over the descendant elements
- ///
- public static IEnumerable Descendants(this ContainerBlock block) where T : Block
- {
- foreach (var subBlock in block)
- {
- var subBlockT = subBlock as T;
- if (subBlockT != null)
- {
- yield return subBlockT;
- }
-
- var subBlockContainer = subBlock as ContainerBlock;
- if (subBlockContainer != null)
- {
- foreach (var sub in subBlockContainer.Descendants())
- {
- yield return sub;
- }
- }
- }
- }
- }
+// Copyright (c) Alexandre Mutel. All rights reserved.
+// This file is licensed under the BSD-Clause 2 license.
+// See the license.txt file in the project root for more information.
+
+using System.Collections.Generic;
+using Markdig.Syntax.Inlines;
+
+namespace Markdig.Syntax
+{
+ ///
+ /// Extensions for visiting or
+ ///
+ public static class MarkdownObjectExtensions
+ {
+ ///
+ /// Iterates over the descendant elements for the specified markdown element, including and .
+ /// The descendant elements are returned in DFS-like order.
+ ///
+ /// The markdown object.
+ /// An iteration over the descendant elements
+ public static IEnumerable Descendants(this MarkdownObject markdownObject)
+ {
+ // Fast-path an object with no children to avoid allocating Stack objects
+ if (!(markdownObject is ContainerBlock) && !(markdownObject is ContainerInline)) yield break;
+
+ // TODO: A single Stack<(MarkdownObject block, bool push)> when ValueTuples are available
+ Stack stack = new Stack();
+ Stack pushStack = new Stack();
+
+ stack.Push(markdownObject);
+ pushStack.Push(false);
+
+ while (stack.Count > 0)
+ {
+ var block = stack.Pop();
+ var push = pushStack.Pop();
+ if (block is ContainerBlock containerBlock)
+ {
+ if (push) yield return containerBlock;
+ int subBlockIndex = containerBlock.Count;
+ while (subBlockIndex-- > 0)
+ {
+ var subBlock = containerBlock[subBlockIndex];
+ if (subBlock is LeafBlock leafBlock)
+ {
+ if (leafBlock.Inline != null)
+ {
+ stack.Push(leafBlock.Inline);
+ pushStack.Push(false);
+ }
+ }
+ stack.Push(subBlock);
+ pushStack.Push(true);
+ }
+ }
+ else if (block is ContainerInline containerInline)
+ {
+ if (push) yield return containerInline;
+ var child = containerInline.LastChild;
+ while (child != null)
+ {
+ stack.Push(child);
+ pushStack.Push(true);
+ child = child.PreviousSibling;
+ }
+ }
+ else yield return block;
+ }
+ }
+
+ ///
+ /// Iterates over the descendant elements for the specified markdown element and filters by the type {T}.
+ ///
+ /// Type to use for filtering the descendants
+ /// The inline markdown object.
+ ///
+ /// An iteration over the descendant elements
+ ///
+ public static IEnumerable Descendants(this ContainerInline inline) where T : Inline
+ {
+ var child = inline.FirstChild;
+ while (child != null)
+ {
+ var next = child.NextSibling;
+ T childT = child as T;
+ if (childT != null)
+ {
+ yield return childT;
+ }
+
+ ContainerInline subContainer = child as ContainerInline;
+ if (subContainer != null)
+ {
+ foreach (var sub in subContainer.Descendants())
+ {
+ yield return sub;
+ }
+ }
+
+ child = next;
+ }
+ }
+
+ ///
+ /// Iterates over the descendant elements for the specified markdown element and filters by the type {T}.
+ ///
+ /// Type to use for filtering the descendants
+ /// The markdown object.
+ ///
+ /// An iteration over the descendant elements
+ ///
+ public static IEnumerable Descendants(this ContainerBlock block) where T : Block
+ {
+ foreach (var subBlock in block)
+ {
+ if (subBlock is T subBlockT)
+ {
+ yield return subBlockT;
+ }
+
+ if (subBlock is ContainerBlock subBlockContainer)
+ {
+ foreach (var sub in subBlockContainer.Descendants())
+ {
+ yield return sub;
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file