Use this more in static methods in the src/core/postscript/ folder

Inside of static methods it's possible to reference static fields with `this`, rather than having to spell out the full class name.
This commit is contained in:
Jonas Jenwald 2026-04-05 14:00:47 +02:00
parent ccab310a39
commit 9f9be2c619
4 changed files with 26 additions and 24 deletions

View File

@ -544,7 +544,7 @@ class PSStackToTree {
static #init() { static #init() {
// Binary operator ids — used by _evalOp. // Binary operator ids — used by _evalOp.
PSStackToTree.#binaryOps = new Set([ this.#binaryOps = new Set([
TOKEN.add, TOKEN.add,
TOKEN.sub, TOKEN.sub,
TOKEN.mul, TOKEN.mul,
@ -565,7 +565,7 @@ class PSStackToTree {
TOKEN.bitshift, TOKEN.bitshift,
]); ]);
// Unary operator ids. // Unary operator ids.
PSStackToTree.#unaryOps = new Set([ this.#unaryOps = new Set([
TOKEN.abs, TOKEN.abs,
TOKEN.neg, TOKEN.neg,
TOKEN.ceiling, TOKEN.ceiling,
@ -583,7 +583,7 @@ class PSStackToTree {
]); ]);
// Unary operators where f(f(x)) = f(x) — applying them twice is the same // Unary operators where f(f(x)) = f(x) — applying them twice is the same
// as applying them once. // as applying them once.
PSStackToTree.#idempotentUnary = new Set([ this.#idempotentUnary = new Set([
TOKEN.abs, TOKEN.abs,
TOKEN.ceiling, TOKEN.ceiling,
TOKEN.cvi, TOKEN.cvi,
@ -594,7 +594,7 @@ class PSStackToTree {
]); ]);
// Maps each comparison operator to its logical negation. // Maps each comparison operator to its logical negation.
// Used to simplify not(comparison) → negated-comparison. // Used to simplify not(comparison) → negated-comparison.
PSStackToTree.#negatedComparison = new Map([ this.#negatedComparison = new Map([
[TOKEN.eq, TOKEN.ne], [TOKEN.eq, TOKEN.ne],
[TOKEN.ne, TOKEN.eq], [TOKEN.ne, TOKEN.eq],
[TOKEN.lt, TOKEN.ge], [TOKEN.lt, TOKEN.ge],

View File

@ -327,8 +327,8 @@ class PsJsCompiler {
let ip = 0, let ip = 0,
sp = 0; sp = 0;
const n = ir.length; const n = ir.length;
const stack = PsJsCompiler.#stack; const stack = this.#stack;
const tmp = PsJsCompiler.#tmp; const tmp = this.#tmp;
while (ip < n) { while (ip < n) {
switch (ir[ip++] | 0) { switch (ir[ip++] | 0) {

View File

@ -120,8 +120,8 @@ class Lexer {
operatorSingletons[name] = token; operatorSingletons[name] = token;
} }
} }
Lexer.#singletons = singletons; this.#singletons = singletons;
Lexer.#operatorSingletons = operatorSingletons; this.#operatorSingletons = operatorSingletons;
} }
constructor(data) { constructor(data) {

View File

@ -170,7 +170,7 @@ class PsWasmCompiler {
static #init() { static #init() {
// TOKEN comparison ids → Wasm f64 comparison opcodes (leave i32 on stack). // TOKEN comparison ids → Wasm f64 comparison opcodes (leave i32 on stack).
PsWasmCompiler.#comparisonToOp = new Map([ this.#comparisonToOp = new Map([
[TOKEN.eq, OP.f64_eq], [TOKEN.eq, OP.f64_eq],
[TOKEN.ne, OP.f64_ne], [TOKEN.ne, OP.f64_ne],
[TOKEN.lt, OP.f64_lt], [TOKEN.lt, OP.f64_lt],
@ -179,18 +179,20 @@ class PsWasmCompiler {
[TOKEN.ge, OP.f64_ge], [TOKEN.ge, OP.f64_ge],
]); ]);
// Index of each import function by name. // Index of each import function by name.
PsWasmCompiler.#importIdx = Object.create(null); this.#importIdx = Object.create(null);
for (let i = 0; i < MATH_IMPORTS.length; i++) { for (let i = 0; i < MATH_IMPORTS.length; i++) {
PsWasmCompiler.#importIdx[MATH_IMPORTS[i][0]] = i; this.#importIdx[MATH_IMPORTS[i][0]] = i;
} }
PsWasmCompiler.#degToRad = Math.PI / 180; this.#degToRad = Math.PI / 180;
PsWasmCompiler.#radToDeg = 180 / Math.PI; this.#radToDeg = 180 / Math.PI;
// Import type entries are identical on every compilation — compute once. // Import type entries are identical on every compilation — compute once.
PsWasmCompiler.#importTypeEntries = MATH_IMPORTS.map( this.#importTypeEntries = MATH_IMPORTS.map(([, , , params, results]) => [
([, , , params, results]) => [FUNC_TYPE, ...vec(params), ...vec(results)] FUNC_TYPE,
); ...vec(params),
...vec(results),
]);
// Static Wasm sections that never change between compilations. // Static Wasm sections that never change between compilations.
PsWasmCompiler.#importSection = new Uint8Array( this.#importSection = new Uint8Array(
section( section(
SECTION.import, SECTION.import,
vec( vec(
@ -204,16 +206,16 @@ class PsWasmCompiler {
) )
); );
// One function, type index 0. // One function, type index 0.
PsWasmCompiler.#functionSection = new Uint8Array( this.#functionSection = new Uint8Array(
section(SECTION.function, vec([[0]])) section(SECTION.function, vec([[0]]))
); );
// Min 1 page (64 KiB), no max. // Min 1 page (64 KiB), no max.
// https://webassembly.github.io/spec/core/binary/types.html#binary-limits // https://webassembly.github.io/spec/core/binary/types.html#binary-limits
PsWasmCompiler.#memorySection = new Uint8Array( this.#memorySection = new Uint8Array(
section(SECTION.memory, vec([[0x00, 0x01]])) section(SECTION.memory, vec([[0x00, 0x01]]))
); );
// Export "fn" (func index = nImports) and "mem" (memory) for the wrapper. // Export "fn" (func index = nImports) and "mem" (memory) for the wrapper.
PsWasmCompiler.#exportSection = new Uint8Array( this.#exportSection = new Uint8Array(
section( section(
SECTION.export, SECTION.export,
vec([ vec([
@ -228,7 +230,7 @@ class PsWasmCompiler {
); );
// Wasm binary magic + version (constant). // Wasm binary magic + version (constant).
// https://webassembly.github.io/spec/core/binary/modules.html#binary-magic // https://webassembly.github.io/spec/core/binary/modules.html#binary-magic
PsWasmCompiler.#wasmMagicVersion = new Uint8Array([ this.#wasmMagicVersion = new Uint8Array([
0x00, 0x00,
0x61, 0x61,
0x73, 0x73,
@ -239,9 +241,9 @@ class PsWasmCompiler {
0x00, // version 1 0x00, // version 1
]); ]);
const f64Buf = new ArrayBuffer(8); const f64Buf = new ArrayBuffer(8);
PsWasmCompiler.#f64View = new DataView(f64Buf); this.#f64View = new DataView(f64Buf);
PsWasmCompiler.#f64Arr = new Uint8Array(f64Buf); this.#f64Arr = new Uint8Array(f64Buf);
PsWasmCompiler.#initialized = true; this.#initialized = true;
} }
constructor(domain, range) { constructor(domain, range) {