Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-11 10:13:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify quoted string argument parsing

Browse Source
This commit is contained in:
RevanProdigalKnight 2022-05-13 21:39:20 -06:00 committed by GitHub
parent 286ab64d67
commit 7a6809f66c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Terminal/Parser.ts
View File

@ -12,8 +12,7 @@ function parseArg(arg: string): string | number | boolean {
return arg === "true"; return arg === "true";
} }
// Strip quotation marks from strings that begin/end with the same mark return arg;
return arg.replace(/^"(.*?)"$/g, "$1").replace(/^'(.*?)'$/g, "$1");
} }
export function ParseCommands(commands: string): string[] { export function ParseCommands(commands: string): string[] {
@ -45,8 +44,7 @@ export function ParseCommand(command: string): (string | number | boolean)[] {
let idx = 0; let idx = 0;
const args = []; const args = [];
// Track depth of quoted strings, e.g.: "the're 'going away' rather 'quickly \"and awkwardly\"'" should be parsed as a single string let lastQuote = "";
const quotes: string[] = [];
let arg = ""; let arg = "";
while (idx < command.length) { while (idx < command.length) {
@ -57,33 +55,20 @@ export function ParseCommand(command: string): (string | number | boolean)[] {
arg += command.charAt(++idx); arg += command.charAt(++idx);
// If the current character is a single- or double-quote mark, add it to the current argument. // If the current character is a single- or double-quote mark, add it to the current argument.
} else if (c === KEY.DOUBLE_QUOTE || c === KEY.QUOTE) { } else if (c === KEY.DOUBLE_QUOTE || c === KEY.QUOTE) {
arg += c; // If we're currently in a quoted string argument and this quote mark is the same as the beginning,
const quote = quotes[quotes.length - 1]; // the string is done
const prev = command.charAt(idx - 1); if (lastQuote !== "" && c === lastQuote) {
const next = command.charAt(idx + 1); lastQuote = "";
// If the previous character is a space or an equal sign this is a valid start to a new string. // Otherwise if we're not in a string argument, we've begun one
// If we're already in a quoted string, push onto the stack of string starts to track depth. } else if (lastQuote === "") {
if ( lastQuote = c;
c !== quote && // Otherwise if we're in a string argument, add the current character to it
(prev === KEY.SPACE || } else {
prev === KEY.EQUAL || arg += c;
(c === KEY.DOUBLE_QUOTE && prev === KEY.QUOTE) ||
(c === KEY.QUOTE && prev === KEY.DOUBLE_QUOTE))
) {
quotes.push(c);
// If the next character is a space and the current character is the same as the previously used
// quotation mark, this is a valid end to a string. Pop off the depth tracker.
} else if (
c === quote &&
(next === KEY.SPACE ||
(c === KEY.DOUBLE_QUOTE && next === KEY.QUOTE) ||
(c === KEY.QUOTE && next === KEY.DOUBLE_QUOTE))
) {
quotes.pop();
} }
// If the current character is a space and we are not inside a string, parse the current argument // If the current character is a space and we are not inside a string, parse the current argument
// and start a new one // and start a new one
} else if (c === KEY.SPACE && quotes.length === 0) { } else if (c === KEY.SPACE && lastQuote === "") {
args.push(parseArg(arg)); args.push(parseArg(arg));
arg = ""; arg = "";