diff --git a/Directory.Packages.props b/Directory.Packages.props index 2fb8b2c1..32d1e7f4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -17,22 +17,22 @@ - - + + - + - + - - + + - - + + diff --git a/Fluid/FluidParser.cs b/Fluid/FluidParser.cs index a87f613f..28b0716d 100644 --- a/Fluid/FluidParser.cs +++ b/Fluid/FluidParser.cs @@ -64,9 +64,9 @@ public class FluidParser protected static readonly Parser InlineTagEnd = TagParsers.TagEnd(); protected static readonly Parser NoInlineOutputStart = NonInlineLiquidTagParsers.OutputTagStart(); - protected static readonly Parser NoInlineOutputEnd = Literals.AnyOf(WhiteSpaceChars, minSize: 0).SkipAnd(NonInlineLiquidTagParsers.OutputTagEnd()); + protected static readonly Parser NoInlineOutputEnd = Literals.AnyOf(WhiteSpaceChars.AsSpan(), minSize: 0).SkipAnd(NonInlineLiquidTagParsers.OutputTagEnd()); protected static readonly Parser NoInlineTagStart = NonInlineLiquidTagParsers.TagStart(); - protected static readonly Parser NoInlineTagEnd = Literals.AnyOf(WhiteSpaceChars, minSize: 0).SkipAnd(NonInlineLiquidTagParsers.TagEnd()); + protected static readonly Parser NoInlineTagEnd = Literals.AnyOf(WhiteSpaceChars.AsSpan(), minSize: 0).SkipAnd(NonInlineLiquidTagParsers.TagEnd()); protected readonly Parser OutputStart = InlineOutputStart; protected readonly Parser OutputEnd = InlineOutputEnd; @@ -192,7 +192,7 @@ public FluidParser(FluidParserOptions parserOptions) // Seek anything that looks like a binary operator (==, !=, <, >, <=, >=, contains, startswith, endswith) then validates it with the registered operators // An "identifier" operator should always be followed by a space so we ensure it's doing it with AndSkip(Literals.WhiteSpace()) - CombinatoryExpression = Primary.And(ZeroOrOne(OneOf(Terms.AnyOf("=!<>", maxSize: 2), Terms.Identifier().AndSkip(Literals.WhiteSpace())).Then(x => x.ToString()) + CombinatoryExpression = Primary.And(ZeroOrOne(OneOf(Terms.AnyOf("=!<>".AsSpan(), maxSize: 2), Terms.Identifier().AndSkip(Literals.WhiteSpace())).Then(x => x.ToString()) .When((ctx, s) => RegisteredOperators.ContainsKey(s)).And(Primary))) .Then(x => {