Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ out PhonologicalSubruleMatch subruleMatch
leftNode,
varBindings
);
if (leftEnvMatch == null || leftEnvMatch.Success)
if (leftEnvMatch == null || leftEnvMatch.Success || subruleSpec.LeftEnvironmentMatcher.AcceptsEmpty())
{
if (leftEnvMatch != null && leftEnvMatch.VariableBindings != null)
varBindings = leftEnvMatch.VariableBindings;
Expand All @@ -95,7 +95,11 @@ out PhonologicalSubruleMatch subruleMatch
rightNode,
varBindings
);
if (rightEnvMatch == null || rightEnvMatch.Success)
if (
rightEnvMatch == null
|| rightEnvMatch.Success
|| subruleSpec.RightEnvironmentMatcher.AcceptsEmpty()
)
{
if (rightEnvMatch != null && rightEnvMatch.VariableBindings != null)
varBindings = rightEnvMatch.VariableBindings;
Expand Down
14 changes: 14 additions & 0 deletions src/SIL.Machine/FiniteState/Fst.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2130,5 +2130,19 @@ public int GetFrozenHashCode()
{
return GetHashCode();
}

internal bool IsAcceptingState(State<TData, TOffset> state)
{
State<TData, TOffset> curState = state;
while (!curState.IsAccepting)
{
Arc<TData, TOffset> highestPriArc = curState.Arcs.MinBy(a => a.Priority);
if (!highestPriArc.Input.IsEpsilon)
break;
curState = highestPriArc.Target;
}

return curState.IsAccepting;
}
}
}
5 changes: 5 additions & 0 deletions src/SIL.Machine/Matching/Matcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -336,5 +336,10 @@ private Annotation<TOffset> GetStartAnnotation(TData input, TOffset start)
startAnn = startAnn.GetNextDepthFirst(_settings.Direction, _settings.Filter);
return startAnn;
}

public bool AcceptsEmpty()
{
return _fsa.IsAcceptingState(_fsa.StartState);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ public void SimpleRules()
new RewriteSubrule
{
Rhs = Pattern<Word, ShapeNode>.New().Annotation(asp).Value,
// the following should be a NOOP because it accepts the empty string.
LeftEnvironment = Pattern<Word, ShapeNode>
.New()
.Annotation(nonCons)
.Optional.Annotation(nonCons)
.Optional.Value,
RightEnvironment = Pattern<Word, ShapeNode>.New().Annotation(nonCons).Value
}
);
Expand Down
Loading