Make sure we generate valid code for failure cases when trimming is enabled

Genbox · Genbox · commit 0354142c1484 · 2025-12-22T14:57:10.000+01:00
diff --git a/Src/FastData.Generator.CPlusPlus/Internal/Framework/CPlusPlusEarlyExitDef.cs b/Src/FastData.Generator.CPlusPlus/Internal/Framework/CPlusPlusEarlyExitDef.cs
@@ -19,7 +19,7 @@ protected override string GetMaskEarlyExit(MethodType methodType, ulong[] bitSet
                         {
                 {{RenderCases()}}
                             default:
-                                {{RenderMethod(methodType)}}
+                                {{RenderExit(methodType)}}
                         }
                 """;
 
@@ -44,22 +44,22 @@ string RenderCases()
     protected override string GetValueEarlyExits<T>(MethodType methodType, T min, T max) =>
         $"""
                  if ({(min.Equals(max) ? $"key != {map.ToValueLabel(max)}" : $"key < {map.ToValueLabel(min)} || key > {map.ToValueLabel(max)}")})
-                     {RenderMethod(methodType)}
+                     {RenderExit(methodType)}
          """;
 
     protected override string GetLengthEarlyExits(MethodType methodType, uint min, uint max, uint minByte, uint maxByte) =>
         $"""
                  if ({(min.Equals(max) ? $"key.length() != {map.ToValueLabel(max)}" : $"const size_t len = key.length(); len < {map.ToValueLabel(min)} || len > {map.ToValueLabel(max)}")})
-                     {RenderMethod(methodType)}
+                     {RenderExit(methodType)}
          """;
 
     private static string RenderWord(ulong word, MethodType methodType) =>
         $"""
                  if (({word.ToStringInvariant()}ULL & (1ULL << ((key.length() - 1) & 63))) == 0)
-                     {RenderMethod(methodType)}
+                     {RenderExit(methodType)}
          """;
 
-    private static string RenderMethod(MethodType methodType) => methodType == MethodType.TryLookup
+    internal static string RenderExit(MethodType methodType) => methodType == MethodType.TryLookup
         ? """
           {
               value = nullptr;
diff --git a/Src/FastData.Generator.CPlusPlus/Internal/Framework/CPlusPlusOutputWriter.cs b/Src/FastData.Generator.CPlusPlus/Internal/Framework/CPlusPlusOutputWriter.cs
@@ -21,7 +21,7 @@ protected override string GetMethodHeader(MethodType methodType)
             sb.Append($"""
 
                                if (!({GetTrimMatchCondition()}))
-                                   return false;
+                                   {CPlusPlusEarlyExitDef.RenderExit(methodType)}
 
                                const auto trimmedKey = key.substr({TrimPrefix.Length.ToStringInvariant()}, key.length() - {TotalTrimLength.ToStringInvariant()});
                        """);
diff --git a/Src/FastData.Generator.CSharp/Internal/Framework/CSharpEarlyExitDef.cs b/Src/FastData.Generator.CSharp/Internal/Framework/CSharpEarlyExitDef.cs
@@ -19,7 +19,7 @@ protected override string GetMaskEarlyExit(MethodType methodType, ulong[] bitSet
                         {
                 {{RenderCases()}}
                             default:
-                                {{RenderMethod(methodType)}}
+                                {{RenderExit(methodType)}}
                         }
                 """;
 
@@ -44,22 +44,22 @@ string RenderCases()
     protected override string GetValueEarlyExits<T>(MethodType methodType, T min, T max) =>
         $"""
                  if ({(min.Equals(max) ? $"key != {map.ToValueLabel(max)}" : $"key < {map.ToValueLabel(min)} || key > {map.ToValueLabel(max)}")})
-                     {RenderMethod(methodType)}
+                     {RenderExit(methodType)}
          """;
 
     protected override string GetLengthEarlyExits(MethodType methodType, uint min, uint max, uint minByte, uint maxByte) =>
         $"""
                  if ({(min.Equals(max) ? $"key.Length != {map.ToValueLabel(max)}" : $"key.Length < {map.ToValueLabel(min)} || key.Length > {map.ToValueLabel(max)}")})
-                     {RenderMethod(methodType)}
+                     {RenderExit(methodType)}
          """;
 
     private static string RenderWord(ulong word, MethodType methodType) =>
         $"""
                          if (({word.ToStringInvariant()}UL & (1UL << ((key.Length - 1) & 63))) == 0)
-                             {RenderMethod(methodType)}
+                             {RenderExit(methodType)}
          """;
 
-    private static string RenderMethod(MethodType methodType) => methodType == MethodType.TryLookup
+    internal static string RenderExit(MethodType methodType) => methodType == MethodType.TryLookup
         ? """
           {
                       value = default;
diff --git a/Src/FastData.Generator.CSharp/Internal/Framework/CSharpOutputWriter.cs b/Src/FastData.Generator.CSharp/Internal/Framework/CSharpOutputWriter.cs
@@ -50,7 +50,7 @@ protected override string GetMethodHeader(MethodType methodType)
             sb.Append($"""
 
                                if (!({GetTrimMatchCondition()}))
-                                   return false;
+                                   {CSharpEarlyExitDef.RenderExit(methodType)}
 
                                string trimmedKey = key.Substring({TrimPrefix.Length.ToStringInvariant()}, key.Length - {TotalTrimLength.ToStringInvariant()});
                        """);
diff --git a/Src/FastData.Generator.Rust/Internal/Framework/RustEarlyExitDef.cs b/Src/FastData.Generator.Rust/Internal/Framework/RustEarlyExitDef.cs
@@ -18,7 +18,7 @@ protected override string GetMaskEarlyExit(MethodType methodType, ulong[] bitSet
                     match key.len() >> 6 {
                 {{RenderCases()}}
                         _ => {
-                             {{RenderMethod(methodType)}}
+                             {{RenderExit(methodType)}}
                         }
                     }
                 """;
@@ -44,23 +44,23 @@ string RenderCases()
     protected override string GetValueEarlyExits<T>(MethodType methodType, T min, T max) =>
         $$"""
                   if {{(min.Equals(max) ? $"key != {map.ToValueLabel(max)}" : $"key < {map.ToValueLabel(min)} || key > {map.ToValueLabel(max)}")}} {
-                      {{RenderMethod(methodType)}}
+                      {{RenderExit(methodType)}}
                   }
           """;
 
     protected override string GetLengthEarlyExits(MethodType methodType, uint min, uint max, uint minByte, uint maxByte) =>
         $$"""
                   if {{(minByte.Equals(maxByte) ? $"key.len() != {map.ToValueLabel(maxByte)} as usize" : $"key.len() < {map.ToValueLabel(minByte)} as usize || key.len() > {map.ToValueLabel(maxByte)} as usize")}} {
-                      {{RenderMethod(methodType)}}
+                      {{RenderExit(methodType)}}
                   }
           """;
 
     private static string RenderWord(ulong word, MethodType methodType) =>
         $$"""
                       if {{word.ToStringInvariant()}}u64 & (1u64 << ((key.len().wrapping_sub(1)) & 63)) == 0 {
-                          {{RenderMethod(methodType)}}
+                          {{RenderExit(methodType)}}
                       }
           """;
 
-    private static string RenderMethod(MethodType methodType) => methodType == MethodType.TryLookup ? "return None;" : "return false;";
+    internal static string RenderExit(MethodType methodType) => methodType == MethodType.TryLookup ? "return None;" : "return false;";
 }
diff --git a/Src/FastData.Generator.Rust/Internal/Framework/RustOutputWriter.cs b/Src/FastData.Generator.Rust/Internal/Framework/RustOutputWriter.cs
@@ -21,7 +21,7 @@ protected override string GetMethodHeader(MethodType methodType)
             sb.Append($$"""
 
                                 if !({{GetTrimMatchCondition()}}) {
-                                    return false;
+                                    {{RustEarlyExitDef.RenderExit(methodType)}}
                                 }
 
                                 let trimmedKey = &key[{{TrimPrefix.Length.ToStringInvariant()}}..key.len() - {{TrimSuffix.Length.ToStringInvariant()}}];

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ protected override string GetMaskEarlyExit(MethodType methodType, ulong[] bitSet`
`18`	`18`	`match key.len() >> 6 {`
`19`	`19`	`{{RenderCases()}}`
`20`	`20`	`_ => {`
`21`		`- {{RenderMethod(methodType)}}`
	`21`	`+ {{RenderExit(methodType)}}`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`""";`
`@@ -44,23 +44,23 @@ string RenderCases()`
`44`	`44`	`protected override string GetValueEarlyExits<T>(MethodType methodType, T min, T max) =>`
`45`	`45`	`$$"""`
`46`	`46`	`if {{(min.Equals(max) ? $"key != {map.ToValueLabel(max)}" : $"key < {map.ToValueLabel(min)} \|\| key > {map.ToValueLabel(max)}")}} {`
`47`		`- {{RenderMethod(methodType)}}`
	`47`	`+ {{RenderExit(methodType)}}`
`48`	`48`	`}`
`49`	`49`	`""";`
`50`	`50`
`51`	`51`	`protected override string GetLengthEarlyExits(MethodType methodType, uint min, uint max, uint minByte, uint maxByte) =>`
`52`	`52`	`$$"""`
`53`	`53`	`if {{(minByte.Equals(maxByte) ? $"key.len() != {map.ToValueLabel(maxByte)} as usize" : $"key.len() < {map.ToValueLabel(minByte)} as usize \|\| key.len() > {map.ToValueLabel(maxByte)} as usize")}} {`
`54`		`- {{RenderMethod(methodType)}}`
	`54`	`+ {{RenderExit(methodType)}}`
`55`	`55`	`}`
`56`	`56`	`""";`
`57`	`57`
`58`	`58`	`private static string RenderWord(ulong word, MethodType methodType) =>`
`59`	`59`	`$$"""`
`60`	`60`	`if {{word.ToStringInvariant()}}u64 & (1u64 << ((key.len().wrapping_sub(1)) & 63)) == 0 {`
`61`		`- {{RenderMethod(methodType)}}`
	`61`	`+ {{RenderExit(methodType)}}`
`62`	`62`	`}`
`63`	`63`	`""";`
`64`	`64`
`65`		`- private static string RenderMethod(MethodType methodType) => methodType == MethodType.TryLookup ? "return None;" : "return false;";`
	`65`	`+ internal static string RenderExit(MethodType methodType) => methodType == MethodType.TryLookup ? "return None;" : "return false;";`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ protected override string GetMethodHeader(MethodType methodType)`
`21`	`21`	`sb.Append($$"""`
`22`	`22`
`23`	`23`	`if !({{GetTrimMatchCondition()}}) {`
`24`		`- return false;`
	`24`	`+ {{RustEarlyExitDef.RenderExit(methodType)}}`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`let trimmedKey = &key[{{TrimPrefix.Length.ToStringInvariant()}}..key.len() - {{TrimSuffix.Length.ToStringInvariant()}}];`