From e2149ced1b96e6825af9a570bccb8c41c8804fd2 Mon Sep 17 00:00:00 2001 From: Kwaroran Date: Sun, 15 Dec 2024 01:00:48 +0900 Subject: [PATCH] Refactor risuChatParser --- src/ts/parser.svelte.ts | 83 +---------------------------------------- 1 file changed, 1 insertion(+), 82 deletions(-) diff --git a/src/ts/parser.svelte.ts b/src/ts/parser.svelte.ts index 12b0528d..48f8f3f5 100644 --- a/src/ts/parser.svelte.ts +++ b/src/ts/parser.svelte.ts @@ -1941,6 +1941,7 @@ export function risuChatParser(da:string, arg:{ callStack: arg.callStack, } + da = da.replace(/\<(user|char|bot)\>/gi, '{{$1}}') const isPureMode = () => { return pureModeNest.size > 0 @@ -1963,15 +1964,6 @@ export function risuChatParser(da:string, arg:{ stackType[nested.length] = 1 break } - case '<':{ - if(stackType[nested.length] === 1){ - nested[0] += da[pointer] - break - } - nested.unshift('') - stackType[nested.length] = 2 - break - } case '#':{ //legacy if statement, deprecated if(da[pointer + 1] !== '}' || nested.length === 1 || stackType[nested.length] !== 1){ @@ -2101,79 +2093,6 @@ export function risuChatParser(da:string, arg:{ } break } - case '>':{ - if(stackType[nested.length] === 1){ - nested[0] += da[pointer] - break - } - if(nested.length === 1 || stackType[nested.length] !== 2){ - break - } - const dat = nested.shift() - if(isPureMode() && pureModeType() !== 'pureSyntax' && pureModeType() !== ''){ - nested[0] += `<${dat}>` - break - } - switch(dat){ - case 'Comment':{ - if(arg.runVar){ - break - } - if(!commentMode){ - thinkingMode = false - commentMode = true - commentLatest = nested.map((f) => f) - if(commentLatest[0].endsWith('\n')){ - commentLatest[0] = commentLatest[0].substring(0, commentLatest[0].length - 1) - } - commentV = new Uint8Array(stackType) - } - break - } - case '/Comment':{ - if(commentMode){ - nested = commentLatest - stackType = commentV - commentMode = false - } - break - } - case 'Thoughts':{ - if(!visualize){ - nested[0] += `<${dat}>` - break - } - if(!commentMode){ - thinkingMode = true - commentMode = true - commentLatest = nested.map((f) => f) - if(commentLatest[0].endsWith('\n')){ - commentLatest[0] = commentLatest[0].substring(0, commentLatest[0].length - 1) - } - commentV = new Uint8Array(stackType) - } - break - } - case '/Thoughts':{ - if(!visualize){ - nested[0] += `<${dat}>` - break - } - if(commentMode){ - nested = commentLatest - stackType = commentV - commentMode = false - } - break - } - default:{ - const mc = isPureMode() ? null : smMatcher(dat, matcherObj) - nested[0] += mc ?? `<${dat}>` - break - } - } - break - } default:{ nested[0] += da[pointer] break