From 91102cc3b70e65fe2f7380dda960629950c0131e Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sun, 7 Jul 2024 09:22:12 +0900 Subject: [PATCH] fix fixnumber and makearray --- src/ts/parser.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/ts/parser.ts b/src/ts/parser.ts index bf2af1d6..0b081e64 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -1131,9 +1131,9 @@ function basicMatcher (p1:string,matcherArg:matcherArg,vars:{[key:string]:string } case 'tonumber':{ - return makeArray(arra[1].split('').filter((v) => { + return (arra[1].split('').filter((v) => { return !isNaN(Number(v)) || v === '.' - })) + })).join('') } case 'pow':{ return Math.pow(Number(arra[1]), Number(arra[2])).toString() @@ -1594,7 +1594,12 @@ function parseDict(p1:string):{[key:string]:string}{ } function makeArray(p1:string[]):string{ - return JSON.stringify(p1) + return JSON.stringify(p1.map((f) => { + if(typeof(f) === 'string'){ + return f.replace(/::/g, '\\u003A\\u003A') + } + return f + })) } function blockStartMatcher(p1:string,matcherArg:matcherArg):{type:blockMatch,type2?:string,funcArg?:string[]}{