lee/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter.git synced 2026-09-21 04:36:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(parsely): Make Repeat parser work when no separator is given

Browse Source
This commit is contained in:
Sam Atkins
2024-05-31 15:49:32 +01:00
parent d46b043c5d
commit 9b4d16fbe9
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/phoenix/packages/parsely/parsers/combinators.js
+13 -12
View File
@@ -79,7 +79,7 @@ export class Optional extends Parser {
export class Repeat extends Parser {
_create (value_parser, separator_parser, { trailing = false } = {}) {
this.value_parser = adapt_parser(value_parser);
this.separator_parser = adapt_parser(separator_parser);
this.separator_parser = separator_parser ? adapt_parser(separator_parser) : null;
this.trailing = trailing;
}
@@ -99,22 +99,23 @@ export class Repeat extends Parser {
// Repeatedly parse <separator> <value>
for (;;) {
// Separator
if (!this.separator_parser)
continue;
const separatorResult = this.separator_parser.parse(subStream);
if (separatorResult.status === UNRECOGNIZED)
break;
if (separatorResult.status === INVALID)
return { status: INVALID, value: separatorResult };
stream.join(subStream);
if (!separatorResult.$discard) results.push(separatorResult);
let parsed_separator = false;
if (this.separator_parser) {
const separatorResult = this.separator_parser.parse(subStream);
if (separatorResult.status === UNRECOGNIZED)
break;
if (separatorResult.status === INVALID)
return { status: INVALID, value: separatorResult };
stream.join(subStream);
if (!separatorResult.$discard) results.push(separatorResult);
parsed_separator = true;
}
// Value
const result = this.value_parser.parse(subStream);
if (result.status === UNRECOGNIZED) {
// If we failed to parse a value, we have a trailing separator
if (this.trailing === false)
if (parsed_separator && this.trailing === false)
return { status: INVALID, value: result };
break;
}