Skip to content

Speed-up determining the position of a node in the path. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kzu merged 1 commit into from
Jun 10, 2016
Merged

Speed-up determining the position of a node in the path. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Schematron/Formatters/FormattingUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ private FormattingUtils()
{
}

private static XPathExpression precedingSiblingsExpr = XPathExpression.Compile("preceding-sibling::*");

/// <summary>
/// Returns the full path to the context node. Clone the navigator to avoid loosing positioning.
/// </summary>
Expand Down Expand Up @@ -75,9 +77,8 @@ public static string GetFullNodePosition(XPathNavigator context, string previous
}

int sibs = 1;

while (context.MoveToPrevious())
if (context.Name == curr) sibs++;
foreach (XPathNavigator prev in context.Select(precedingSiblingsExpr))
if (prev.Name == curr) sibs++;

if (context.MoveToParent())
{
Expand Down
2 changes: 1 addition & 1 deletion src/Schematron/SyncEvaluationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ private bool Evaluate(Pattern pattern, StringBuilder output)
/// different methods for accessing the underlying source.
/// <para>
/// This makes the implementation both performant and compliant with
/// the restriction about node mathing (see <linkref id="schematron" />) in the spec.
/// the restriction about node matching (see <linkref id="schematron" />) in the spec.
/// </para>
/// <para>
/// <seealso cref="DomMatchedNodes"/>
Expand Down