net5.0 target; fixes; use ParserConstruction namespace for Superpower types

Author: nblumhardt

src/Serilog.Expressions/Expressions/Ast/ConstantExpression.cs

@@ -28,7 +28,7 @@ public override string ToString()
                     case IFormattable formattable:
                         return formattable.ToString(null, CultureInfo.InvariantCulture);
                     default:
-                        return (sv.Value ?? "null").ToString();
+                        return (sv.Value ?? "null").ToString() ?? "<ToString() returned null>";
                 }
             }
 

src/Serilog.Expressions/Expressions/Parsing/Combinators.cs

@@ -1,6 +1,4 @@
 using System;
-using Serilog.Superpower;
-using Serilog.Superpower.Model;
 
 namespace Serilog.Expressions.Parsing
 {

src/Serilog.Expressions/Expressions/Parsing/ExpressionTextParsers.cs

@@ -1,8 +1,4 @@
-using Serilog.Superpower;
-using Serilog.Superpower.Model;
-using Serilog.Superpower.Parsers;
-
-namespace Serilog.Expressions.Parsing
+namespace Serilog.Expressions.Parsing
 {
     static class ExpressionTextParsers
     {

src/Serilog.Expressions/Expressions/Parsing/ExpressionToken.cs

@@ -1,6 +1,4 @@
-using Serilog.Superpower.Display;
-
-namespace Serilog.Expressions.Parsing
+namespace Serilog.Expressions.Parsing
 {
     enum ExpressionToken
     {

src/Serilog.Expressions/Expressions/Parsing/ExpressionTokenParsers.cs

@@ -3,9 +3,6 @@
 using System.Linq;
 using Serilog.Events;
 using Serilog.Expressions.Ast;
-using Serilog.Superpower;
-using Serilog.Superpower.Model;
-using Serilog.Superpower.Parsers;
 
 namespace Serilog.Expressions.Parsing
 {

src/Serilog.Expressions/Expressions/Parsing/ExpressionTokenizer.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Serilog.Superpower;
-using Serilog.Superpower.Model;
 
 namespace Serilog.Expressions.Parsing
 {

src/Serilog.Expressions/Expressions/Parsing/ParserExtensions.cs

@@ -1,6 +1,4 @@
 using System;
-using Serilog.Superpower;
-using Serilog.Superpower.Model;
 
 namespace Serilog.Expressions.Parsing
 {

src/Serilog.Expressions/Expressions/Runtime/Coerce.cs

@@ -62,7 +62,7 @@ public static bool String(LogEventPropertyValue? value, [MaybeNullWhen(false)] o
 
                 if (sv.Value?.GetType().IsEnum ?? false)
                 {
-                    str = sv.Value.ToString();
+                    str = sv.Value.ToString()!;
                     return true;
                 }
             }

src/Serilog.Expressions/Expressions/Runtime/RuntimeOperators.cs

@@ -470,14 +470,14 @@ public static LogEventPropertyValue _Internal_IsNotNull(LogEventPropertyValue? v
 
         public static LogEventPropertyValue? ToString(LogEventPropertyValue? value, LogEventPropertyValue? format)
         {
-            if (!(value is ScalarValue sv) ||
+            if (value is not ScalarValue sv ||
                 sv.Value == null ||
-                !(Coerce.String(format, out var fmt) || format == null || format is ScalarValue { Value: null }))
+                !(Coerce.String(format, out var fmt) || format is null or ScalarValue { Value: null }))
             {
                 return null;
             }
 
-            string toString;
+            string? toString;
             if (sv.Value is IFormattable formattable)
             {
                 // TODO #19: formatting is culture-specific.

src/Serilog.Expressions/Expressions/StaticMemberNameResolver.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 
@@ -27,9 +28,9 @@ public StaticMemberNameResolver(Type type)
         }
 
         /// <inheritdoc />
-        public override bool TryResolveFunctionName(string name, out MethodInfo implementation)
+        public override bool TryResolveFunctionName(string name, [MaybeNullWhen(false)] out MethodInfo implementation)
         {
             return _methods.TryGetValue(name, out implementation);
         }
     }
-}
+}

src/Serilog.Expressions/Superpower/Combinators.cs renamed to src/Serilog.Expressions/ParserConstruction/Combinators.cs

@@ -14,13 +14,13 @@
 
 using System;
 using System.Collections.Generic;
-using Serilog.Superpower.Display;
-using Serilog.Superpower.Model;
-using Serilog.Superpower.Util;
+using Serilog.ParserConstruction.Display;
+using Serilog.ParserConstruction.Model;
+using Serilog.ParserConstruction.Util;
 
 // ReSharper disable MemberCanBePrivate.Global
 
-namespace Serilog.Superpower
+namespace Serilog.ParserConstruction
 {
     /// <summary>
     /// Functions that construct more complex parsers by combining simpler ones.

src/Serilog.Expressions/Superpower/Display/Presentation.cs renamed to src/Serilog.Expressions/ParserConstruction/Display/Presentation.cs

@@ -14,9 +14,9 @@
 
 using System;
 using System.Reflection;
-using Serilog.Superpower.Util;
+using Serilog.ParserConstruction.Util;
 
-namespace Serilog.Superpower.Display
+namespace Serilog.ParserConstruction.Display
 {
     static class Presentation
     {

src/Serilog.Expressions/Superpower/Display/TokenAttribute.cs renamed to src/Serilog.Expressions/ParserConstruction/Display/TokenAttribute.cs

@@ -16,7 +16,7 @@
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global, ClassNeverInstantiated.Global
 
-namespace Serilog.Superpower.Display
+namespace Serilog.ParserConstruction.Display
 {
     /// <summary>
     /// Applied to enum members representing tokens to control how they are rendered.

src/Serilog.Expressions/Superpower/Model/Position.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/Position.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// A position within a stream of character input.

src/Serilog.Expressions/Superpower/Model/Result.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/Result.cs

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Serilog.Superpower.Util;
+using Serilog.ParserConstruction.Util;
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// Helper methods for working with <see cref="Result{T}"/>.

src/Serilog.Expressions/Superpower/Model/Result`1.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/Result`1.cs

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 using System;
-using Serilog.Superpower.Util;
+using Serilog.ParserConstruction.Util;
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// The result of parsing from a text span.

src/Serilog.Expressions/Superpower/Model/TextSpan.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/TextSpan.cs

@@ -14,7 +14,7 @@
 
 using System;
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// A span of text within a larger string.

src/Serilog.Expressions/Superpower/Model/TokenListParserResult.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/TokenListParserResult.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// Helper methods for working with <see cref="TokenListParserResult{TKind,T}"/>.

src/Serilog.Expressions/Superpower/Model/TokenListParserResult`2.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/TokenListParserResult`2.cs

@@ -13,10 +13,10 @@
 // limitations under the License.
 
 using System;
-using Serilog.Superpower.Display;
-using Serilog.Superpower.Util;
+using Serilog.ParserConstruction.Display;
+using Serilog.ParserConstruction.Util;
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// The result of parsing from a token list.

src/Serilog.Expressions/Superpower/Model/TokenList`1.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/TokenList`1.cs

@@ -16,7 +16,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// A list of <see cref="Token{TKind}"/>

src/Serilog.Expressions/Superpower/Model/Token`1.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/Token`1.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// A token.

src/Serilog.Expressions/Superpower/Model/Unit.cs renamed to src/Serilog.Expressions/ParserConstruction/Model/Unit.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Serilog.Superpower.Model
+namespace Serilog.ParserConstruction.Model
 {
     /// <summary>
     /// A structure with no information.

src/Serilog.Expressions/Superpower/Parse.cs renamed to src/Serilog.Expressions/ParserConstruction/Parse.cs

@@ -13,11 +13,11 @@
 // limitations under the License.
 
 using System;
-using Serilog.Superpower.Display;
-using Serilog.Superpower.Model;
-using Serilog.Superpower.Util;
+using Serilog.ParserConstruction.Display;
+using Serilog.ParserConstruction.Model;
+using Serilog.ParserConstruction.Util;
 
-namespace Serilog.Superpower
+namespace Serilog.ParserConstruction
 {
     /// <summary>
     /// General parsing helper methods.

src/Serilog.Expressions/Superpower/ParseException.cs renamed to src/Serilog.Expressions/ParserConstruction/ParseException.cs

@@ -13,11 +13,11 @@
 // limitations under the License.
 
 using System;
-using Serilog.Superpower.Model;
+using Serilog.ParserConstruction.Model;
 
 // ReSharper disable IntroduceOptionalParameters.Global, MemberCanBePrivate.Global, UnusedAutoPropertyAccessor.Global
 
-namespace Serilog.Superpower
+namespace Serilog.ParserConstruction
 {
     /// <summary>
     /// Represents an error that occurs during parsing.

src/Serilog.Expressions/Superpower/ParserExtensions.cs renamed to src/Serilog.Expressions/ParserConstruction/ParserExtensions.cs

@@ -13,9 +13,9 @@
 // limitations under the License.
 
 using System;
-using Serilog.Superpower.Model;
+using Serilog.ParserConstruction.Model;
 
-namespace Serilog.Superpower
+namespace Serilog.ParserConstruction
 {
     /// <summary>
     /// Helper methods for working with parsers.

src/Serilog.Expressions/Superpower/Parsers/Character.cs renamed to src/Serilog.Expressions/ParserConstruction/Parsers/Character.cs

@@ -13,10 +13,10 @@
 // limitations under the License.
 
 using System;
-using Serilog.Superpower.Display;
-using Serilog.Superpower.Model;
+using Serilog.ParserConstruction.Display;
+using Serilog.ParserConstruction.Model;
 
-namespace Serilog.Superpower.Parsers
+namespace Serilog.ParserConstruction.Parsers
 {
     /// <summary>
     /// Parsers for matching individual characters.

src/Serilog.Expressions/Superpower/Parsers/Numerics.cs renamed to src/Serilog.Expressions/ParserConstruction/Parsers/Numerics.cs

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Serilog.Superpower.Model;
-using Serilog.Superpower.Util;
+using Serilog.ParserConstruction.Model;
+using Serilog.ParserConstruction.Util;
 
-namespace Serilog.Superpower.Parsers
+namespace Serilog.ParserConstruction.Parsers
 {
     /// <summary>
     /// Parsers for numeric patterns.

src/Serilog.Expressions/Superpower/Parsers/Span.cs renamed to src/Serilog.Expressions/ParserConstruction/Parsers/Span.cs

@@ -13,10 +13,10 @@
 // limitations under the License.
 
 using System;
-using Serilog.Superpower.Display;
-using Serilog.Superpower.Model;
+using Serilog.ParserConstruction.Display;
+using Serilog.ParserConstruction.Model;
 
-namespace Serilog.Superpower.Parsers
+namespace Serilog.ParserConstruction.Parsers
 {
     /// <summary>
     /// Parsers for spans of characters.

src/Serilog.Expressions/Superpower/Parsers/Token.cs renamed to src/Serilog.Expressions/ParserConstruction/Parsers/Token.cs

@@ -13,10 +13,10 @@
 // limitations under the License.
 
 using System;
-using Serilog.Superpower.Display;
-using Serilog.Superpower.Model;
+using Serilog.ParserConstruction.Display;
+using Serilog.ParserConstruction.Model;
 
-namespace Serilog.Superpower.Parsers
+namespace Serilog.ParserConstruction.Parsers
 {
     /// <summary>
     /// Parsers for matching individual tokens.

src/Serilog.Expressions/Superpower/README.md renamed to src/Serilog.Expressions/ParserConstruction/README.md

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Serilog.Superpower.Model;
+using Serilog.ParserConstruction.Model;
 
-namespace Serilog.Superpower
+namespace Serilog.ParserConstruction
 {
     /// <summary>
     /// A parser that consumes text from a string span.

src/Serilog.Expressions/Superpower/TextParser`1.cs renamed to src/Serilog.Expressions/ParserConstruction/TextParser`1.cs

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Serilog.Superpower.Model;
+using Serilog.ParserConstruction.Model;
 
-namespace Serilog.Superpower
+namespace Serilog.ParserConstruction
 {
     /// <summary>
     /// A parser that consumes elements from a list of tokens.

src/Serilog.Expressions/Superpower/TokenListParser`2.cs renamed to src/Serilog.Expressions/ParserConstruction/TokenListParser`2.cs

@@ -14,10 +14,10 @@
 
 using System;
 using System.Collections.Generic;
-using Serilog.Superpower.Display;
-using Serilog.Superpower.Model;
+using Serilog.ParserConstruction.Display;
+using Serilog.ParserConstruction.Model;
 
-namespace Serilog.Superpower
+namespace Serilog.ParserConstruction
 {
     /// <summary>
     /// Base class for tokenizers, types whose instances convert strings into lists of tokens.

src/Serilog.Expressions/Superpower/Tokenizer`1.cs renamed to src/Serilog.Expressions/ParserConstruction/Tokenizer`1.cs

@@ -14,7 +14,7 @@
 
 using System.Runtime.CompilerServices;
 
-namespace Serilog.Superpower.Util
+namespace Serilog.ParserConstruction.Util
 {
     static class ArrayEnumerable
     {

src/Serilog.Expressions/Superpower/Util/ArrayEnumerable.cs renamed to src/Serilog.Expressions/ParserConstruction/Util/ArrayEnumerable.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Serilog.Superpower.Util
+namespace Serilog.ParserConstruction.Util
 {
     static class CharInfo
     {

src/Serilog.Expressions/Superpower/Util/CharInfo.cs renamed to src/Serilog.Expressions/ParserConstruction/Util/CharInfo.cs

@@ -16,7 +16,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Serilog.Superpower.Util
+namespace Serilog.ParserConstruction.Util
 {
     static class Friendly
     {