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

Revert "Merge remote-tracking branch 'quahu/dev' into dev"

Browse Source 
This reverts commit 8fb0d5dc13, reversing
changes made to 3e65e03b85.
This commit is contained in:
Christopher Felegy
2019-06-05 17:11:06 -04:00
parent 8fb0d5dc13
commit a8c853f1ec
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,13 +53,6 @@ namespace Discord.Commands
else else
c = '\0'; c = '\0';
//If we're processing a remainder parameter, ignore all other logic
if (curParam != null && curParam.IsRemainder && curPos != endPos)
{
argBuilder.Append(c);
continue;
}
//If this character is escaped, skip it //If this character is escaped, skip it
if (isEscaping) if (isEscaping)
{ {
@@ -86,6 +79,13 @@ namespace Discord.Commands
continue; continue;
} }
//If we're processing an remainder parameter, ignore all other logic
if (curParam != null && curParam.IsRemainder && curPos != endPos)
{
argBuilder.Append(c);
continue;
}
//If we're not currently processing one, are we starting the next argument yet? //If we're not currently processing one, are we starting the next argument yet?
if (curPart == ParserPart.None) if (curPart == ParserPart.None)
{ {
@@ -114,23 +114,6 @@ namespace Discord.Commands
} }
} }
//If this character is escaped, skip it
if (isEscaping)
{
if (curPos != endPos)
{
argBuilder.Append(c);
isEscaping = false;
continue;
}
}
//Are we escaping the next character?
if (c == '\\' && (curParam == null || !curParam.IsRemainder))
{
isEscaping = true;
continue;
}
//Has this parameter ended yet? //Has this parameter ended yet?
string argString = null; string argString = null;
if (curPart == ParserPart.Parameter) if (curPart == ParserPart.Parameter)