Horizontal42/summarum
1
0
Fork 0
mirror of https://github.com/Horizontal42/summarum.git synced 2026-11-10 20:21:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

extract asPercentValue in evalPctOp

Browse source 
The percent-or-scalar-as-percent conversion was written out twice
verbatim in the same function.
This commit is contained in:
Horizontal42 2026-08-12 20:05:44 +03:00
parent 573b06e245
commit 93acfab28c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/engine/evaluator.ts
View file

@ -243,6 +243,11 @@ function evalBit(op: string, l: Value, r: Value): Value {
return qty(new Decimal(out.toString()), null, repr); return qty(new Decimal(out.toString()), null, repr);
} }
/** l already a percent -> its value; otherwise treat the scalar as a whole-number percent. */
function asPercentValue(l: Value): Decimal {
return l.kind === "percent" ? l.value : asScalar(l).mul(100);
}
function evalPctOp(op: string, l: Value, r: Value): Value { function evalPctOp(op: string, l: Value, r: Value): Value {
const rq = r.kind === "quantity" ? r : null; const rq = r.kind === "quantity" ? r : null;
const rv = r.kind === "percent" ? r.value.div(100) : rq ? rq.value : null; const rv = r.kind === "percent" ? r.value.div(100) : rq ? rq.value : null;
@ -250,7 +255,7 @@ function evalPctOp(op: string, l: Value, r: Value): Value {
const unit = rq?.unit ?? null; const unit = rq?.unit ?? null;
if (op === "of" || op === "off" || op === "on") { if (op === "of" || op === "off" || op === "on") {
const p = l.kind === "percent" ? l.value : asScalar(l).mul(100); const p = asPercentValue(l);
const factor = const factor =
op === "of" ? p.div(100) op === "of" ? p.div(100)
: op === "off" ? new Decimal(1).sub(p.div(100)) : op === "off" ? new Decimal(1).sub(p.div(100))
@ -269,7 +274,7 @@ function evalPctOp(op: string, l: Value, r: Value): Value {
} }
} }
// "20% of what is 30" // "20% of what is 30"
const p = l.kind === "percent" ? l.value : asScalar(l).mul(100); const p = asPercentValue(l);
switch (op) { switch (op) {
case "of_what_is": return qty(rv.div(p.div(100)), unit); case "of_what_is": return qty(rv.div(p.div(100)), unit);
case "off_what_is": { case "off_what_is": {