mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Add missing '!=' implementation in calcString

Browse Source
This commit is contained in:
bangonicdd
2025-03-12 10:23:52 +09:00
parent e895c2296c
commit 681846cc93
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ts/process/infunctions.ts
View File

@@ -17,6 +17,7 @@ function toRPN(expression:string) {
'≤': {precedence: 1, associativity: 'Left'}, '≤': {precedence: 1, associativity: 'Left'},
'≥': {precedence: 1, associativity: 'Left'}, '≥': {precedence: 1, associativity: 'Left'},
'=': {precedence: 1, associativity: 'Left'}, '=': {precedence: 1, associativity: 'Left'},
'≠': {precedence: 1, associativity: 'Left'},
'!': {precedence: 5, associativity: 'Right'}, '!': {precedence: 5, associativity: 'Right'},
}; };
const operatorsKeys = Object.keys(operators); const operatorsKeys = Object.keys(operators);
@@ -98,6 +99,7 @@ function calculateRPN(expression:string) {
case '≤': stack.push(a <= b ? 1 : 0); break; case '≤': stack.push(a <= b ? 1 : 0); break;
case '≥': stack.push(a >= b ? 1 : 0); break; case '≥': stack.push(a >= b ? 1 : 0); break;
case '=': stack.push(a === b ? 1 : 0); break; case '=': stack.push(a === b ? 1 : 0); break;
case '≠': stack.push(a !== b ? 1 : 0); break;
case '!': stack.push(b ? 0 : 1); break; case '!': stack.push(b ? 0 : 1); break;
} }
} }
@@ -125,7 +127,14 @@ function executeRPNCalculation(text:string) {
return "0" return "0"
} }
return parsed.toString() return parsed.toString()
}).replace(/&&/g, '&').replace(/\|\|/g, '|').replace(/<=/g, '≤').replace(/>=/g, '≥').replace(/==/g, '=').replace(/null/gi, '0') })
.replace(/&&/g, '&')
.replace(/\|\|/g, '|')
.replace(/<=/g, '≤')
.replace(/>=/g, '≥')
.replace(/==/g, '=')
.replace(/!=/g, '≠')
.replace(/null/gi, '0')
const expression = toRPN(text); const expression = toRPN(text);
const evaluated = calculateRPN(expression); const evaluated = calculateRPN(expression);
return evaluated return evaluated