tla-ts 0.0.3-dev.fe239f8 → 0.0.4-dev.0be9567

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tla-ts",
3
- "version": "0.0.3-dev.fe239f8",
3
+ "version": "0.0.4-dev.0be9567",
4
4
  "description": "A TLA+ interpreter and model checker in TypeScript, 2× faster than TLC",
5
5
  "keywords": [
6
6
  "formal verification",
package/src/ast.ts CHANGED
@@ -34,10 +34,11 @@ export interface StringExpression {
34
34
  }
35
35
 
36
36
  // selectorRanges holds the range of each part of a name such as foo!lab, where SANY reports an
37
- // error in selecting that part.
37
+ // error in selecting that part. spelling holds the text of an operator written as a synonym.
38
38
  export interface IdentifierExpression {
39
39
  kind: "Identifier";
40
40
  name: string;
41
+ spelling?: string;
41
42
  selectorRanges?: SourceRange[];
42
43
  location: SourceLocation;
43
44
  resolution?: LocalResolution;
@@ -53,7 +54,8 @@ export interface ApplyExpression {
53
54
  // The number of args each part of a name like F(x)!l(y) takes, when a part before the last takes
54
55
  // some.
55
56
  argumentCounts?: number[];
56
- // The range of the parenthesized arguments of a named operator, where SANY reports their count.
57
+ // The range of the parenthesized arguments of a named operator, or of the whole name when its
58
+ // last part takes none, where SANY reports their count.
57
59
  argumentsRange?: SourceRange;
58
60
  selectorRanges?: SourceRange[];
59
61
  // The range of the arguments of each part of a name like F(x)!l(y), for a part that takes some.
package/src/codegen.ts CHANGED
@@ -177,7 +177,7 @@ const generateQuantifier = (
177
177
  }, test);
178
178
  const parameters = outer.map((local) => `, ${local}`).join("");
179
179
  generator.helpers.push(
180
- `function ${name}(context, state, next${parameters}) { let primed; ${declarations.join(" ")} ${loops} return ${isForall}; }`,
180
+ `function ${name}(context, state, next${parameters}) { let primed; let applied; ${declarations.join(" ")} ${loops} return ${isForall}; }`,
181
181
  );
182
182
  return `${name}(${frame.context}, ${frame.state}, ${frame.isPrimed ? "undefined" : frame.next}${parameters})`;
183
183
  };
@@ -247,6 +247,23 @@ const isConstructionFree = (
247
247
  }
248
248
  };
249
249
 
