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

Fixed a couple parser errors

Browse Source
This commit is contained in:
RogueException
2016-01-01 19:42:09 -04:00
parent 72b24c1e42
commit 120950b539
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,13 +119,13 @@ namespace Discord.Commands
else if ((!isEscaped && isWhitespace) || endPosition >= inputLength) else if ((!isEscaped && isWhitespace) || endPosition >= inputLength)
{ {
int length = (isWhitespace ? endPosition - 1 : endPosition) - startPosition; int length = (isWhitespace ? endPosition - 1 : endPosition) - startPosition;
string temp = input.Substring(startPosition, length); if (length == 0)
if (temp == "")
startPosition = endPosition; startPosition = endPosition;
else else
{ {
currentPart = ParserPart.None; string temp = input.Substring(startPosition, length);
argList.Add(temp); argList.Add(temp);
currentPart = ParserPart.None;
startPosition = endPosition; startPosition = endPosition;
} }
} }
@@ -134,9 +134,9 @@ namespace Discord.Commands
if ((!isEscaped && currentChar == '\'')) if ((!isEscaped && currentChar == '\''))
{ {
string temp = input.Substring(startPosition, endPosition - startPosition - 1); string temp = input.Substring(startPosition, endPosition - startPosition - 1);
currentPart = ParserPart.None;
argList.Add(temp); argList.Add(temp);
startPosition = endPosition; currentPart = ParserPart.None;
startPosition = endPosition;
} }
else if (endPosition >= inputLength) else if (endPosition >= inputLength)
return CommandErrorType.InvalidInput; return CommandErrorType.InvalidInput;
@@ -145,9 +145,9 @@ namespace Discord.Commands
if ((!isEscaped && currentChar == '\"')) if ((!isEscaped && currentChar == '\"'))
{ {
string temp = input.Substring(startPosition, endPosition - startPosition - 1); string temp = input.Substring(startPosition, endPosition - startPosition - 1);
currentPart = ParserPart.None;
argList.Add(temp); argList.Add(temp);
startPosition = endPosition; currentPart = ParserPart.None;
startPosition = endPosition;
} }
else if (endPosition >= inputLength) else if (endPosition >= inputLength)
return CommandErrorType.InvalidInput; return CommandErrorType.InvalidInput;
@@ -155,8 +155,13 @@ namespace Discord.Commands
} }
} }
//Too few args //Unclosed quotes
for (int i = argList.Count; i < expectedArgs.Length; i++) if (currentPart == ParserPart.QuotedParameter ||
currentPart == ParserPart.DoubleQuotedParameter)
return CommandErrorType.InvalidInput;
//Too few args
for (int i = argList.Count; i < expectedArgs.Length; i++)
{ {
var param = expectedArgs[i]; var param = expectedArgs[i];
switch (param.Type) switch (param.Type)