From 5004501bacb60ddfc570208a8862ceb293553cc1 Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Wed, 28 Jan 2026 08:13:54 -0800 Subject: [PATCH 1/2] Fix LT-22353: Change Hermit Crab to allow merge and split rules --- Build/mkall.targets | 2 +- Build/nuget-common/packages.config | 2 +- Src/LexText/ParserCore/HCLoader.cs | 11 ----------- Src/LexText/ParserCore/ParserCoreStrings.Designer.cs | 11 +---------- Src/LexText/ParserCore/ParserCoreStrings.resx | 3 --- 5 files changed, 3 insertions(+), 26 deletions(-) diff --git a/Build/mkall.targets b/Build/mkall.targets index d821c2147f..b665f88417 100644 --- a/Build/mkall.targets +++ b/Build/mkall.targets @@ -236,7 +236,7 @@ 9.4.0.1-beta 11.0.0-beta0149 70.1.123 - 3.7.4 + 3.7.13 1.1.1-beta0001 bt393 diff --git a/Build/nuget-common/packages.config b/Build/nuget-common/packages.config index fcbe0bce80..2ba4be9cab 100644 --- a/Build/nuget-common/packages.config +++ b/Build/nuget-common/packages.config @@ -66,7 +66,7 @@ - + diff --git a/Src/LexText/ParserCore/HCLoader.cs b/Src/LexText/ParserCore/HCLoader.cs index 473bff98b3..887c49daf2 100644 --- a/Src/LexText/ParserCore/HCLoader.cs +++ b/Src/LexText/ParserCore/HCLoader.cs @@ -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(); @@ -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); } diff --git a/Src/LexText/ParserCore/ParserCoreStrings.Designer.cs b/Src/LexText/ParserCore/ParserCoreStrings.Designer.cs index af13bc7fe8..e1fd20fee7 100644 --- a/Src/LexText/ParserCore/ParserCoreStrings.Designer.cs +++ b/Src/LexText/ParserCore/ParserCoreStrings.Designer.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -132,15 +132,6 @@ internal static string ksIrregularlyInflectedFormNullAffix { } } - /// - /// Looks up a localized string similar to A rule can't have more than one element in its left-hand side or its right-hand side.. - /// - internal static string ksMaxElementsInRule { - get { - return ResourceManager.GetString("ksMaxElementsInRule", resourceCulture); - } - } - /// /// Looks up a localized string similar to Parsing {0}. /// diff --git a/Src/LexText/ParserCore/ParserCoreStrings.resx b/Src/LexText/ParserCore/ParserCoreStrings.resx index da997fcf6a..7ae94aa3a4 100644 --- a/Src/LexText/ParserCore/ParserCoreStrings.resx +++ b/Src/LexText/ParserCore/ParserCoreStrings.resx @@ -189,7 +189,4 @@ Parsing {0} - - A rule can't have more than one element in its left-hand side or its right-hand side. - \ No newline at end of file From 467e41130b6aacb9d13bdbbcfcc127543fdf890b Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Thu, 29 Jan 2026 09:20:18 -0800 Subject: [PATCH 2/2] Fix version of SIL.Machine --- Build/nuget-common/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/nuget-common/packages.config b/Build/nuget-common/packages.config index 2ba4be9cab..8071f90415 100644 --- a/Build/nuget-common/packages.config +++ b/Build/nuget-common/packages.config @@ -65,7 +65,7 @@ - +