250
+ // Whether the generated code evaluates an expression only in the context its frame names. A primed
251
+ // expression doesn't, since it shares the generated function's primed context.
252
+ const isReadOnly = (expression: Expression): boolean => {
253
+ switch (expression.kind) {
254
+ case "Identifier":
255
+ case "Number":
256
+ case "String":
257
+ return true;
258
+ case "FieldAccess":
259
+ return isReadOnly(expression.record);
260
+ case "FunctionApplication":
261
+ return [expression.function, ...expression.args].every(isReadOnly);
262
+ default:
263
+ return false;
264
+ }
265
+ };
266
+
250
267
  const generateExpression = (generator: Generator, expression: Expression, frame: Frame): string => {
251
268
  const generate = (node: Expression, nodeFrame = frame) =>
252
269
  generateExpression(generator, node, nodeFrame);
@@ -287,17 +304,19 @@ const generateExpression = (generator: Generator, expression: Expression, frame:
287
304
  case "FunctionApplication": {
288
305
  keepLazy(expression.function);
289
306
  // The interpreter evaluates a function that may construct one with EvalControl.KeepLazy.
307
+ const keepLazyFrame = { ...frame, context: `keepLazyContext(${frame.context})` };
290
308
  const evaluatedFunction = isConstructionFree(
291
309
  expression.function,
292
310
  frame,
293
311
  generator.environment,
294
312
  )
295
313
  ? generate(expression.function)
296
- : generateDelegate(generator, expression.function, {
297
- ...frame,
298
- context: `keepLazyContext(${frame.context})`,
299
- });
300
- const functionCode = `expectFunction(${evaluatedFunction}, ${addReference(generator, expression)})`;
314
+ : isReadOnly(expression.function)
315
+ ? generate(expression.function, keepLazyFrame)
316
+ : generateDelegate(generator, expression.function, keepLazyFrame);
317
+ // Tool#evalAppl checks that it applies a function before it evaluates the argument. The check
318
+ // is written out, as calling expectFunction for each application costs more.
319
+ const functionCode = `(applied = ${evaluatedFunction}, typeof applied === "object" && (applied.kind === "Function" || applied.kind === "LazyFunction") ? applied : expectFunction(applied, ${addReference(generator, expression)}))`;
301
320
  const describeMissing = getMissingArgumentDescriber(generator.environment.runtime.version);
302
321
  const error = describeMissing ? `, ${addReference(generator, describeMissing)}` : "";
303
322
  if (expression.args.length === 1)
@@ -370,7 +389,7 @@ export const generateEvaluator = (
370
389
  };
371
390
  const body = generateExpression(generator, expression, frame);
372
391
  const referenceNames = generator.references.map((_, index) => `reference${index}`);
373
- const source = `${generator.helpers.join("\n")}\nreturn (context) => { const state = context.state; const next = context.next; let primed; return ${body}; };`;
392
+ const source = `${generator.helpers.join("\n")}\nreturn (context) => { const state = context.state; const next = context.next; let primed; let applied; return ${body}; };`;
374
393
  runtime.value ??= createRuntime();
375
394
  const helpers = runtime.value;
376
395
  const helperNames = Object.keys(helpers);
package/src/config.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { TlaConfigError } from "./errors";
2
- import { matchOperator } from "./lexer";
2
+ import { matchOperator, matchUnicodeToken } from "./lexer";
3
3
  import { formatLexicalError } from "./sany-lexer";
4
4
  import type { TlcVersion } from "./tlc-version";
5
5
 
@@ -168,7 +168,7 @@ const tokenizeConfig = (source: string) => {
168
168
  skip(symbol);
169
169
  continue;
170
170
  }
171
- const operator = matchOperator(source, cursor.index);
171
+ const operator = matchUnicodeToken(source, cursor.index) ?? matchOperator(source, cursor.index);
172
172
  if (!operator) {
173
173
  addLexicalError(cursor.index, "");
174
174
  return tokens;
@@ -57,6 +57,8 @@ import {
57
57
  type Symbols,
58
58
  } from "./resolve";
59
59
  import { createRuntime } from "./runtime";
60
+ import { getSanyStandardModules } from "./sany-modules";
61
+ import { USER_STANDARD_MODULES } from "./tlc-modules";
60
62
  import { getSanyParseError } from "./sany-parse-error";
61
63
  import {
62
64
  CORE_OPERATORS,
@@ -381,6 +383,9 @@ export const createEnvironment = (
381
383
  };
382
384
 
383
385
  const getStandardSymbols = (name: string) => {
386
+ // SANY reads a module from the user's directories before its standard modules.
387
+ if (USER_STANDARD_MODULES.has(name) && options.loadModule?.(name) !== undefined)
388
+ return undefined;
384
389
  const symbols = addStandardModule(name);
385
390
  const dependencies = STANDARD_DEPENDENCIES.get(name) ?? [];
386
391
  if (symbols) useModule(name, dependencies);
@@ -472,6 +477,17 @@ export const createEnvironment = (
472
477
  return cached;
473
478
  }
474
479
  const top = linkTopLevel(loadModule(name, importer));
480
+ // TLC replaces each definition of a module that has a standard module's name with the Java
481
+ // method of that name, so a user's Bags.tla keeps the definitions that Bags has no method for.
482
+ const standardModule = getSanyStandardModules(runtime.version).has(name)
483
+ ? getStandardModule(name, options.print, runtime, options.files, builtins)
484
+ : undefined;
485
+ standardModule?.operators.forEach((operator) => {
486
+ const symbol = top.linked.visible.get(operator.name);
487
+ if (symbol?.kind !== "Definition" || symbol.arity !== operator.arity) return;
488
+ builtins.set(symbol.key, operator);
489
+ definitions.delete(symbol.key);
490
+ });
475
491
  linkedModules.set(name, top.linked);
476
492
  dependencies.set(name, top.closure);
477
493
  useModule(name, top.closure);
@@ -912,9 +928,9 @@ export const createEnvironment = (
912
928
  reports,
913
929
  warnings: scope.warnings,
914
930
  });
931
+ // SANY keeps the first of two symbols of a name.
915
932
  const getSymbolsBefore = (location: SourceLocation): Symbols =>
916
- new Map([
917
- ...visible,
933
+ [
918
934
  ...declarations
919
935
  .filter((declaration) => isBefore(declaration.location, location))
920
936
  .map((declaration): [string, ModuleSymbol] => [
@@ -927,7 +943,10 @@ export const createEnvironment = (
927
943
  definition.name,
928
944
  getDefinitionSymbol(definition),
929
945
  ]),
930
- ]);
946
+ ].reduce(
947
+ (symbols, [name, symbol]) => (symbols.has(name) ? symbols : symbols.set(name, symbol)),
948
+ new Map(visible),
949
+ );
931
950
  // Generator.generateModule reports the errors of a nested module and goes on, and then
932
951
  // SymbolTable.addModule reports a module already defined.
933
952
  const linkNested = (nested: Module) => {
package/src/evaluate.ts CHANGED
@@ -21,7 +21,7 @@ import type { CheckerRuntime } from "./runtime";
21
21
  import { getReadVariables } from "./dependencies";
22
22
  import { contextualApplications, mapChildren, substitutedExpressions } from "./instances";
23
23
  import { prettyPrint } from "./pretty-print";
24
- import { isEnabled } from "./successors";
24
+ import { getReadLocals, isEnabled } from "./successors";
25
25
  import {
26
26
  applyFunction,
27
27
  describeMissingArgument,
@@ -380,7 +380,15 @@ export const expectFunction = (value: Value, application: Expression) => {
380
380
  };
381
381
 
382
382
  export const toKeepLazyContext = (context: Context): Context =>
383
- context.isKeepLazy ? context : { ...context, isKeepLazy: true };
383
+ context.isKeepLazy
384
+ ? context
385
+ : {
386
+ environment: context.environment,
387
+ scope: context.scope,
388
+ state: context.state,
389
+ next: context.next,
390
+ isKeepLazy: true,
391
+ };
384
392
 
385
393
  const withScope = (context: Context, scope: Scope | undefined): Context => ({
386
394
  environment: context.environment,
@@ -578,15 +586,19 @@ interface LazyFunction {
578
586
  scope: Scope | undefined;
579
587
  }
580
588
 
581
- const lazyFunctions = new WeakMap<LazyFunctionValue, LazyFunction>();
589
+ // The function keeps its parameters, body and scope itself, since a WeakMap entry for each
590
+ // short-lived function makes every garbage collection slower.
591
+ interface KeptLazyFunctionValue extends LazyFunctionValue {
592
+ lambda: LazyFunction;
593
+ }
582
594
 
583
- const keepLambda = (lambda: LazyFunction) => {
584
- lazyFunctions.set(lambda.value, lambda);
585
- return lambda.value;
586
- };
595
+ const isKeptLazyFunction = (value: Value): value is KeptLazyFunctionValue =>
596
+ typeof value === "object" && value.kind === "LazyFunction" && "lambda" in value;
597
+
598
+ const keepLambda = (lambda: LazyFunction) => Object.assign(lambda.value, { lambda });
587
599
 
588
600
  export const getLazyFunction = (value: Value) =>
589
- typeof value === "object" && value.kind === "LazyFunction" ? lazyFunctions.get(value) : undefined;
601
+ isKeptLazyFunction(value) ? value.lambda : undefined;
590
602
 
591
603
  // Tool.getFcnContext: the scope of a lazy function's body for the arguments of an application. It
592
604
  // ignores arguments beyond the parameters.
@@ -1375,9 +1387,14 @@ const isStateCached = (expression: Expression, environment: Environment) =>
1375
1387
  getReadVariables(expression, environment) !== undefined &&
1376
1388
  !hasFreeLocals(expression, NO_BOUND_NAMES);
1377
1389
 
1378
- // How to rebuild a set filter TLC evaluates lazily so that its predicate runs in another
1390
+ // A set filter TLC evaluates lazily, with how to rebuild it so that its predicate runs in another
1379
1391
  // environment.
1380
- const filteredSetRebinders = new WeakMap<FilteredSetValue, (environment: Environment) => Value>();
1392
+ interface RebindableFilteredSet extends FilteredSetValue {
1393
+ rebind: (environment: Environment) => Value;
1394
+ }
1395
+
1396
+ const isRebindableFilteredSet = (value: Value): value is RebindableFilteredSet =>
1397
+ typeof value === "object" && value.kind === "FilteredSet" && "rebind" in value;
1381
1398
 
1382
1399
  // TLC's CallStackTool rebinds the lazy values its evaluations return, so their later evaluation
1383
1400
  // records its call stack too.
@@ -1398,11 +1415,7 @@ const traceEvaluator =
1398
1415
  setTrace.callStack = callStack;
1399
1416
  try {
1400
1417
  const computed = evaluator(context);
1401
- const rebind =
1402
- typeof computed === "object" && computed.kind === "FilteredSet"
1403
- ? filteredSetRebinders.get(computed)
1404
- : undefined;
1405
- const value = rebind ? rebind(environment) : computed;
1418
+ const value = isRebindableFilteredSet(computed) ? computed.rebind(environment) : computed;
1406
1419
  callStack.values.set(expression, value);
1407
1420
  if (typeof value === "object" && value.kind !== "FilteredSet" && isSourced(expression)) {
1408
1421
  callStack.sources.set(value, expression);
@@ -1680,52 +1693,180 @@ export const compileArgumentScope = (
1680
1693
  };
1681
1694
 
1682
1695
  interface MemoizedCall {
1696
+ sources: (Expression | undefined)[];
1683
1697
  args: Value[];
1684
1698
  value: Value;
1685
1699
  }
1686
1700
 
1687
1701
  const MEMOIZED_CALL_LIMIT = 1 << 16;
1688
1702
 
1689
- const callMemos = new WeakMap<Closure, { calls: Map<number, MemoizedCall[]>; size: number }>();
1703
+ // A call site that finds fewer than half its calls in a state's memo after this many new ones
1704
+ // stops paying for the lookups.
1705
+ const MEMOIZED_TRIAL_CALLS = 1 << 10;
1706
+
1707
+ interface CallMemo {
1708
+ calls: Map<number, MemoizedCall[]>;
1709
+ size: number;
1710
+ state: Context["state"];
1711
+ }
1712
+
1713
+ interface CallMemos {
1714
+ constant: CallMemo;
1715
+ state: CallMemo;
1716
+ }
1717
+
1718
+ const createCallMemo = (): CallMemo => ({ calls: new Map(), size: 0, state: undefined });
1690
1719
 
1691
- const getCallMemo = (closure: Closure) => {
1720
+ const callMemos = new WeakMap<Closure, CallMemos>();
1721
+
1722
+ const getCallMemos = (closure: Closure) => {
1692
1723
  const cached = callMemos.get(closure);
1693
1724
  if (cached) return cached;
1694
- const memo = { calls: new Map<number, MemoizedCall[]>(), size: 0 };
1695
- callMemos.set(closure, memo);
1696
- return memo;
1725
+ const memos = { constant: createCallMemo(), state: createCallMemo() };
1726
+ callMemos.set(closure, memos);
1727
+ return memos;
1697
1728
  };
1698
1729
 
1699
- const getArgumentValues = (scope: Scope | undefined, arity: number) => {
1700
- const values: Value[] = [];
1701
- for (let current = scope; values.length < arity; current = current?.parent) {
1702
- if (current?.binding.kind !== "Value") return undefined;
1703
- values.push(current.binding.value);
1730
+ const readsExceptAt = (expression: Expression): boolean =>
1731
+ expression.kind === "ExceptAt" || getChildren(expression).some(readsExceptAt);
1732
+
1733
+ // The locals an argument expression reads, when the state and their values decide its value. An @
1734
+ // reads the value its EXCEPT binds.
1735
+ const argumentLocals = new WeakMap<Expression, string[] | false>();
1736
+
1737
+ const getArgumentLocals = (expression: Expression, environment: Environment) => {
1738
+ const cached = argumentLocals.get(expression);
1739
+ if (cached !== undefined) return cached;
1740
+ const locals =
1741
+ getReadVariables(expression, environment) !== undefined &&
1742
+ getReadLocals(expression, NO_BOUND_NAMES);
1743
+ const unique = locals && [
1744
+ ...new Set(readsExceptAt(expression) ? [...locals, EXCEPT_AT] : locals),
1745
+ ];
1746
+ argumentLocals.set(expression, unique ?? false);
1747
+ return unique ?? false;
1748
+ };
1749
+
1750
+ // Hashing a lazy set or function would enumerate it, which TLC does only when it has to.
1751
+ const isEagerValue = (value: Value) =>
1752
+ typeof value !== "object" ||
1753
+ value.kind === "ModelValue" ||
1754
+ value.kind === "Set" ||
1755
+ value.kind === "Function" ||
1756
+ value.kind === "Interval";
1757
+
1758
+ // The key of the call being looked up, copied into the memo only when the call is new. Counts
1759
+ // mark its ends, since shortening an array is slow.
1760
+ const callKey = {
1761
+ sources: [] as (Expression | undefined)[],
1762
+ sourceCount: 0,
1763
+ args: [] as Value[],
1764
+ argCount: 0,
1765
+ hash: 0,
1766
+ isStateKeyed: false,
1767
+ };
1768
+
1769
+ // A model value's rank tells it apart without hashing its name.
1770
+ const getKeyHash = (value: Value) =>
1771
+ typeof value === "object" && value.kind === "ModelValue" ? value.rank : getValueHash(value);
1772
+
1773
+ const pushKeyValue = (value: Value) => {
1774
+ if (!isEagerValue(value)) return false;
1775
+ callKey.sources[callKey.sourceCount++] = undefined;
1776
+ callKey.args[callKey.argCount++] = value;
1777
+ callKey.hash = combineHash(callKey.hash, getKeyHash(value));
1778
+ return true;
1779
+ };
1780
+
1781
+ // An argument TLC has not evaluated yet stands for its expression and the values of the locals it
1782
+ // reads, so a call keeps the laziness of its arguments.
1783
+ const pushKeyExpression = (
1784
+ expression: Expression,
1785
+ locals: string[] | false,
1786
+ scope: Scope | undefined,
1787
+ ) => {
1788
+ if (!locals) return false;
1789
+ callKey.sources[callKey.sourceCount++] = expression;
1790
+ callKey.isStateKeyed = true;
1791
+ for (let index = 0; index < locals.length; index++) {
1792
+ const local = lookupScope(scope, locals[index]);
1793
+ if (local?.kind !== "Value" || !isEagerValue(local.value)) return false;
1794
+ callKey.args[callKey.argCount++] = local.value;
1795
+ callKey.hash = combineHash(callKey.hash, getKeyHash(local.value));
1704
1796
  }
1705
- return values;
1797
+ return true;
1706
1798
  };
1707
1799
 
1708
- const isSameArguments = (left: Value[], right: Value[]) =>
1709
- left.every((value, index) => isSameValue(value, right[index]));
1800
+ // Each argument adds to the key what compileArgumentBinder would bind its parameter to.
1801
+ const compileArgumentKey = (
1802
+ argument: Expression,
1803
+ environment: Environment,
1804
+ ): ((context: Context) => boolean) => {
1805
+ const isLiteral =
1806
+ argument.kind === "String" || (argument.kind === "Number" && isTlcInteger(argument.value));
1807
+ if (isLiteral) return () => pushKeyValue(argument.value);
1808
+ if (argument.kind === "Identifier") {
1809
+ const global = isLocallyResolved(argument)
1810
+ ? undefined
1811
+ : findGlobalName(argument.name, environment);
1812
+ if (global?.kind === "Value") return () => pushKeyValue(global.value);
1813
+ if (global === undefined) {
1814
+ return (context) => {
1815
+ const binding = lookupScope(context.scope, argument.name);
1816
+ if (binding?.kind === "Value") return pushKeyValue(binding.value);
1817
+ if (binding?.kind !== "Thunk" || binding.state !== context.state) return false;
1818
+ return pushKeyExpression(
1819
+ binding.expression,
1820
+ getArgumentLocals(binding.expression, environment),
1821
+ binding.scope,
1822
+ );
1823
+ };
1824
+ }
1825
+ }
1826
+ const locals = getArgumentLocals(argument, environment);
1827
+ return (context) => pushKeyExpression(argument, locals, context.scope);
1828
+ };
1829
+
1830
+ const isKnownCall = (call: MemoizedCall) => {
1831
+ if (call.args.length !== callKey.argCount || call.sources.length !== callKey.sourceCount) {
1832
+ return false;
1833
+ }
1834
+ for (let index = 0; index < callKey.sourceCount; index++) {
1835
+ if (call.sources[index] !== callKey.sources[index]) return false;
1836
+ }
1837
+ for (let index = 0; index < callKey.argCount; index++) {
1838
+ if (!isSameValue(call.args[index], callKey.args[index])) return false;
1839
+ }
1840
+ return true;
1841
+ };
1842
+
1843
+ const findCall = (bucket: MemoizedCall[] | undefined) => {
1844
+ if (bucket === undefined) return undefined;
1845
+ for (let index = 0; index < bucket.length; index++) {
1846
+ if (isKnownCall(bucket[index])) return bucket[index];
1847
+ }
1848
+ return undefined;
1849
+ };
1710
1850
 
1711
- // A constant-level operator without side effects yields the same value for the same arguments,
1712
- // so its calls with evaluated arguments share one result.
1713
- const isMemoizable = (expression: Expression & { kind: "Apply" }, environment: Environment) => {
1851
+ // An operator without side effects yields the same value for the same arguments, a state-level one
1852
+ // in the same state, so its calls share one result.
1853
+ const getMemoizedLevel = (expression: Expression & { kind: "Apply" }, environment: Environment) => {
1714
1854
  const definition = getDefinition(expression.operator, environment);
1715
- return (
1855
+ const isMemoizable =
1716
1856
  definition?.kind === "Operator" &&
1717
1857
  definition.params.length > 0 &&
1718
1858
  definition.params.every((param) => param.arity === 0) &&
1719
- isConstantLevel(definition, environment) &&
1720
- !isImpureDefinition(definition, environment)
1721
- );
1859
+ !isImpureDefinition(definition, environment);
1860
+ if (!isMemoizable) return undefined;
1861
+ if (isConstantLevel(definition, environment)) return "constant";
1862
+ return isStatePure(definition, environment) ? "state" : undefined;
1722
1863
  };
1723
1864
 
1724
1865
  const compileClosureCall = (
1725
1866
  closure: Closure,
1726
1867
  args: Expression[],
1727
1868
  environment: Environment,
1728
- isMemoized: boolean,
1869
+ memoizedLevel: "constant" | "state" | undefined,
1729
1870
  ): Evaluator => {
1730
1871
  const bindArguments = compileArgumentScope(closure, args, environment);
1731
1872
  const compiled = { body: undefined as Evaluator | undefined };
@@ -1739,23 +1880,49 @@ const compileClosureCall = (
1739
1880
  isKeepLazy: context.isKeepLazy,
1740
1881
  });
1741
1882
  };
1742
- if (!isMemoized) return (context) => evaluateBody(bindArguments(context), context);
1743
- const memo = getCallMemo(closure);
1883
+ if (!memoizedLevel || args.length !== closure.params.length) {
1884
+ return (context) => evaluateBody(bindArguments(context), context);
1885
+ }
1886
+ const memos = getCallMemos(closure);
1887
+ const keys = args.map((arg) => compileArgumentKey(arg, environment));
1888
+ const usage = { hits: 0, misses: 0 };
1744
1889
  return (context) => {
1745
- const scope = bindArguments(context);
1746
- const values = getArgumentValues(scope, args.length);
1747
1890
  // A call TLC evaluates with EvalControl.KeepLazy builds what a memoized one wouldn't.
1748
- if (!values || context.isKeepLazy) return evaluateBody(scope, context);
1749
- let hash = values.length;
1750
- for (const value of values) hash = combineHash(hash, getValueHash(value));
1891
+ if (context.isKeepLazy) return evaluateBody(bindArguments(context), context);
1892
+ callKey.sourceCount = 0;
1893
+ callKey.argCount = 0;
1894
+ callKey.hash = args.length;
1895
+ callKey.isStateKeyed = false;
1896
+ for (let index = 0; index < keys.length; index++) {
1897
+ if (!keys[index](context)) return evaluateBody(bindArguments(context), context);
1898
+ }
1899
+ const isStateKeyed = memoizedLevel === "state" || callKey.isStateKeyed;
1900
+ if (isStateKeyed && usage.misses > MEMOIZED_TRIAL_CALLS && usage.hits < usage.misses) {
1901
+ return evaluateBody(bindArguments(context), context);
1902
+ }
1903
+ const memo = isStateKeyed ? memos.state : memos.constant;
1904
+ if (isStateKeyed && memo.state !== context.state) {
1905
+ memo.state = context.state;
1906
+ memo.calls.clear();
1907
+ memo.size = 0;
1908
+ }
1909
+ // A small integer key keeps the Map from boxing it.
1910
+ const hash = callKey.hash & 0x3fffffff;
1751
1911
  const bucket = memo.calls.get(hash);
1752
- const known = bucket?.find((call) => isSameArguments(call.args, values));
1753
- if (known) return known.value;
1754
- const value = evaluateBody(scope, context);
1912
+ const known = findCall(bucket);
1913
+ if (known) {
1914
+ if (isStateKeyed) usage.hits++;
1915
+ return known.value;
1916
+ }
1917
+ if (isStateKeyed) usage.misses++;
1918
+ const sources = callKey.sources.slice(0, callKey.sourceCount);
1919
+ const keyArgs = callKey.args.slice(0, callKey.argCount);
1920
+ const value = evaluateBody(bindArguments(context), context);
1755
1921
  if (memo.size < MEMOIZED_CALL_LIMIT) {
1756
1922
  memo.size++;
1757
- if (bucket) bucket.push({ args: values, value });
1758
- else memo.calls.set(hash, [{ args: values, value }]);
1923
+ const call = { sources, args: keyArgs, value };
1924
+ if (bucket) bucket.push(call);
1925
+ else memo.calls.set(hash, [call]);
1759
1926
  }
1760
1927
  return value;
1761
1928
  };
@@ -1783,8 +1950,10 @@ const compileApply = (
1783
1950
  : resolveGlobalOperator(expression.operator, environment);
1784
1951
  if (global?.kind === "Closure") {
1785
1952
  // The replay records the evaluation of each call, which TLC repeats.
1786
- const isMemoized = !environment.callStack && isMemoizable(expression, environment);
1787
- return compileClosureCall(global, args, environment, isMemoized);
1953
+ const memoizedLevel = environment.callStack
1954
+ ? undefined
1955
+ : getMemoizedLevel(expression, environment);
1956
+ return compileClosureCall(global, args, environment, memoizedLevel);
1788
1957
  }
1789
1958
  if (global?.kind === "Builtin" && global.name === "DOMAIN") {
1790
1959
  const operand = getEvaluator(args[0], environment);
@@ -2069,22 +2238,18 @@ const compileSetComprehension = (
2069
2238
  base: Value,
2070
2239
  context: Context,
2071
2240
  evaluator: Evaluator,
2072
- ): FilteredSetValue => {
2073
- const filtered: FilteredSetValue = {
2074
- kind: "FilteredSet",
2075
- base,
2076
- test: createTest(evaluator, context),
2077
- source,
2078
- };
2079
- filteredSetRebinders.set(filtered, (tracing) =>
2241
+ ): RebindableFilteredSet => ({
2242
+ kind: "FilteredSet",
2243
+ base,
2244
+ test: createTest(evaluator, context),
2245
+ source,
2246
+ rebind: (tracing) =>
2080
2247
  createFiltered(
2081
2248
  base,
2082
2249
  { ...context, environment: tracing },
2083
2250
  getEvaluator(expression.predicate, tracing),
2084
2251
  ),
2085
- );
2086
- return filtered;
2087
- };
2252
+ });
2088
2253
  return (context) => {
2089
2254
  const base = set(context);
2090
2255
  // TLC filters any value it can't enumerate lazily, and fails only when it uses the result.