tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa
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/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +54 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -2
- package/dist/index.d.ts +3 -2
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +60 -60
- package/dist/prove.js +78 -78
- package/dist/run.cjs +42 -44
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -43
- package/dist/transfer.js +39 -39
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +1 -0
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +1 -1
- package/src/check-trace.ts +90 -51
- package/src/check.ts +367 -178
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +1 -2
- package/src/cli/tlc.ts +16 -10
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +26 -9
- package/src/dependencies.ts +49 -9
- package/src/dfid.ts +22 -10
- package/src/environment.ts +58 -33
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +117 -41
- package/src/exit-codes.ts +4 -2
- package/src/instances.ts +5 -5
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +81 -33
- package/src/liveness.ts +49 -11
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +112 -145
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +169 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +63 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +32 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +47 -9
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -11
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/expr2polynomial.ts +204 -79
- package/src/prover/smt/solver/factor.ts +36 -14
- package/src/prover/smt/solver/fd-solver.ts +2 -0
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +10 -4
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +1 -1
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- package/src/prover/smt/solver/nlqsat.ts +1 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
- package/src/prover/smt/solver/nlsat/explain.ts +375 -217
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
- package/src/prover/smt/solver/nlsat/solver.ts +74 -64
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/opt-context.ts +20 -7
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +9 -5
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +16 -6
- package/src/prover/smt/solver/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +4 -0
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
- package/src/prover/smt/solver/sat/sat-tactic.ts +13 -5
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +25 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +2 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-kernel.ts +39 -5
- package/src/prover/smt/solver/smt-setup.ts +96 -10
- package/src/prover/smt/solver/smtlib-parser.ts +584 -223
- package/src/prover/smt/solver/smtlib-script.ts +509 -154
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +284 -168
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +959 -243
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/lexer.ts +3 -3
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +166 -101
- package/src/simulate.ts +110 -50
- package/src/spec-description.ts +5 -6
- package/src/standard-modules.ts +15 -6
- package/src/subexpressions.ts +398 -108
- package/src/successors.ts +4 -2
- package/src/symmetry.ts +1 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +3 -2
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +44 -15
- package/src/tlc/trace-spec.ts +9 -22
- package/src/typed-tier.ts +32 -25
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
package/src/successors.ts
CHANGED
|
@@ -723,6 +723,7 @@ const compileIdentifier = (
|
|
|
723
723
|
!definition ||
|
|
724
724
|
(expression.location.range && getStartupValue(definition, environment) !== undefined)
|
|
725
725
|
) {
|
|
726
|
+
// Deviation from TLC: Tool#getInitStates prints an unassigned variable's declaration as the non-boolean value it found.
|
|
726
727
|
guard(run, scope, partial, action, isFixed, onComplete);
|
|
727
728
|
return;
|
|
728
729
|
}
|
|
@@ -1340,6 +1341,7 @@ export const hasIncompleteSuccessor = (
|
|
|
1340
1341
|
generator: undefined,
|
|
1341
1342
|
successors: 0,
|
|
1342
1343
|
};
|
|
1344
|
+
// TLC's Tool#getState generates every successor of the action before it compares them.
|
|
1343
1345
|
getRunner(expression, environment, false)(
|
|
1344
1346
|
run,
|
|
1345
1347
|
scope,
|
|
@@ -1347,10 +1349,10 @@ export const hasIncompleteSuccessor = (
|
|
|
1347
1349
|
undefined,
|
|
1348
1350
|
false,
|
|
1349
1351
|
(partial) => {
|
|
1350
|
-
if (!isComplete(partial)) run.
|
|
1352
|
+
if (!isComplete(partial)) run.successors++;
|
|
1351
1353
|
},
|
|
1352
1354
|
);
|
|
1353
|
-
return run.
|
|
1355
|
+
return run.successors > 0;
|
|
1354
1356
|
};
|
|
1355
1357
|
|
|
1356
1358
|
export const getSuccessors = (
|
package/src/symmetry.ts
CHANGED
package/src/tlc/jar-data.ts
CHANGED
|
@@ -143,6 +143,16 @@ export const SANY_OPERATOR_SYNONYMS = [
|
|
|
143
143
|
["^+", "⁺"],
|
|
144
144
|
];
|
|
145
145
|
|
|
146
|
+
const SYNONYMS = new Map(
|
|
147
|
+
SANY_OPERATOR_SYNONYMS.flatMap((names) => names.slice(1).map((synonym) => [synonym, names[0]])),
|
|
148
|
+
);
|
|
149
|
+
|
|
150
|
+
export const resolveSynonym = (name: string) =>
|
|
151
|
+
name
|
|
152
|
+
.split("!")
|
|
153
|
+
.map((part) => SYNONYMS.get(part) ?? (part === "~" ? "\\lnot" : part))
|
|
154
|
+
.join("!");
|
|
155
|
+
|
|
146
156
|
export const TLC_STARTUP_STRINGS = [
|
|
147
157
|
"STRING",
|
|
148
158
|
"FALSE",
|
package/src/tlc/messages.ts
CHANGED
|
@@ -345,14 +345,14 @@ interface CodedMessage {
|
|
|
345
345
|
let codedMessagePatterns: { pattern: RegExp; message: CodedMessage }[] | undefined;
|
|
346
346
|
|
|
347
347
|
const getCodedMessagePatterns = () =>
|
|
348
|
-
(codedMessagePatterns ??= CODED_MESSAGES.map((
|
|
348
|
+
(codedMessagePatterns ??= CODED_MESSAGES.map((codedMessage) => ({
|
|
349
349
|
pattern: new RegExp(
|
|
350
|
-
`^${
|
|
350
|
+
`^${codedMessage[1]
|
|
351
351
|
.split(/%\d+%/)
|
|
352
352
|
.map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
|
|
353
353
|
.join("[\\s\\S]*")}$`,
|
|
354
354
|
),
|
|
355
|
-
message: { code, isEvalException },
|
|
355
|
+
message: { code: codedMessage[0], isEvalException: codedMessage[2] },
|
|
356
356
|
})));
|
|
357
357
|
|
|
358
358
|
const UNCODED_MESSAGE_PATTERN =
|
package/src/tlc/order.ts
CHANGED
|
@@ -444,7 +444,11 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
444
444
|
};
|
|
445
445
|
};
|
|
446
446
|
|
|
447
|
-
const getStringOrder = (
|
|
447
|
+
const getStringOrder = (
|
|
448
|
+
getParsed: ModuleSet,
|
|
449
|
+
config: ModelConfig,
|
|
450
|
+
runtimeModules: string[],
|
|
451
|
+
): string[] => {
|
|
448
452
|
const order = new Set<string>();
|
|
449
453
|
const intern = (text: string) => {
|
|
450
454
|
order.add(text);
|
|
@@ -541,12 +545,19 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
541
545
|
});
|
|
542
546
|
};
|
|
543
547
|
analyze(undefined);
|
|
548
|
+
runtimeModules.forEach((name) => {
|
|
549
|
+
const tokens = getUnitTokens(name);
|
|
550
|
+
getParsedTexts(tokens).forEach(intern);
|
|
551
|
+
tokens.forEach((token) => {
|
|
552
|
+
if (token.kind === "String") intern(token.text);
|
|
553
|
+
});
|
|
554
|
+
});
|
|
544
555
|
TLC_RUNTIME_STRINGS.forEach(intern);
|
|
545
556
|
return [...order];
|
|
546
557
|
};
|
|
547
558
|
|
|
548
559
|
export interface TlcOrder {
|
|
549
|
-
getStringOrder: (config: ModelConfig) => string[];
|
|
560
|
+
getStringOrder: (config: ModelConfig, runtimeModules: string[]) => string[];
|
|
550
561
|
getDeclarationOrder: (kind: "variable" | "constant") => string[];
|
|
551
562
|
createDefinitionOrder: () => (name: string | undefined) => string[];
|
|
552
563
|
parseModule: (source: string) => Module;
|
|
@@ -558,7 +569,7 @@ export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrd
|
|
|
558
569
|
let contexts: ReturnType<typeof createContexts> | undefined;
|
|
559
570
|
const getContexts = () => (contexts ??= createContexts(getParsed));
|
|
560
571
|
return {
|
|
561
|
-
getStringOrder: (config) => getStringOrder(getParsed, config),
|
|
572
|
+
getStringOrder: (config, runtimeModules) => getStringOrder(getParsed, config, runtimeModules),
|
|
562
573
|
getDeclarationOrder: (kind) =>
|
|
563
574
|
getContexts()
|
|
564
575
|
.getContext(undefined)
|
package/src/tlc/random.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { toEnumeratedSet } from "../builtins";
|
|
2
2
|
import { TlaEvaluationError } from "../errors";
|
|
3
|
+
import { prettyPrint } from "../pretty-print";
|
|
3
4
|
import type { TlcVersion } from "./version";
|
|
4
5
|
import {
|
|
5
6
|
createRecord,
|
|
@@ -226,7 +227,7 @@ export const getRandomElement = (set: Value, random: JavaRandom): Value => {
|
|
|
226
227
|
const offset = Math.floor(random.nextDouble() * size);
|
|
227
228
|
if (offset >= size) {
|
|
228
229
|
throw new TlaEvaluationError(
|
|
229
|
-
`Attempted to retrieve out-of-bounds element from the interval value ${formatValue(set)}.`,
|
|
230
|
+
`Attempted to retrieve out-of-bounds element from the interval value ${prettyPrint(formatValue(set))}.`,
|
|
230
231
|
);
|
|
231
232
|
}
|
|
232
233
|
return set.low + offset;
|
package/src/tlc/replay.ts
CHANGED
|
@@ -799,9 +799,10 @@ export const replayEnabled = (
|
|
|
799
799
|
state: Value[],
|
|
800
800
|
environment: Environment,
|
|
801
801
|
) => {
|
|
802
|
-
const
|
|
802
|
+
const found = () => {
|
|
803
803
|
throw ENABLED_FOUND;
|
|
804
|
-
}
|
|
804
|
+
};
|
|
805
|
+
const replay = createReplay(environment, "enabled", state, found, found);
|
|
805
806
|
const callStack = replay.callStack;
|
|
806
807
|
const depth = callStack?.expressions.length ?? 0;
|
|
807
808
|
try {
|
package/src/tlc/tlc-operators.ts
CHANGED
|
@@ -16,12 +16,13 @@ import {
|
|
|
16
16
|
toEnumeratedSet,
|
|
17
17
|
} from "../builtins";
|
|
18
18
|
import { getNamedRegisters, NAMED_REGISTER_PREFIX, type CheckerRuntime } from "../runtime";
|
|
19
|
-
import { createActionRecord, setTlcValue } from "./tlcext-operators";
|
|
19
|
+
import { createActionRecord, createTlcRecord, setTlcValue } from "./tlcext-operators";
|
|
20
20
|
import { getRandomElement } from "./random";
|
|
21
21
|
import {
|
|
22
22
|
ANY_SET,
|
|
23
23
|
createFunction,
|
|
24
24
|
createSet,
|
|
25
|
+
createSortedFunction,
|
|
25
26
|
createTuple,
|
|
26
27
|
createWrittenFunction,
|
|
27
28
|
formatNormalizedCopies,
|
|
@@ -34,7 +35,6 @@ import {
|
|
|
34
35
|
toFiniteSet,
|
|
35
36
|
type Value,
|
|
36
37
|
rankString,
|
|
37
|
-
setFunctionClass,
|
|
38
38
|
} from "../values";
|
|
39
39
|
import { getFingerprintPolynomial } from "./fingerprint";
|
|
40
40
|
import { zeroPad } from "./messages";
|
|
@@ -43,10 +43,9 @@ const formatCalendarVersion = (date: Date) =>
|
|
|
43
43
|
`${date.getUTCFullYear()}.${zeroPad(date.getUTCMonth() + 1)}.${zeroPad(date.getUTCDate())}.${zeroPad(date.getUTCHours())}${zeroPad(date.getUTCMinutes())}${zeroPad(date.getUTCSeconds())}`;
|
|
44
44
|
|
|
45
45
|
const getRegisterFunction = <Key extends Value>(registers: Map<Key, Value>) =>
|
|
46
|
-
createFunction(
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
setFunctionClass(createWrittenFunction(fields), "record");
|
|
46
|
+
createFunction(
|
|
47
|
+
[...registers].map((entry): [Value, Value] => [entry[0], createTuple([entry[1]])]),
|
|
48
|
+
);
|
|
50
49
|
|
|
51
50
|
const CHECKER_KEYS = new Set(["diameter", "generated", "distinct", "queue", "stats", "config"]);
|
|
52
51
|
const TLC_174_KEYS = new Set(["diameter", "distinct", "queue", "duration", "level"]);
|
|
@@ -133,7 +132,7 @@ const getTlcValue = (runtime: CheckerRuntime, key: Value, context: Context | und
|
|
|
133
132
|
}
|
|
134
133
|
if (typeof key !== "string") {
|
|
135
134
|
throw new TlaModuleError(
|
|
136
|
-
`The argument of TLCGet should be a nonnegative integer, but instead it is:\n${formatValue(key)}`,
|
|
135
|
+
`The argument of TLCGet should be a nonnegative integer, but instead it is:\n${prettyPrint(formatValue(key))}`,
|
|
137
136
|
);
|
|
138
137
|
}
|
|
139
138
|
return getRuntimeValue(runtime, key, context?.state);
|
|
@@ -160,8 +159,11 @@ const normalizeDeeply = (value: Value): void => {
|
|
|
160
159
|
const convertLikeTlcEval = (value: Value): Value => {
|
|
161
160
|
if (typeof value !== "object") return value;
|
|
162
161
|
switch (value.kind) {
|
|
163
|
-
case "ModelValue":
|
|
164
162
|
case "Function":
|
|
163
|
+
return value.functionClass === undefined
|
|
164
|
+
? value
|
|
165
|
+
: createSortedFunction(value.domain, value.range);
|
|
166
|
+
case "ModelValue":
|
|
165
167
|
case "MixedSet":
|
|
166
168
|
case "InfiniteSet":
|
|
167
169
|
case "SequenceSet":
|
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
TlaUnsupportedError,
|
|
16
16
|
} from "../errors";
|
|
17
17
|
import { getTlcFingerprint } from "./fingerprint";
|
|
18
|
+
import { prettyPrint } from "../pretty-print";
|
|
18
19
|
import { formatMessage, formatNestedMessage, MESSAGE_CODE, MESSAGE_LEVEL } from "./messages";
|
|
19
20
|
import {
|
|
20
21
|
describeRange,
|
|
@@ -37,11 +38,14 @@ import {
|
|
|
37
38
|
createRecord,
|
|
38
39
|
createSet,
|
|
39
40
|
createTuple,
|
|
41
|
+
createWrittenFunction,
|
|
40
42
|
formatState,
|
|
41
43
|
formatValue,
|
|
42
44
|
getFingerprintError,
|
|
43
45
|
getSequenceElements,
|
|
44
46
|
getValueKey,
|
|
47
|
+
rankString,
|
|
48
|
+
setFunctionClass,
|
|
45
49
|
toFiniteSet,
|
|
46
50
|
type Value,
|
|
47
51
|
} from "../values";
|
|
@@ -63,19 +67,31 @@ export const createActionRecord = (action: string | undefined) =>
|
|
|
63
67
|
|
|
64
68
|
const counterExamples = new WeakSet<Value & object>();
|
|
65
69
|
|
|
66
|
-
const
|
|
67
|
-
|
|
70
|
+
export const createTlcRecord = (fields: [string, Value][]) =>
|
|
71
|
+
setFunctionClass(createWrittenFunction(fields), "record");
|
|
72
|
+
|
|
73
|
+
const createCounterExampleRecord = (action: Value[], states: Value[], isConsole = true) => {
|
|
74
|
+
// TLC's CounterExample interns its field names as the class loads, which orders them as strings.
|
|
75
|
+
["state", "action", "console"].forEach(rankString);
|
|
76
|
+
const fields: [string, Value][] = [
|
|
68
77
|
["action", createSet(action)],
|
|
69
78
|
["state", createSet(states)],
|
|
70
|
-
]
|
|
79
|
+
];
|
|
80
|
+
const counterExample = createTlcRecord(isConsole ? fields : [...fields, ["console", false]]);
|
|
71
81
|
counterExamples.add(counterExample);
|
|
72
82
|
return counterExample;
|
|
73
83
|
};
|
|
74
84
|
|
|
85
|
+
export interface CounterExampleLoop {
|
|
86
|
+
start: number;
|
|
87
|
+
action: Value;
|
|
88
|
+
}
|
|
89
|
+
|
|
75
90
|
export const createCounterExample = (
|
|
76
91
|
stateRecords: Record<string, Value>[],
|
|
77
92
|
actions: Value[],
|
|
78
|
-
loop:
|
|
93
|
+
loop: CounterExampleLoop | undefined,
|
|
94
|
+
isConsole = true,
|
|
79
95
|
) => {
|
|
80
96
|
const states = stateRecords.map((state, index) =>
|
|
81
97
|
createTuple([index + 1, createRecord(Object.entries(state))]),
|
|
@@ -86,7 +102,7 @@ export const createCounterExample = (
|
|
|
86
102
|
const closing = loop
|
|
87
103
|
? [createTuple([states[states.length - 1], loop.action, states[loop.start]])]
|
|
88
104
|
: [];
|
|
89
|
-
return createCounterExampleRecord([...steps, ...closing], states);
|
|
105
|
+
return createCounterExampleRecord([...steps, ...closing], states, isConsole);
|
|
90
106
|
};
|
|
91
107
|
|
|
92
108
|
const getRegister = (runtime: CheckerRuntime, key: Value) => {
|
|
@@ -126,7 +142,7 @@ export const setTlcValue = (
|
|
|
126
142
|
return;
|
|
127
143
|
}
|
|
128
144
|
throw new TlaModuleError(
|
|
129
|
-
`The first argument of TLCSet should be a nonnegative integer, but instead it is:\n${formatValue(key)}`,
|
|
145
|
+
`The first argument of TLCSet should be a nonnegative integer, but instead it is:\n${prettyPrint(formatValue(key))}`,
|
|
130
146
|
);
|
|
131
147
|
};
|
|
132
148
|
|
|
@@ -232,7 +248,7 @@ export const createTlcExtOperators = (
|
|
|
232
248
|
const counterExample = getValue(args, 0, "ToTrace");
|
|
233
249
|
if (typeof counterExample !== "object" || !counterExamples.has(counterExample)) {
|
|
234
250
|
throw new TlaModuleError(
|
|
235
|
-
`The argument of ToTrace should be a CounterExample, but instead it is:\n${formatValue(counterExample)}`,
|
|
251
|
+
`The argument of ToTrace should be a CounterExample, but instead it is:\n${prettyPrint(formatValue(counterExample))}`,
|
|
236
252
|
);
|
|
237
253
|
}
|
|
238
254
|
const states = toFiniteSet(applyFunction(counterExample, "state")).elements.map(
|
|
@@ -246,7 +262,7 @@ export const createTlcExtOperators = (
|
|
|
246
262
|
const name = getValue(args, 0, "TLCModelValue");
|
|
247
263
|
if (typeof name !== "string") {
|
|
248
264
|
throw new TlaModuleError(
|
|
249
|
-
`The argument of ModelValue should be a string, but instead it is:\n${formatValue(name)}`,
|
|
265
|
+
`The argument of ModelValue should be a string, but instead it is:\n${prettyPrint(formatValue(name))}`,
|
|
250
266
|
);
|
|
251
267
|
}
|
|
252
268
|
return createModelValue(name);
|
|
@@ -263,10 +279,13 @@ export const createTlcExtOperators = (
|
|
|
263
279
|
defineOperator("TLCNoOp", 1, (args) => getValue(args, 0, "TLCNoOp")),
|
|
264
280
|
{
|
|
265
281
|
...defineLazyOperator("PickSuccessor", 1, (args, context) => {
|
|
266
|
-
// Deviation from TLC: TLCExt#pickSuccessor fingerprints a partial successor and fails, where TLCExt.tla promises TRUE.
|
|
267
282
|
const next = context?.next ?? (context?.environment.variables ?? []).map(() => undefined);
|
|
268
|
-
|
|
269
|
-
if (
|
|
283
|
+
// A simulation remembers no states, so TLC evaluates the guard before it looks at the successor.
|
|
284
|
+
if (runtime.getSimulationValue === undefined) {
|
|
285
|
+
// Deviation from TLC: TLCExt#pickSuccessor fingerprints a partial successor and fails, where TLCExt.tla promises TRUE.
|
|
286
|
+
if (!isCompleteState(next)) return true;
|
|
287
|
+
if (context?.next && runtime.isSeen(next)) return true;
|
|
288
|
+
}
|
|
270
289
|
const guard = getOperator(args, 0, "PickSuccessor");
|
|
271
290
|
const isPicked = guard.call([]);
|
|
272
291
|
if (typeof isPicked !== "boolean") {
|
|
@@ -274,7 +293,13 @@ export const createTlcExtOperators = (
|
|
|
274
293
|
`In evaluating TLCExt!PickSuccessor, a non-boolean expression (${getKindString(isPicked)}) was used as the condition of an IF.\n${guard.expression ? describeNode(guard.expression) : ""}`,
|
|
275
294
|
);
|
|
276
295
|
}
|
|
277
|
-
if (
|
|
296
|
+
if (
|
|
297
|
+
isPicked ||
|
|
298
|
+
!context?.next ||
|
|
299
|
+
!isCompleteState(next) ||
|
|
300
|
+
!context.state ||
|
|
301
|
+
!isCompleteState(context.state)
|
|
302
|
+
) {
|
|
278
303
|
return true;
|
|
279
304
|
}
|
|
280
305
|
const state = context.state;
|
|
@@ -303,9 +328,13 @@ export const createTlcExtOperators = (
|
|
|
303
328
|
} else if (answer[0] === "d") {
|
|
304
329
|
printOverride(formatState(runtime.toRecord(next), runtime.toRecord(state)));
|
|
305
330
|
} else if (answer[0] === "e") {
|
|
331
|
+
if (runtime.markExplored) {
|
|
332
|
+
runtime.markExplored(next);
|
|
333
|
+
return true;
|
|
334
|
+
}
|
|
306
335
|
if (runtime.getSimulationValue === undefined) {
|
|
307
336
|
throw new TlaUnsupportedError(
|
|
308
|
-
"tla-ts can't mark a state explored while it
|
|
337
|
+
"tla-ts can't mark a state explored while it searches depth first.",
|
|
309
338
|
);
|
|
310
339
|
}
|
|
311
340
|
printOverride(
|
|
@@ -348,7 +377,7 @@ export const createTlcExtOperators = (
|
|
|
348
377
|
const name = getThunk(args, 0, "TLCEvalDefinition")();
|
|
349
378
|
if (typeof name !== "string") {
|
|
350
379
|
throw new TlaModuleError(
|
|
351
|
-
`The argument of TLCEvalDefinition should be a string, but instead it is:\n${formatValue(name)}`,
|
|
380
|
+
`The argument of TLCEvalDefinition should be a string, but instead it is:\n${prettyPrint(formatValue(name))}`,
|
|
352
381
|
);
|
|
353
382
|
}
|
|
354
383
|
const definition = context ? getDefinition(name, context.environment) : undefined;
|
|
@@ -356,7 +385,7 @@ export const createTlcExtOperators = (
|
|
|
356
385
|
if (builtin?.arity === 0) return builtin.evaluate([], context);
|
|
357
386
|
if (!definition || !context) {
|
|
358
387
|
throw new TlaModuleError(
|
|
359
|
-
`The argument of TLCEvalDefinition should be a name of a definition reachable from the root module, but instead it is:\n${formatValue(name)}`,
|
|
388
|
+
`The argument of TLCEvalDefinition should be a name of a definition reachable from the root module, but instead it is:\n${prettyPrint(formatValue(name))}`,
|
|
360
389
|
);
|
|
361
390
|
}
|
|
362
391
|
if (definition.kind === "Operator" && definition.params.length > 0) {
|
package/src/tlc/trace-spec.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getHashMapOrder } from "../java-hash";
|
|
2
2
|
import { formatValue, type Value } from "../values";
|
|
3
3
|
import { zeroPad } from "./messages";
|
|
4
4
|
|
|
@@ -18,20 +18,6 @@ const CLOSING_TAG = `${"=".repeat(77)}\n`;
|
|
|
18
18
|
const LASSO_START = "_TTraceLassoStart";
|
|
19
19
|
const LASSO_END = "_TTraceLassoEnd";
|
|
20
20
|
|
|
21
|
-
const getHashMapHash = (text: string) => {
|
|
22
|
-
const hash = getJavaHashCode(text);
|
|
23
|
-
return hash ^ (hash >>> 16);
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
const getHashOrder = (names: string[]) => {
|
|
27
|
-
const unique = [...new Set(names)];
|
|
28
|
-
const capacity = 2 ** Math.max(4, Math.ceil(Math.log2(unique.length / 0.75)));
|
|
29
|
-
return unique
|
|
30
|
-
.map((name, index) => ({ name, index, bucket: getHashMapHash(name) & (capacity - 1) }))
|
|
31
|
-
.sort((left, right) => left.bucket - right.bucket || left.index - right.index)
|
|
32
|
-
.map((entry) => entry.name);
|
|
33
|
-
};
|
|
34
|
-
|
|
35
21
|
const formatJavaDate = (date: Date) => {
|
|
36
22
|
const getPart = (options: Intl.DateTimeFormatOptions, type: Intl.DateTimeFormatPartTypes) =>
|
|
37
23
|
new Intl.DateTimeFormat("en-US", options).formatToParts(date).find((part) => part.type === type)
|
|
@@ -57,7 +43,7 @@ const getConjunction = (state: [string, string][], prefix?: string) =>
|
|
|
57
43
|
indent(
|
|
58
44
|
[
|
|
59
45
|
...(prefix === undefined ? [] : [prefix]),
|
|
60
|
-
...state.map((
|
|
46
|
+
...state.map((assignment) => `${assignment[0]} = (${assignment[1]})`),
|
|
61
47
|
].join("\n/\\\n"),
|
|
62
48
|
2,
|
|
63
49
|
);
|
|
@@ -102,7 +88,7 @@ ${examples}`;
|
|
|
102
88
|
export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
103
89
|
const loopStart = input.loopStart;
|
|
104
90
|
const states = input.states.map((state) =>
|
|
105
|
-
|
|
91
|
+
getHashMapOrder(Object.keys(state)).map((name): [string, string] => [
|
|
106
92
|
name,
|
|
107
93
|
formatValue(state[name]),
|
|
108
94
|
]),
|
|
@@ -127,11 +113,11 @@ export const writeTraceSpec = (input: TraceSpecInput) => {
|
|
|
127
113
|
...(isLasso ? [LASSO_START, LASSO_END] : []),
|
|
128
114
|
];
|
|
129
115
|
const teConstantsModule = `${specName}_TEConstants`;
|
|
130
|
-
const constantModules =
|
|
116
|
+
const constantModules = getHashMapOrder([
|
|
131
117
|
"TLC",
|
|
132
118
|
...(teConstants.length > 0 ? [teConstantsModule] : []),
|
|
133
119
|
]);
|
|
134
|
-
const extendedModules =
|
|
120
|
+
const extendedModules = getHashMapOrder([
|
|
135
121
|
"Toolbox",
|
|
136
122
|
"TLCExt",
|
|
137
123
|
"Naturals",
|
|
@@ -187,10 +173,11 @@ ${lassoStep}${variables
|
|
|
187
173
|
definition: `\n_view ==\n${INDENT}<<${variables.join(", ")}, IF TLCGet("level") = ${LASSO_END} + 1 THEN ${LASSO_START} ELSE TLCGet("level")>>\n`,
|
|
188
174
|
}
|
|
189
175
|
: { config: "", definition: "" };
|
|
190
|
-
const deserializedTrace = `\n${getPrimer(traceModule,
|
|
176
|
+
const deserializedTrace = `\n${getPrimer(traceModule, getHashMapOrder(["IOUtils", ...constantModules, specName]))}trace == IODeserialize("${input.module}.bin", TRUE)\n\n${CLOSING_TAG}`;
|
|
191
177
|
const traceFunction = `${INDENT}<<\n${states
|
|
192
178
|
.map(
|
|
193
|
-
(state) =>
|
|
179
|
+
(state) =>
|
|
180
|
+
`${INDENT}([${state.map((assignment) => `${assignment[0]} |-> ${assignment[1]}`).join(",")}])`,
|
|
194
181
|
)
|
|
195
182
|
.join(",\n")}\n${INDENT}>>${SEPARATOR}\n`;
|
|
196
183
|
|
|
@@ -217,7 +204,7 @@ ${lassoStep}${variables
|
|
|
217
204
|
" In this case, it is advised to uncomment the module below to deserialize the\n",
|
|
218
205
|
" trace from a generated binary file.\n",
|
|
219
206
|
`\n\\*${deserializedTrace.replaceAll("\n", "\n\\*")}\n\n`,
|
|
220
|
-
getPrimer(traceModule,
|
|
207
|
+
getPrimer(traceModule, getHashMapOrder([...constantModules, specName])),
|
|
221
208
|
`trace == \n${traceFunction}\n`,
|
|
222
209
|
...(teConstants.length > 0
|
|
223
210
|
? [
|
package/src/typed-tier.ts
CHANGED
|
@@ -607,6 +607,7 @@ const closeType = (type: Type, path: Type[] = []): Type => {
|
|
|
607
607
|
const resolved = resolveType(type);
|
|
608
608
|
// A function built lazily is only applied, never compared or stored.
|
|
609
609
|
if (resolved.kind === "Lambda") return unsupported();
|
|
610
|
+
if (resolved.kind === "Rec" && resolved.shapes.length === 0) return unsupported();
|
|
610
611
|
if (resolved.kind === "Var") {
|
|
611
612
|
const integer = createInt();
|
|
612
613
|
resolved.target = integer;
|
|
@@ -959,7 +960,7 @@ const createValueReader = (type: Type, plains: Plains): ((plain: Plain) => Value
|
|
|
959
960
|
const getRecordShapes = (resolved: RecType) =>
|
|
960
961
|
resolved.shapes.map((names) => {
|
|
961
962
|
const order = names
|
|
962
|
-
.map((
|
|
963
|
+
.map((_value, index) => index)
|
|
963
964
|
.sort((left, right) => compareValues(names[left], names[right]));
|
|
964
965
|
return {
|
|
965
966
|
names: order.map((index) => names[index]),
|
|
@@ -1314,11 +1315,11 @@ const getIndexCode = (program: Program, type: FnType, code: string) => {
|
|
|
1314
1315
|
}
|
|
1315
1316
|
const rows = keys.map((key) => (Array.isArray(key) ? key : [key]));
|
|
1316
1317
|
const isBoxed = rows.every((row) => row.length === rows[0].length && row.every(Number.isInteger));
|
|
1317
|
-
const columns = rows[0].map((
|
|
1318
|
+
const columns = rows[0].map((_value, column) => {
|
|
1318
1319
|
const values = rows.map((row) => Number(row[column]));
|
|
1319
1320
|
return { low: Math.min(...values), size: Math.max(...values) - Math.min(...values) + 1 };
|
|
1320
1321
|
});
|
|
1321
|
-
const strides = columns.map((
|
|
1322
|
+
const strides = columns.map((_value, column) =>
|
|
1322
1323
|
columns.slice(column + 1).reduce((product, next) => product * next.size, 1),
|
|
1323
1324
|
);
|
|
1324
1325
|
if (!isBoxed || strides[0] * columns[0].size > MAXIMUM_BITMAP) {
|
|
@@ -1397,7 +1398,8 @@ interface Frame {
|
|
|
1397
1398
|
isNext: boolean;
|
|
1398
1399
|
}
|
|
1399
1400
|
|
|
1400
|
-
const getVariableCodes = (program: Program) =>
|
|
1401
|
+
const getVariableCodes = (program: Program) =>
|
|
1402
|
+
program.variableTypes.map((_value, index) => `v${index}`);
|
|
1401
1403
|
|
|
1402
1404
|
// An expression primed as a whole reads every variable in the next state, where priming again is an
|
|
1403
1405
|
// error. A variable the action hasn't assigned yet has no value there, and TLC fails on it.
|
|
@@ -1580,7 +1582,7 @@ const getOperatorArgument = (
|
|
|
1580
1582
|
): OperatorBinding => {
|
|
1581
1583
|
// An operator such as \cap applies as an expression that applies it, so a builtin compiles as one.
|
|
1582
1584
|
if (arg.kind === "OperatorReference") {
|
|
1583
|
-
const names = Array.from({ length: arity }, (
|
|
1585
|
+
const names = Array.from({ length: arity }, (_value, index) => `#${index}`);
|
|
1584
1586
|
return {
|
|
1585
1587
|
kind: "Operator",
|
|
1586
1588
|
definition: {
|
|
@@ -4611,7 +4613,9 @@ const getSelections = (count: number) => {
|
|
|
4611
4613
|
};
|
|
4612
4614
|
|
|
4613
4615
|
const getBits = (mask: number) =>
|
|
4614
|
-
Array.from({ length: MASK_BITS }, (
|
|
4616
|
+
Array.from({ length: MASK_BITS }, (_value, bit) => bit).filter(
|
|
4617
|
+
(bit) => (mask & (1 << bit)) !== 0,
|
|
4618
|
+
);
|
|
4615
4619
|
|
|
4616
4620
|
const advanceOdometer = (positions: number[], base: number) => {
|
|
4617
4621
|
for (let index = positions.length - 1; index >= 0; index--) {
|
|
@@ -4730,7 +4734,7 @@ const HELPERS = {
|
|
|
4730
4734
|
sortMap: (compare: Comparer, keys: Plain[], values: Plain[]) => {
|
|
4731
4735
|
if (keys.length > MAXIMUM_INSERTION_SORT) {
|
|
4732
4736
|
const order = keys
|
|
4733
|
-
.map((
|
|
4737
|
+
.map((_value, index) => index)
|
|
4734
4738
|
.sort((left, right) => compare(keys[left], keys[right]));
|
|
4735
4739
|
return [order.map((index) => keys[index]), order.map((index) => values[index])];
|
|
4736
4740
|
}
|
|
@@ -4822,7 +4826,7 @@ const HELPERS = {
|
|
|
4822
4826
|
interval: (low: number, high: number) =>
|
|
4823
4827
|
high - low + 1 > getMaximumSetSize()
|
|
4824
4828
|
? deopt()
|
|
4825
|
-
: Array.from({ length: Math.max(0, high - low + 1) }, (
|
|
4829
|
+
: Array.from({ length: Math.max(0, high - low + 1) }, (_value, index) => low + index),
|
|
4826
4830
|
index: (index: Int32Array, offset: number) =>
|
|
4827
4831
|
offset >= 0 && offset < index.length ? index[offset] : -1,
|
|
4828
4832
|
has: (mask: number, element: number) =>
|
|
@@ -4893,7 +4897,7 @@ const HELPERS = {
|
|
|
4893
4897
|
map[0].every((key, index) => key === index + 1) ? map[1] : deopt(),
|
|
4894
4898
|
toSequenceMask: (map: [number, Plain[]]) =>
|
|
4895
4899
|
map[0] === HELPERS.range(1, map[1].length) ? map[1] : deopt(),
|
|
4896
|
-
fromSequence: (values: Plain[]) => [values.map((
|
|
4900
|
+
fromSequence: (values: Plain[]) => [values.map((_value, index) => index + 1), values],
|
|
4897
4901
|
fromSequenceMask: (values: Plain[]) => [HELPERS.range(1, values.length), values],
|
|
4898
4902
|
lookupScanned: (compare: Comparer, map: Plain[][], key: Plain) => {
|
|
4899
4903
|
const index = findScannedKey(compare, map[0], key);
|
|
@@ -5259,7 +5263,7 @@ const getKeyWriter = (
|
|
|
5259
5263
|
case "Fn": {
|
|
5260
5264
|
const positions = isPermuted && getMovedPositions(images, resolved.domain);
|
|
5261
5265
|
if (!positions) {
|
|
5262
|
-
return `{ const ${name} = ${code}; ${resolved.domain.map((
|
|
5266
|
+
return `{ const ${name} = ${code}; ${resolved.domain.map((_value, index) => getInner(resolved.range, `${name}[${index}]`)).join(" ")} }`;
|
|
5263
5267
|
}
|
|
5264
5268
|
const base = program.indexes.length;
|
|
5265
5269
|
program.indexes.push(
|
|
@@ -5272,7 +5276,7 @@ const getKeyWriter = (
|
|
|
5272
5276
|
}),
|
|
5273
5277
|
);
|
|
5274
5278
|
const sources = getName(program, "s");
|
|
5275
|
-
return `{ const ${name} = ${code}; const ${sources} = D[${base} + G]; ${resolved.domain.map((
|
|
5279
|
+
return `{ const ${name} = ${code}; const ${sources} = D[${base} + G]; ${resolved.domain.map((_value, index) => getInner(resolved.range, `${name}[${sources}[${index}]]`)).join(" ")} }`;
|
|
5276
5280
|
}
|
|
5277
5281
|
case "Tup":
|
|
5278
5282
|
return `{ const ${name} = ${code}; ${getParts(resolved)
|
|
@@ -5590,21 +5594,21 @@ const getSignatureCode = (
|
|
|
5590
5594
|
return `{ const ${record} = ${code}; switch (${record}[0]) { ${cases.join(" ")} } }`;
|
|
5591
5595
|
}
|
|
5592
5596
|
case "Fn": {
|
|
5593
|
-
const
|
|
5597
|
+
const functionValue = getName(program, "f");
|
|
5594
5598
|
const weight = getWeight();
|
|
5595
5599
|
const keys = resolved.domain.flatMap((key, position) => {
|
|
5596
5600
|
const id =
|
|
5597
5601
|
typeof key === "object" && key.kind === "ModelValue"
|
|
5598
5602
|
? program.plains.ids.get(key)
|
|
5599
5603
|
: undefined;
|
|
5600
|
-
const value = getScalarCode(resolved.range, `${
|
|
5604
|
+
const value = getScalarCode(resolved.range, `${functionValue}[${position}]`);
|
|
5601
5605
|
return id === undefined || value === undefined
|
|
5602
5606
|
? []
|
|
5603
5607
|
: [`Z[${id}] += Math.imul(Math.imul(${weight}, ${scale}), ${value});`];
|
|
5604
5608
|
});
|
|
5605
|
-
const values = getLoop(resolved.range,
|
|
5609
|
+
const values = getLoop(resolved.range, functionValue);
|
|
5606
5610
|
if (keys.length === 0 && values === undefined) return undefined;
|
|
5607
|
-
return `{ const ${
|
|
5611
|
+
return `{ const ${functionValue} = ${code}; ${keys.join(" ")} ${values ?? ""} }`;
|
|
5608
5612
|
}
|
|
5609
5613
|
case "Map": {
|
|
5610
5614
|
const parts = [
|
|
@@ -5738,7 +5742,7 @@ const compileSpec = (
|
|
|
5738
5742
|
return () => (unchanged ? `!(${unchanged.emit()}) && (${action.emit()})` : action.emit());
|
|
5739
5743
|
});
|
|
5740
5744
|
program.variableTypes.forEach((type) => closeType(type));
|
|
5741
|
-
const parameters = program.variableTypes.map((
|
|
5745
|
+
const parameters = program.variableTypes.map((_value, index) => `v${index}`).join(", ");
|
|
5742
5746
|
const unpack = `const [${parameters}] = state;`;
|
|
5743
5747
|
// A state predicate reads the state through the variables it unpacks, so it holds of a successor
|
|
5744
5748
|
// with its parent's values of those.
|
|
@@ -5786,7 +5790,7 @@ const compileSpec = (
|
|
|
5786
5790
|
const keyOrder = check.view
|
|
5787
5791
|
? [...new Set(getProjectedVariables(program, check.view, new Map()))]
|
|
5788
5792
|
: program.variableTypes
|
|
5789
|
-
.map((
|
|
5793
|
+
.map((_value, index) => index)
|
|
5790
5794
|
.sort((left, right) => getKeyCost(left) - getKeyCost(right));
|
|
5791
5795
|
const getKeyWriters = (isPermuted: boolean) =>
|
|
5792
5796
|
keyOrder.map((index) =>
|
|
@@ -5840,7 +5844,7 @@ const compileSpec = (
|
|
|
5840
5844
|
let c = 0;
|
|
5841
5845
|
let k = -1;
|
|
5842
5846
|
compare: { ${imageComparisons.map((item, position) => `${item.build} c = ${item.comparison}; if (c > 0) continue images; if (c < 0) { k = ${position}; ${item.choose} break compare; }`).join(" ")} }
|
|
5843
|
-
switch (k) { ${imageComparisons.map((
|
|
5847
|
+
switch (k) { ${imageComparisons.map((_value, position) => `case ${position}: ${imageComparisons[position + 1]?.note ?? ""}`).join(" ")} }
|
|
5844
5848
|
}
|
|
5845
5849
|
${imageComparisons.map((item) => item.build).join(" ")}`;
|
|
5846
5850
|
const viewKeyCode = `${smallestCode} ${viewWriters.join(" ")}`;
|
|
@@ -5885,7 +5889,7 @@ const compileSpec = (
|
|
|
5885
5889
|
const values = program.plains.values;
|
|
5886
5890
|
const ranks = new Int32Array(values.length);
|
|
5887
5891
|
values
|
|
5888
|
-
.map((
|
|
5892
|
+
.map((_value, id) => id)
|
|
5889
5893
|
.sort((left, right) => compareAtoms(values[left], values[right]))
|
|
5890
5894
|
.forEach((id, rank) => {
|
|
5891
5895
|
ranks[id] = rank;
|
|
@@ -5922,7 +5926,7 @@ const compileSpec = (
|
|
|
5922
5926
|
X[0] = i;
|
|
5923
5927
|
${readers.map((reader, index) => `const value${index} = ${reader}; X[${index + 1}] = i;`).join(" ")}
|
|
5924
5928
|
cursor.position = (i + 3) & ~3;
|
|
5925
|
-
E = [${readers.map((
|
|
5929
|
+
E = [${readers.map((_value, index) => `value${index}`).join(", ")}];
|
|
5926
5930
|
return E;
|
|
5927
5931
|
},
|
|
5928
5932
|
writeKey: (state, arena) => {
|
|
@@ -5951,7 +5955,9 @@ const compileSpec = (
|
|
|
5951
5955
|
// A key is the smallest image among those whose sums of moved atoms, in a fixed order of the
|
|
5952
5956
|
// atoms, are smallest. Which images those are depends only on the state, so its orbit shares it.
|
|
5953
5957
|
const moved = Int32Array.from(
|
|
5954
|
-
program.plains.values.flatMap((
|
|
5958
|
+
program.plains.values.flatMap((_value, id) =>
|
|
5959
|
+
atoms.some((table) => table[id] !== id) ? [id] : [],
|
|
5960
|
+
),
|
|
5955
5961
|
);
|
|
5956
5962
|
const preimages = [
|
|
5957
5963
|
moved,
|
|
@@ -6048,7 +6054,7 @@ const MINIMUM_SORTED_IMAGES = 24;
|
|
|
6048
6054
|
const getFullOrbits = (preimages: Int32Array[]): Orbits | undefined => {
|
|
6049
6055
|
if (preimages.length < MINIMUM_SORTED_IMAGES) return undefined;
|
|
6050
6056
|
const moved = preimages[0];
|
|
6051
|
-
const roots = Int32Array.from({ length: Math.max(0, ...moved) + 1 }, (
|
|
6057
|
+
const roots = Int32Array.from({ length: Math.max(0, ...moved) + 1 }, (_value, atom) => atom);
|
|
6052
6058
|
const findRoot = (atom: number): number =>
|
|
6053
6059
|
roots[atom] === atom ? atom : (roots[atom] = findRoot(roots[atom]));
|
|
6054
6060
|
preimages.forEach((preimage) =>
|
|
@@ -6063,7 +6069,8 @@ const getFullOrbits = (preimages: Int32Array[]): Orbits | undefined => {
|
|
|
6063
6069
|
starts[index + 1] = starts[index] + orbit.length;
|
|
6064
6070
|
});
|
|
6065
6071
|
const count = orbits.reduce(
|
|
6066
|
-
(product, orbit) =>
|
|
6072
|
+
(product, orbit) =>
|
|
6073
|
+
orbit.reduce((factorial, _value, index) => factorial * (index + 1), product),
|
|
6067
6074
|
1,
|
|
6068
6075
|
);
|
|
6069
6076
|
if (count !== preimages.length) return undefined;
|
|
@@ -6367,7 +6374,7 @@ const search = (environment: Environment, check: TypedCheck, plains: Plains): Ty
|
|
|
6367
6374
|
return fingerprinter.words[0];
|
|
6368
6375
|
})()),
|
|
6369
6376
|
// The successors of a state the search expanded are all stored.
|
|
6370
|
-
|
|
6377
|
+
forEachActionSuccessors: (_index, state, onSuccessors) => {
|
|
6371
6378
|
const successors: LiveSuccessor<Plain[]>[] = [];
|
|
6372
6379
|
compiled.next(state, (successor) => {
|
|
6373
6380
|
if (!isInModel(successor)) return;
|
|
@@ -6375,7 +6382,7 @@ const search = (environment: Environment, check: TypedCheck, plains: Plains): Ty
|
|
|
6375
6382
|
const index = findState(false);
|
|
6376
6383
|
successors.push({ index: index === -1 ? deopt() : index, state: successor });
|
|
6377
6384
|
});
|
|
6378
|
-
|
|
6385
|
+
onSuccessors(successors);
|
|
6379
6386
|
},
|
|
6380
6387
|
},
|
|
6381
6388
|
environment.runtime.version !== "1.7.4",
|