WIP nullability for Parsec

louthy · Dec 17, 2024 · 1a192e6 · 1a192e6
1 parent ba50661
commit 1a192e6
Show file tree

Hide file tree

Showing 5 changed files with 774 additions and 776 deletions.
diff --git a/LanguageExt.Parsec/PString.cs b/LanguageExt.Parsec/PString.cs
@@ -43,7 +43,7 @@ public PString SetValue(string value) =>
         public PString SetIndex(int index) =>
             new PString(Value, index, EndIndex, Pos, DefPos, Side, UserState);
 
-        public PString SetUserState(object state) =>
+        public PString SetUserState(object? state) =>
             new PString(Value, Index, EndIndex, Pos, DefPos, Side, state);
 
         public PString SetEndIndex(int endIndex) =>

diff --git a/LanguageExt.Parsec/ParsecIO.Internal.cs b/LanguageExt.Parsec/ParsecIO.Internal.cs
@@ -37,22 +37,22 @@ public static Parser<I,O> choicei<I, O>(Seq<Parser<I, O>> ps) =>
                 : inp =>
             {
                 var results = new List<O>();
-                ParserError error = null;
+                ParserError? error = null;
 
                 foreach (var p in ps)
                 {
                     var t = p(inp);
 
                     // cok
-                    if (t.Tag == ResultTag.Consumed && t.Reply.Tag == ReplyTag.OK)
+                    if (t is { Tag: ResultTag.Consumed, Reply.Tag: ReplyTag.OK })
                     {
                         return t;
                     }
 
                     // eok
                     if (t.Tag == ResultTag.Empty && t.Reply.Tag == ReplyTag.OK)
                     {
-                        return EmptyOK<I, O>(t.Reply.Result, t.Reply.State, mergeError(error, t.Reply.Error));
+                        return EmptyOK<I, O>(t.Reply.Result!, t.Reply.State, mergeError(error, t.Reply.Error));
                     }
 
                     // cerr
@@ -64,7 +64,7 @@ public static Parser<I,O> choicei<I, O>(Seq<Parser<I, O>> ps) =>
                     error = mergeError(error, t.Reply.Error);
                 }
 
-                return EmptyError<I, O>(error, inp.TokenPos);
+                return EmptyError<I, O>(error!, inp.TokenPos);
             };
 
         /// <summary>

diff --git a/LanguageExt.Parsec/ParserIOs/Indent.cs b/LanguageExt.Parsec/ParserIOs/Indent.cs
@@ -89,9 +89,9 @@ static ParserResult<TOKEN, A> parseBlock<TOKEN, A>(Parser<TOKEN, A> p, int start
                       pres.Tag,
                       new Reply<TOKEN, A>(
                           pres.Reply.Tag,
-                          pres.Reply.Result,
+                          pres.Reply.Result!,
                           new PString<TOKEN>(inp.Value, pres.Reply.State.Index, inp.EndIndex, pres.Reply.State.UserState, pres.Reply.State.TokenPos),
-                          pres.Reply.Error));
+                          pres.Reply.Error!));
         }  
     }
 }
diff --git a/LanguageExt.Parsec/ParserIOs/Item.cs b/LanguageExt.Parsec/ParserIOs/Item.cs
@@ -38,7 +38,7 @@ public static Parser<A, A> satisfy<A>(Func<A, bool> pred) =>
 
                     if (ns.Tag == ResultTag.Consumed)
                     {
-                        if (pred(ns.Reply.Result))
+                        if (pred(ns.Reply.Result!))
                         {
                             return ns;
                         }