github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed ParamList null checks

Browse Source
This commit is contained in:
RogueException
2016-08-21 21:47:32 -03:00
parent 40da0241c8
commit f6d8659a2e
4 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Discord.Net.Commands/CommandParser.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Immutable;
using System.Collections.Immutable;
using System.Text;
using System.Threading.Tasks;
@@ -22,9 +21,8 @@ namespace Discord.Commands
var curPart = ParserPart.None;
int lastArgEndPos = int.MinValue;
var argList = ImmutableArray.CreateBuilder<TypeReaderResult>();
ImmutableArray<TypeReaderResult>.Builder paramList = ImmutableArray.CreateBuilder<TypeReaderResult>();
var paramList = ImmutableArray.CreateBuilder<TypeReaderResult>();
bool isEscaping = false;
bool hasMultipleMatches = false;
char c;
for (int curPos = startPos; curPos <= endPos; curPos++)
@@ -111,13 +109,8 @@ namespace Discord.Commands
return ParseResult.FromError(CommandError.BadArgCount, "The input text has too many parameters.");
var typeReaderResult = await curParam.Parse(context, argString).ConfigureAwait(false);
if (!typeReaderResult.IsSuccess)
{
if (typeReaderResult.Error == CommandError.MultipleMatches)
hasMultipleMatches = true;
else
return ParseResult.FromError(typeReaderResult);
}
if (!typeReaderResult.IsSuccess && typeReaderResult.Error != CommandError.MultipleMatches)
return ParseResult.FromError(typeReaderResult);
if (curParam.IsMultiple)
{
@@ -162,7 +155,7 @@ namespace Discord.Commands
argList.Add(TypeReaderResult.FromSuccess(param.DefaultValue));
}
return ParseResult.FromSuccess(argList.ToImmutable(), paramList?.ToImmutable());
return ParseResult.FromSuccess(argList.ToImmutable(), paramList.ToImmutable());
}
}
}