tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315
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 +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- 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 +56 -56
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -92
- package/dist/transfer.js +97 -92
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +518 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +18 -4
- package/src/cli/tlc.ts +18 -12
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +155 -66
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +152 -25
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +179 -60
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- 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/ackermannize-bv-tactic.ts +3 -2
- 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 +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +28 -2
- 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/bv1-blast.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +84 -15
- package/src/prover/smt/solver/ctx-simplify.ts +9 -4
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +9 -8
- package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
- 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 +31 -28
- package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
- 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 +608 -139
- package/src/prover/smt/solver/fix-dl-var.ts +2 -3
- package/src/prover/smt/solver/fm-tactic.ts +9 -7
- 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/fpa2bv-tactic.ts +1 -1
- 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/lia2pb.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- 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/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.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 +22 -44
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.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 +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- 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/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +2 -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/normalize-bounds.ts +2 -2
- package/src/prover/smt/solver/occf.ts +1 -1
- package/src/prover/smt/solver/opt-context.ts +21 -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 +10 -6
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/pb2bv-tactic.ts +9 -3
- 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/purify-arith.ts +51 -49
- 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 +23 -8
- 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/reduce-args.ts +2 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +75 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +54 -25
- package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -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-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +718 -213
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -4
- package/src/prover/smt/solver/tactic.ts +389 -199
- 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 +12 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- 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/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +15 -5
- 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 +1311 -268
- package/src/runtime.ts +21 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +19 -12
- package/src/sany/generator.ts +12 -6
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +12 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +321 -135
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +666 -147
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -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 +147 -46
- 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/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
package/src/typed-tier.ts
CHANGED
|
@@ -28,6 +28,7 @@ import {
|
|
|
28
28
|
findGlobalName,
|
|
29
29
|
getDefinition,
|
|
30
30
|
getStartupValue,
|
|
31
|
+
isUniformPredicate,
|
|
31
32
|
type Environment,
|
|
32
33
|
type Scope,
|
|
33
34
|
} from "./evaluate";
|
|
@@ -106,8 +107,7 @@ interface TupType {
|
|
|
106
107
|
interface SeqType {
|
|
107
108
|
kind: "Seq";
|
|
108
109
|
element: Type;
|
|
109
|
-
|
|
110
|
-
target?: MapType;
|
|
110
|
+
target?: SeqType | MapType;
|
|
111
111
|
}
|
|
112
112
|
|
|
113
113
|
// A record of several shapes starts with the position of its shape.
|
|
@@ -528,6 +528,7 @@ const unify = (left: Type, right: Type): void => {
|
|
|
528
528
|
return unify(leftType.values, rightType.values);
|
|
529
529
|
}
|
|
530
530
|
if (leftType.kind === "Seq" && rightType.kind === "Seq") {
|
|
531
|
+
rightType.target = leftType;
|
|
531
532
|
return unify(leftType.element, rightType.element);
|
|
532
533
|
}
|
|
533
534
|
if (leftType.kind === "Set" && rightType.kind === "Set") {
|
|
@@ -607,6 +608,7 @@ const closeType = (type: Type, path: Type[] = []): Type => {
|
|
|
607
608
|
const resolved = resolveType(type);
|
|
608
609
|
// A function built lazily is only applied, never compared or stored.
|
|
609
610
|
if (resolved.kind === "Lambda") return unsupported();
|
|
611
|
+
if (resolved.kind === "Rec" && resolved.shapes.length === 0) return unsupported();
|
|
610
612
|
if (resolved.kind === "Var") {
|
|
611
613
|
const integer = createInt();
|
|
612
614
|
resolved.target = integer;
|
|
@@ -959,7 +961,7 @@ const createValueReader = (type: Type, plains: Plains): ((plain: Plain) => Value
|
|
|
959
961
|
const getRecordShapes = (resolved: RecType) =>
|
|
960
962
|
resolved.shapes.map((names) => {
|
|
961
963
|
const order = names
|
|
962
|
-
.map((
|
|
964
|
+
.map((_value, index) => index)
|
|
963
965
|
.sort((left, right) => compareValues(names[left], names[right]));
|
|
964
966
|
return {
|
|
965
967
|
names: order.map((index) => names[index]),
|
|
@@ -1314,11 +1316,11 @@ const getIndexCode = (program: Program, type: FnType, code: string) => {
|
|
|
1314
1316
|
}
|
|
1315
1317
|
const rows = keys.map((key) => (Array.isArray(key) ? key : [key]));
|
|
1316
1318
|
const isBoxed = rows.every((row) => row.length === rows[0].length && row.every(Number.isInteger));
|
|
1317
|
-
const columns = rows[0].map((
|
|
1319
|
+
const columns = rows[0].map((_value, column) => {
|
|
1318
1320
|
const values = rows.map((row) => Number(row[column]));
|
|
1319
1321
|
return { low: Math.min(...values), size: Math.max(...values) - Math.min(...values) + 1 };
|
|
1320
1322
|
});
|
|
1321
|
-
const strides = columns.map((
|
|
1323
|
+
const strides = columns.map((_value, column) =>
|
|
1322
1324
|
columns.slice(column + 1).reduce((product, next) => product * next.size, 1),
|
|
1323
1325
|
);
|
|
1324
1326
|
if (!isBoxed || strides[0] * columns[0].size > MAXIMUM_BITMAP) {
|
|
@@ -1397,7 +1399,8 @@ interface Frame {
|
|
|
1397
1399
|
isNext: boolean;
|
|
1398
1400
|
}
|
|
1399
1401
|
|
|
1400
|
-
const getVariableCodes = (program: Program) =>
|
|
1402
|
+
const getVariableCodes = (program: Program) =>
|
|
1403
|
+
program.variableTypes.map((_value, index) => `v${index}`);
|
|
1401
1404
|
|
|
1402
1405
|
// An expression primed as a whole reads every variable in the next state, where priming again is an
|
|
1403
1406
|
// error. A variable the action hasn't assigned yet has no value there, and TLC fails on it.
|
|
@@ -1580,7 +1583,7 @@ const getOperatorArgument = (
|
|
|
1580
1583
|
): OperatorBinding => {
|
|
1581
1584
|
// An operator such as \cap applies as an expression that applies it, so a builtin compiles as one.
|
|
1582
1585
|
if (arg.kind === "OperatorReference") {
|
|
1583
|
-
const names = Array.from({ length: arity }, (
|
|
1586
|
+
const names = Array.from({ length: arity }, (_value, index) => `#${index}`);
|
|
1584
1587
|
return {
|
|
1585
1588
|
kind: "Operator",
|
|
1586
1589
|
definition: {
|
|
@@ -3259,6 +3262,8 @@ const compileBuiltin = (
|
|
|
3259
3262
|
|
|
3260
3263
|
const compileValue = (program: Program, expression: Expression, frame: Frame): Compiled => {
|
|
3261
3264
|
switch (expression.kind) {
|
|
3265
|
+
case "Selection":
|
|
3266
|
+
return compileValue(program, expression.expression, frame);
|
|
3262
3267
|
case "Number":
|
|
3263
3268
|
return expression.value <= MAXIMUM_INTEGER
|
|
3264
3269
|
? { type: createInt(), emit: () => String(expression.value) }
|
|
@@ -3404,13 +3409,16 @@ const compileValue = (program: Program, expression: Expression, frame: Frame): C
|
|
|
3404
3409
|
compileValue(program, expression.predicate, { ...frame, scope: bounds.scope }),
|
|
3405
3410
|
);
|
|
3406
3411
|
const result = getName(program, "r");
|
|
3412
|
+
const stop = isUniformPredicate(expression, program.environment)
|
|
3413
|
+
? ` else return ${result};`
|
|
3414
|
+
: "";
|
|
3407
3415
|
const type: SetType = { kind: "Set", element: loop.element };
|
|
3408
3416
|
return {
|
|
3409
3417
|
type,
|
|
3410
3418
|
emit: () =>
|
|
3411
3419
|
isMask(type, program.plains)
|
|
3412
|
-
? `(() => { let ${result} = 0; ${bounds.getHeaders()} { if (${predicate.emit()}) ${result} |= H.bit(${loop.name})
|
|
3413
|
-
: `(() => { const ${result} = []; ${bounds.getHeaders()} { if (${predicate.emit()}) ${result}.push(${loop.name})
|
|
3420
|
+
? `(() => { let ${result} = 0; ${bounds.getHeaders()} { if (${predicate.emit()}) ${result} |= H.bit(${loop.name});${stop} } return ${result}; })()`
|
|
3421
|
+
: `(() => { const ${result} = []; ${bounds.getHeaders()} { if (${predicate.emit()}) ${result}.push(${loop.name});${stop} } return ${result}; })()`,
|
|
3414
3422
|
};
|
|
3415
3423
|
}
|
|
3416
3424
|
case "SetMap": {
|
|
@@ -3942,6 +3950,8 @@ const compileWays = (program: Program, expression: Expression, frame: Frame): Co
|
|
|
3942
3950
|
compileWays(program, inner, { ...frame, scope });
|
|
3943
3951
|
const counted = (emit: () => string): Compiled => ({ type: createInt(), emit });
|
|
3944
3952
|
switch (expression.kind) {
|
|
3953
|
+
case "Selection":
|
|
3954
|
+
return getWays(expression.expression, frame.scope);
|
|
3945
3955
|
case "Or": {
|
|
3946
3956
|
const operands = expression.operands.map((operand) => getWays(operand, frame.scope));
|
|
3947
3957
|
return counted(() => `(${operands.map((operand) => operand.emit()).join(" + ")})`);
|
|
@@ -4062,8 +4072,12 @@ const compileStep = (
|
|
|
4062
4072
|
if (!isEnabled && primed.some((code) => code === undefined)) return () => "H.deopt();";
|
|
4063
4073
|
return () => getEmitCode(primed);
|
|
4064
4074
|
}
|
|
4065
|
-
// With warnings on, TLC evaluates what is left once every variable is assigned, without branching.
|
|
4066
|
-
if (
|
|
4075
|
+
// With warnings on, TLC evaluates what is left of a step once every variable is assigned, without branching, but not under ENABLED.
|
|
4076
|
+
if (
|
|
4077
|
+
!isEnabled &&
|
|
4078
|
+
program.environment.runtime.isWarningEnabled &&
|
|
4079
|
+
primed.every((code) => code !== undefined)
|
|
4080
|
+
) {
|
|
4067
4081
|
const guards = pending.map((item) => {
|
|
4068
4082
|
if (item.expression.kind !== "Unchanged") {
|
|
4069
4083
|
return expectBool(
|
|
@@ -4101,6 +4115,8 @@ const compileStep = (
|
|
|
4101
4115
|
? unsupported()
|
|
4102
4116
|
: continueWith(scope, [body], [...first.inlining, definition]);
|
|
4103
4117
|
switch (expression.kind) {
|
|
4118
|
+
case "Selection":
|
|
4119
|
+
return continueWith(first.scope, [expression.expression]);
|
|
4104
4120
|
case "And":
|
|
4105
4121
|
return continueWith(first.scope, expression.operands);
|
|
4106
4122
|
case "Or": {
|
|
@@ -4611,7 +4627,9 @@ const getSelections = (count: number) => {
|
|
|
4611
4627
|
};
|
|
4612
4628
|
|
|
4613
4629
|
const getBits = (mask: number) =>
|
|
4614
|
-
Array.from({ length: MASK_BITS }, (
|
|
4630
|
+
Array.from({ length: MASK_BITS }, (_value, bit) => bit).filter(
|
|
4631
|
+
(bit) => (mask & (1 << bit)) !== 0,
|
|
4632
|
+
);
|
|
4615
4633
|
|
|
4616
4634
|
const advanceOdometer = (positions: number[], base: number) => {
|
|
4617
4635
|
for (let index = positions.length - 1; index >= 0; index--) {
|
|
@@ -4730,7 +4748,7 @@ const HELPERS = {
|
|
|
4730
4748
|
sortMap: (compare: Comparer, keys: Plain[], values: Plain[]) => {
|
|
4731
4749
|
if (keys.length > MAXIMUM_INSERTION_SORT) {
|
|
4732
4750
|
const order = keys
|
|
4733
|
-
.map((
|
|
4751
|
+
.map((_value, index) => index)
|
|
4734
4752
|
.sort((left, right) => compare(keys[left], keys[right]));
|
|
4735
4753
|
return [order.map((index) => keys[index]), order.map((index) => values[index])];
|
|
4736
4754
|
}
|
|
@@ -4822,7 +4840,7 @@ const HELPERS = {
|
|
|
4822
4840
|
interval: (low: number, high: number) =>
|
|
4823
4841
|
high - low + 1 > getMaximumSetSize()
|
|
4824
4842
|
? deopt()
|
|
4825
|
-
: Array.from({ length: Math.max(0, high - low + 1) }, (
|
|
4843
|
+
: Array.from({ length: Math.max(0, high - low + 1) }, (_value, index) => low + index),
|
|
4826
4844
|
index: (index: Int32Array, offset: number) =>
|
|
4827
4845
|
offset >= 0 && offset < index.length ? index[offset] : -1,
|
|
4828
4846
|
has: (mask: number, element: number) =>
|
|
@@ -4893,7 +4911,7 @@ const HELPERS = {
|
|
|
4893
4911
|
map[0].every((key, index) => key === index + 1) ? map[1] : deopt(),
|
|
4894
4912
|
toSequenceMask: (map: [number, Plain[]]) =>
|
|
4895
4913
|
map[0] === HELPERS.range(1, map[1].length) ? map[1] : deopt(),
|
|
4896
|
-
fromSequence: (values: Plain[]) => [values.map((
|
|
4914
|
+
fromSequence: (values: Plain[]) => [values.map((_value, index) => index + 1), values],
|
|
4897
4915
|
fromSequenceMask: (values: Plain[]) => [HELPERS.range(1, values.length), values],
|
|
4898
4916
|
lookupScanned: (compare: Comparer, map: Plain[][], key: Plain) => {
|
|
4899
4917
|
const index = findScannedKey(compare, map[0], key);
|
|
@@ -5259,7 +5277,7 @@ const getKeyWriter = (
|
|
|
5259
5277
|
case "Fn": {
|
|
5260
5278
|
const positions = isPermuted && getMovedPositions(images, resolved.domain);
|
|
5261
5279
|
if (!positions) {
|
|
5262
|
-
return `{ const ${name} = ${code}; ${resolved.domain.map((
|
|
5280
|
+
return `{ const ${name} = ${code}; ${resolved.domain.map((_value, index) => getInner(resolved.range, `${name}[${index}]`)).join(" ")} }`;
|
|
5263
5281
|
}
|
|
5264
5282
|
const base = program.indexes.length;
|
|
5265
5283
|
program.indexes.push(
|
|
@@ -5272,7 +5290,7 @@ const getKeyWriter = (
|
|
|
5272
5290
|
}),
|
|
5273
5291
|
);
|
|
5274
5292
|
const sources = getName(program, "s");
|
|
5275
|
-
return `{ const ${name} = ${code}; const ${sources} = D[${base} + G]; ${resolved.domain.map((
|
|
5293
|
+
return `{ const ${name} = ${code}; const ${sources} = D[${base} + G]; ${resolved.domain.map((_value, index) => getInner(resolved.range, `${name}[${sources}[${index}]]`)).join(" ")} }`;
|
|
5276
5294
|
}
|
|
5277
5295
|
case "Tup":
|
|
5278
5296
|
return `{ const ${name} = ${code}; ${getParts(resolved)
|
|
@@ -5590,21 +5608,21 @@ const getSignatureCode = (
|
|
|
5590
5608
|
return `{ const ${record} = ${code}; switch (${record}[0]) { ${cases.join(" ")} } }`;
|
|
5591
5609
|
}
|
|
5592
5610
|
case "Fn": {
|
|
5593
|
-
const
|
|
5611
|
+
const functionValue = getName(program, "f");
|
|
5594
5612
|
const weight = getWeight();
|
|
5595
5613
|
const keys = resolved.domain.flatMap((key, position) => {
|
|
5596
5614
|
const id =
|
|
5597
5615
|
typeof key === "object" && key.kind === "ModelValue"
|
|
5598
5616
|
? program.plains.ids.get(key)
|
|
5599
5617
|
: undefined;
|
|
5600
|
-
const value = getScalarCode(resolved.range, `${
|
|
5618
|
+
const value = getScalarCode(resolved.range, `${functionValue}[${position}]`);
|
|
5601
5619
|
return id === undefined || value === undefined
|
|
5602
5620
|
? []
|
|
5603
5621
|
: [`Z[${id}] += Math.imul(Math.imul(${weight}, ${scale}), ${value});`];
|
|
5604
5622
|
});
|
|
5605
|
-
const values = getLoop(resolved.range,
|
|
5623
|
+
const values = getLoop(resolved.range, functionValue);
|
|
5606
5624
|
if (keys.length === 0 && values === undefined) return undefined;
|
|
5607
|
-
return `{ const ${
|
|
5625
|
+
return `{ const ${functionValue} = ${code}; ${keys.join(" ")} ${values ?? ""} }`;
|
|
5608
5626
|
}
|
|
5609
5627
|
case "Map": {
|
|
5610
5628
|
const parts = [
|
|
@@ -5738,7 +5756,7 @@ const compileSpec = (
|
|
|
5738
5756
|
return () => (unchanged ? `!(${unchanged.emit()}) && (${action.emit()})` : action.emit());
|
|
5739
5757
|
});
|
|
5740
5758
|
program.variableTypes.forEach((type) => closeType(type));
|
|
5741
|
-
const parameters = program.variableTypes.map((
|
|
5759
|
+
const parameters = program.variableTypes.map((_value, index) => `v${index}`).join(", ");
|
|
5742
5760
|
const unpack = `const [${parameters}] = state;`;
|
|
5743
5761
|
// A state predicate reads the state through the variables it unpacks, so it holds of a successor
|
|
5744
5762
|
// with its parent's values of those.
|
|
@@ -5786,7 +5804,7 @@ const compileSpec = (
|
|
|
5786
5804
|
const keyOrder = check.view
|
|
5787
5805
|
? [...new Set(getProjectedVariables(program, check.view, new Map()))]
|
|
5788
5806
|
: program.variableTypes
|
|
5789
|
-
.map((
|
|
5807
|
+
.map((_value, index) => index)
|
|
5790
5808
|
.sort((left, right) => getKeyCost(left) - getKeyCost(right));
|
|
5791
5809
|
const getKeyWriters = (isPermuted: boolean) =>
|
|
5792
5810
|
keyOrder.map((index) =>
|
|
@@ -5840,7 +5858,7 @@ const compileSpec = (
|
|
|
5840
5858
|
let c = 0;
|
|
5841
5859
|
let k = -1;
|
|
5842
5860
|
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((
|
|
5861
|
+
switch (k) { ${imageComparisons.map((_value, position) => `case ${position}: ${imageComparisons[position + 1]?.note ?? ""}`).join(" ")} }
|
|
5844
5862
|
}
|
|
5845
5863
|
${imageComparisons.map((item) => item.build).join(" ")}`;
|
|
5846
5864
|
const viewKeyCode = `${smallestCode} ${viewWriters.join(" ")}`;
|
|
@@ -5885,7 +5903,7 @@ const compileSpec = (
|
|
|
5885
5903
|
const values = program.plains.values;
|
|
5886
5904
|
const ranks = new Int32Array(values.length);
|
|
5887
5905
|
values
|
|
5888
|
-
.map((
|
|
5906
|
+
.map((_value, id) => id)
|
|
5889
5907
|
.sort((left, right) => compareAtoms(values[left], values[right]))
|
|
5890
5908
|
.forEach((id, rank) => {
|
|
5891
5909
|
ranks[id] = rank;
|
|
@@ -5922,7 +5940,7 @@ const compileSpec = (
|
|
|
5922
5940
|
X[0] = i;
|
|
5923
5941
|
${readers.map((reader, index) => `const value${index} = ${reader}; X[${index + 1}] = i;`).join(" ")}
|
|
5924
5942
|
cursor.position = (i + 3) & ~3;
|
|
5925
|
-
E = [${readers.map((
|
|
5943
|
+
E = [${readers.map((_value, index) => `value${index}`).join(", ")}];
|
|
5926
5944
|
return E;
|
|
5927
5945
|
},
|
|
5928
5946
|
writeKey: (state, arena) => {
|
|
@@ -5951,7 +5969,9 @@ const compileSpec = (
|
|
|
5951
5969
|
// A key is the smallest image among those whose sums of moved atoms, in a fixed order of the
|
|
5952
5970
|
// atoms, are smallest. Which images those are depends only on the state, so its orbit shares it.
|
|
5953
5971
|
const moved = Int32Array.from(
|
|
5954
|
-
program.plains.values.flatMap((
|
|
5972
|
+
program.plains.values.flatMap((_value, id) =>
|
|
5973
|
+
atoms.some((table) => table[id] !== id) ? [id] : [],
|
|
5974
|
+
),
|
|
5955
5975
|
);
|
|
5956
5976
|
const preimages = [
|
|
5957
5977
|
moved,
|
|
@@ -6048,7 +6068,7 @@ const MINIMUM_SORTED_IMAGES = 24;
|
|
|
6048
6068
|
const getFullOrbits = (preimages: Int32Array[]): Orbits | undefined => {
|
|
6049
6069
|
if (preimages.length < MINIMUM_SORTED_IMAGES) return undefined;
|
|
6050
6070
|
const moved = preimages[0];
|
|
6051
|
-
const roots = Int32Array.from({ length: Math.max(0, ...moved) + 1 }, (
|
|
6071
|
+
const roots = Int32Array.from({ length: Math.max(0, ...moved) + 1 }, (_value, atom) => atom);
|
|
6052
6072
|
const findRoot = (atom: number): number =>
|
|
6053
6073
|
roots[atom] === atom ? atom : (roots[atom] = findRoot(roots[atom]));
|
|
6054
6074
|
preimages.forEach((preimage) =>
|
|
@@ -6063,7 +6083,8 @@ const getFullOrbits = (preimages: Int32Array[]): Orbits | undefined => {
|
|
|
6063
6083
|
starts[index + 1] = starts[index] + orbit.length;
|
|
6064
6084
|
});
|
|
6065
6085
|
const count = orbits.reduce(
|
|
6066
|
-
(product, orbit) =>
|
|
6086
|
+
(product, orbit) =>
|
|
6087
|
+
orbit.reduce((factorial, _value, index) => factorial * (index + 1), product),
|
|
6067
6088
|
1,
|
|
6068
6089
|
);
|
|
6069
6090
|
if (count !== preimages.length) return undefined;
|
|
@@ -6367,7 +6388,7 @@ const search = (environment: Environment, check: TypedCheck, plains: Plains): Ty
|
|
|
6367
6388
|
return fingerprinter.words[0];
|
|
6368
6389
|
})()),
|
|
6369
6390
|
// The successors of a state the search expanded are all stored.
|
|
6370
|
-
|
|
6391
|
+
forEachActionSuccessors: (_index, state, onSuccessors) => {
|
|
6371
6392
|
const successors: LiveSuccessor<Plain[]>[] = [];
|
|
6372
6393
|
compiled.next(state, (successor) => {
|
|
6373
6394
|
if (!isInModel(successor)) return;
|
|
@@ -6375,7 +6396,7 @@ const search = (environment: Environment, check: TypedCheck, plains: Plains): Ty
|
|
|
6375
6396
|
const index = findState(false);
|
|
6376
6397
|
successors.push({ index: index === -1 ? deopt() : index, state: successor });
|
|
6377
6398
|
});
|
|
6378
|
-
|
|
6399
|
+
onSuccessors(successors);
|
|
6379
6400
|
},
|
|
6380
6401
|
},
|
|
6381
6402
|
environment.runtime.version !== "1.7.4",
|
package/src/typescript/types.ts
CHANGED
|
@@ -81,7 +81,7 @@ export const findDomain = (type: ts.Type, context: Context): string | Infinite =
|
|
|
81
81
|
if (type.isUnion()) {
|
|
82
82
|
const literals = type.types.map((member) => getLiteral(member, context));
|
|
83
83
|
const others = findDomains(
|
|
84
|
-
type.types.filter((
|
|
84
|
+
type.types.filter((_value, index) => literals[index] === undefined),
|
|
85
85
|
context,
|
|
86
86
|
);
|
|
87
87
|
if (!Array.isArray(others)) return others;
|
|
@@ -91,7 +91,7 @@ export const findDomain = (type: ts.Type, context: Context): string | Infinite =
|
|
|
91
91
|
isNumericKey(left) && isNumericKey(right) ? Number(left) - Number(right) : 0,
|
|
92
92
|
);
|
|
93
93
|
return [...(enumerated.length > 0 ? [`{${enumerated.join(", ")}}`] : []), ...others]
|
|
94
|
-
.map((domain,
|
|
94
|
+
.map((domain, _index, domains) => (domains.length > 1 ? wrap(domain) : domain))
|
|
95
95
|
.join(" \\cup ");
|
|
96
96
|
}
|
|
97
97
|
const literal = getLiteral(type, context);
|