rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve macro argument parsing to allow colons in values

Browse Source 
Enhances separator handling by fixing separator type detection and enabling colon characters within argument values
Updates validation to require at least one argument component and adds error cases for empty arguments
Includes expanded test coverage for mixed separator scenarios and edge cases
This commit is contained in:
Wolfsblvt
2025-03-20 02:25:07 +01:00
parent efa367541a
commit f9d4deb583
2 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/scripts/macros/MacroParser.js
View File

@@ -35,25 +35,23 @@ class MacroParser extends CstParser {
// Arguments Parsing
$.arguments = $.RULE('arguments', () => {
// Remember the separator being used, it needs to stay consistent
/** @type {import('../../lib/chevrotain.js').IToken} */
let separator;
$.OR([
{ ALT: () => separator = $.CONSUME(Tokens.Args.DoubleColon, { LABEL: 'separator' }) },
{ ALT: () => separator = $.CONSUME(Tokens.Args.Colon, { LABEL: 'separator' }) },
{ ALT: () => $.CONSUME(Tokens.Args.DoubleColon, { LABEL: 'separator' }) },
{ ALT: () => $.CONSUME(Tokens.Args.Colon, { LABEL: 'separator' }) },
]);
$.AT_LEAST_ONE_SEP({
SEP: separator.tokenType,
SEP: Tokens.Args.DoubleColon,
DEF: () => $.SUBRULE($.argument),
});
});
$.argument = $.RULE('argument', () => {
$.MANY(() => {
$.AT_LEAST_ONE(() => {
$.OR([
{ ALT: () => $.SUBRULE($.macro) }, // Nested Macros
{ ALT: () => $.CONSUME(Tokens.Identifier) },
{ ALT: () => $.CONSUME(Tokens.Unknown) },
{ ALT: () => $.CONSUME(Tokens.Args.Colon) },
]);
});
});