Skip to content
Merged
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
2 changes: 1 addition & 1 deletion Build/mkall.targets
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
<ParatextNugetVersion>9.4.0.1-beta</ParatextNugetVersion>
<LcmNugetVersion>11.0.0-beta0149</LcmNugetVersion>
<IcuNugetVersion>70.1.123</IcuNugetVersion>
<HermitCrabNugetVersion>3.7.4</HermitCrabNugetVersion>
<HermitCrabNugetVersion>3.7.13</HermitCrabNugetVersion>
<IPCFrameworkVersion>1.1.1-beta0001</IPCFrameworkVersion>
<!-- bt393 is the master branch build of ExCss for Windows development. Update when appropriate. -->
<ExCssBuildType Condition="'$(OS)'=='Windows_NT'">bt393</ExCssBuildType>
Expand Down
4 changes: 2 additions & 2 deletions Build/nuget-common/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
<package id="SIL.libpalaso.l10ns" version="6.0.0" targetFramework="net461" />
<package id="SIL.Lift" version="17.0.0-beta0089" targetFramework="net462" />
<package id="SIL.Media" version="17.0.0-beta0089" targetFramework="net462" />
<package id="SIL.Machine" version="3.7.4" targetFramework="netstandard2.0" />
<package id="SIL.Machine.Morphology.HermitCrab" version="3.7.4" targetFramework="netstandard2.0" />
<package id="SIL.Machine" version="3.7.13" targetFramework="netstandard2.0" />
<package id="SIL.Machine.Morphology.HermitCrab" version="3.7.13" targetFramework="netstandard2.0" />
<package id="SIL.ParatextShared" version="7.4.0.1" targetFramework="net40" /> <!-- REVIEW (Hasso) 2023.05: do we still integrate with PT 7? -->
<package id="SIL.Scripture" version="17.0.0-beta0089" targetFramework="net462" />
<package id="SIL.TestUtilities" version="17.0.0-beta0089" targetFramework="net462" />
Expand Down
11 changes: 0 additions & 11 deletions Src/LexText/ParserCore/HCLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2043,11 +2043,6 @@ private RewriteRule LoadRewriteRule(IPhRegularRule prule)
}
hcPrule.Properties[HCParser.PRuleID] = prule.Hvo;

if (hcPrule.Lhs.Children.Count > 1)
{
m_logger.InvalidRewriteRule(prule, ParserCoreStrings.ksMaxElementsInRule);
return null;
}
foreach (IPhSegRuleRHS rhs in prule.RightHandSidesOS)
{
var psubrule = new RewriteSubrule();
Expand Down Expand Up @@ -2098,12 +2093,6 @@ private RewriteRule LoadRewriteRule(IPhRegularRule prule)
psubrule.RightEnvironment = rightPattern;
}

if (psubrule.Rhs.Children.Count > 1)
{
m_logger.InvalidRewriteRule(prule, ParserCoreStrings.ksMaxElementsInRule);
return null;
}

hcPrule.Subrules.Add(psubrule);
}

Expand Down
11 changes: 1 addition & 10 deletions Src/LexText/ParserCore/ParserCoreStrings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Src/LexText/ParserCore/ParserCoreStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,4 @@
<data name="ksParsingX" xml:space="preserve">
<value>Parsing {0}</value>
</data>
<data name="ksMaxElementsInRule" xml:space="preserve">
<value>A rule can't have more than one element in its left-hand side or its right-hand side.</value>
</data>
</root>
Loading