tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.94c3dd828
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/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +261 -68
- package/src/dependencies.ts +23 -2
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/anonymize.ts +2 -4
- package/src/obligations/index.ts +5 -3
- package/src/obligations/pragma.ts +2 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/isar/attrib.ts +86 -45
- package/src/prover/isabelle/isar/context.ts +25 -22
- package/src/prover/isabelle/isar/induct.ts +2 -5
- package/src/prover/isabelle/isar/method.ts +5 -7
- package/src/prover/isabelle/isar/proof.ts +33 -16
- package/src/prover/isabelle/isar/rule-cases.ts +6 -14
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -52
- package/src/prover/isabelle/provers/classical.ts +1 -1
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/aig-tactic.ts +25 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -5
- package/src/prover/smt/solver/asserted-formulas.ts +1 -1
- package/src/prover/smt/solver/ast-util.ts +3 -1
- package/src/prover/smt/solver/ast.ts +110 -152
- package/src/prover/smt/solver/bound-manager.ts +39 -28
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -8
- package/src/prover/smt/solver/bv-rewriter.ts +14 -16
- package/src/prover/smt/solver/bv1-blast.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +19 -14
- package/src/prover/smt/solver/check-logic.ts +6 -1
- package/src/prover/smt/solver/context.ts +20 -10
- package/src/prover/smt/solver/demodulator.ts +2 -2
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -0
- package/src/prover/smt/solver/distribute-forall.ts +1 -10
- package/src/prover/smt/solver/dom-simplify.ts +1 -1
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -7
- package/src/prover/smt/solver/e-matching.ts +6 -6
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -14
- package/src/prover/smt/solver/enode.ts +15 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +19 -8
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -19
- package/src/prover/smt/solver/euf/egraph.ts +65 -32
- package/src/prover/smt/solver/euf/euf-solver.ts +35 -18
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -51
- package/src/prover/smt/solver/euf/mam.ts +6 -48
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -94
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -1
- package/src/prover/smt/solver/euf/q-solver.ts +2 -0
- package/src/prover/smt/solver/euf/th-solver.ts +1 -1
- package/src/prover/smt/solver/factor.ts +1 -11
- package/src/prover/smt/solver/fd-solver.ts +1 -2
- package/src/prover/smt/solver/fm-tactic.ts +19 -13
- package/src/prover/smt/solver/fpa-rewriter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -6
- package/src/prover/smt/solver/internalizer.ts +41 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -4
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -107
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -17
- package/src/prover/smt/solver/macro-finder.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +13 -13
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -11
- package/src/prover/smt/solver/maxcore.ts +4 -12
- package/src/prover/smt/solver/maxlex.ts +0 -7
- package/src/prover/smt/solver/maxsmt-base.ts +7 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -11
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -9
- package/src/prover/smt/solver/model-evaluator.ts +9 -5
- package/src/prover/smt/solver/model-macro-solver.ts +3 -3
- package/src/prover/smt/solver/muz/dl-context.ts +57 -3
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -20
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -1
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -10
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -13
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -2
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -29
- package/src/prover/smt/solver/muz/hnf.ts +6 -5
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +178 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -3
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -36
- package/src/prover/smt/solver/muz/spacer-context.ts +102 -84
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -3
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -7
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -2
- package/src/prover/smt/solver/muz/substitution.ts +88 -37
- package/src/prover/smt/solver/nlqsat.ts +2 -2
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -2
- package/src/prover/smt/solver/nlsat/explain.ts +5 -0
- package/src/prover/smt/solver/nlsat/solver.ts +36 -25
- package/src/prover/smt/solver/opt-context.ts +9 -8
- package/src/prover/smt/solver/opt-nlsat.ts +68 -58
- package/src/prover/smt/solver/opt-solver.ts +16 -7
- package/src/prover/smt/solver/optsmt.ts +12 -9
- package/src/prover/smt/solver/pattern-inference.ts +2 -2
- package/src/prover/smt/solver/pb-rewriter.ts +13 -13
- package/src/prover/smt/solver/poly-rewriter.ts +2 -2
- package/src/prover/smt/solver/probes.ts +1 -1
- package/src/prover/smt/solver/propagate-values.ts +4 -0
- package/src/prover/smt/solver/proto-model.ts +5 -5
- package/src/prover/smt/solver/purify-arith.ts +50 -15
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -23
- package/src/prover/smt/solver/qe.ts +45 -53
- package/src/prover/smt/solver/qsat.ts +70 -90
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -9
- package/src/prover/smt/solver/quasi-macros.ts +9 -18
- package/src/prover/smt/solver/rational.ts +17 -0
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -19
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -2
- package/src/prover/smt/solver/rewriter.ts +1 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -46
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -6
- package/src/prover/smt/solver/sat/clause.ts +1 -3
- package/src/prover/smt/solver/sat/config.ts +3 -3
- package/src/prover/smt/solver/sat/consequences.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -12
- package/src/prover/smt/solver/sat/model-converter.ts +1 -15
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -23
- package/src/prover/smt/solver/sat/probing.ts +22 -19
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -10
- package/src/prover/smt/solver/sat/simplifier.ts +15 -56
- package/src/prover/smt/solver/sat/solver.ts +20 -19
- package/src/prover/smt/solver/sat/watch-list.ts +7 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -7
- package/src/prover/smt/solver/seq-derive.ts +6 -7
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -1
- package/src/prover/smt/solver/seq-re-rewriter.ts +1 -10
- package/src/prover/smt/solver/seq-re-util.ts +1 -2
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +4 -4
- package/src/prover/smt/solver/seq-rewriter.ts +1 -4
- package/src/prover/smt/solver/smt-setup.ts +15 -9
- package/src/prover/smt/solver/smtlib-parser.ts +1174 -579
- package/src/prover/smt/solver/smtlib-script.ts +866 -728
- package/src/prover/smt/solver/tactic.ts +66 -14
- package/src/prover/smt/solver/theory-array.ts +25 -58
- package/src/prover/smt/solver/theory-bv.ts +13 -50
- package/src/prover/smt/solver/theory-fpa.ts +46 -78
- package/src/prover/smt/solver/theory-pb.ts +10 -6
- package/src/prover/smt/solver/theory-recfun.ts +2 -2
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -6
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -5
- package/src/prover/smt/solver/theory-seq-state.ts +6 -3
- package/src/prover/smt/solver/theory-seq.ts +32 -54
- package/src/prover/smt/solver/theory.ts +16 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -3
- package/src/prover/smt/solver/var-subst.ts +2 -2
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -11
- package/src/prover/zenon/node.ts +12 -11
- package/src/prover/zenon/tla/sets.ts +1 -1
- package/src/search.ts +131 -16
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
package/src/search.ts
CHANGED
|
@@ -22,7 +22,12 @@ import {
|
|
|
22
22
|
type Coverage,
|
|
23
23
|
type CoverageKind,
|
|
24
24
|
} from "./coverage";
|
|
25
|
-
import {
|
|
25
|
+
import {
|
|
26
|
+
getReadVariables,
|
|
27
|
+
isConstantLevel,
|
|
28
|
+
isExpressionImpure,
|
|
29
|
+
isImpureDefinition,
|
|
30
|
+
} from "./dependencies";
|
|
26
31
|
import { createEnvironment, type ResolvedModuleOperator } from "./environment";
|
|
27
32
|
import {
|
|
28
33
|
isStackOverflow,
|
|
@@ -55,6 +60,7 @@ import {
|
|
|
55
60
|
VARIABLE_LEVEL,
|
|
56
61
|
} from "./levels";
|
|
57
62
|
import { expandTemporal, getLevel, type ScopedExpression, type TemporalProperty } from "./liveness";
|
|
63
|
+
import { getLiveExpressions } from "./liveness-checker";
|
|
58
64
|
import { prettyPrint } from "./pretty-print";
|
|
59
65
|
import { getPossibleCounts, type CheckerRuntime } from "./runtime";
|
|
60
66
|
import {
|
|
@@ -63,7 +69,8 @@ import {
|
|
|
63
69
|
getSubscriptVariables,
|
|
64
70
|
type SpecDescription,
|
|
65
71
|
} from "./spec-description";
|
|
66
|
-
import { getRepresentative, getSymmetryGroup } from "./symmetry";
|
|
72
|
+
import { getRepresentative, getSymmetryGroup, type Images } from "./symmetry";
|
|
73
|
+
import type { Solution } from "./tableau";
|
|
67
74
|
import {
|
|
68
75
|
formatInnerMessage,
|
|
69
76
|
formatNestedMessage,
|
|
@@ -560,6 +567,29 @@ const getProperties = (
|
|
|
560
567
|
return properties;
|
|
561
568
|
};
|
|
562
569
|
|
|
570
|
+
// The expressions the LET definitions and arguments of a scope stand for, or undefined if it binds
|
|
571
|
+
// an operator only as a function.
|
|
572
|
+
const getScopeExpressions = (scope: Scope | undefined): Expression[] | undefined => {
|
|
573
|
+
const expressions: Expression[] = [];
|
|
574
|
+
const visited = new Set<Scope>();
|
|
575
|
+
const visit = (current: Scope | undefined): boolean => {
|
|
576
|
+
if (current === undefined || visited.has(current)) return true;
|
|
577
|
+
visited.add(current);
|
|
578
|
+
const binding = current.binding;
|
|
579
|
+
if (binding.kind === "Thunk") {
|
|
580
|
+
expressions.push(binding.expression);
|
|
581
|
+
return visit(binding.scope) && visit(current.parent);
|
|
582
|
+
}
|
|
583
|
+
if (binding.kind === "Operator") {
|
|
584
|
+
if (binding.operator.kind !== "Closure") return false;
|
|
585
|
+
expressions.push(binding.operator.body);
|
|
586
|
+
return visit(binding.operator.scope) && visit(current.parent);
|
|
587
|
+
}
|
|
588
|
+
return visit(current.parent);
|
|
589
|
+
};
|
|
590
|
+
return visit(scope) ? expressions : undefined;
|
|
591
|
+
};
|
|
592
|
+
|
|
563
593
|
const getNamedExpressions = (
|
|
564
594
|
kind: string,
|
|
565
595
|
names: string[],
|
|
@@ -680,6 +710,21 @@ export interface Search {
|
|
|
680
710
|
getTlcOrder: () => number[];
|
|
681
711
|
isSymmetric: boolean;
|
|
682
712
|
isConstrained: boolean;
|
|
713
|
+
getTypedChecks: (liveness: Solution[] | undefined) =>
|
|
714
|
+
| {
|
|
715
|
+
init: Expression;
|
|
716
|
+
next: Expression;
|
|
717
|
+
scope: Scope | undefined;
|
|
718
|
+
invariants: Expression[];
|
|
719
|
+
constraints: Expression[];
|
|
720
|
+
holdsInitialPredicates: (state: Value[]) => boolean;
|
|
721
|
+
actionProperties: ActionProperty[];
|
|
722
|
+
symmetry: Images[] | undefined;
|
|
723
|
+
view: Expression | undefined;
|
|
724
|
+
variableOrder: number[];
|
|
725
|
+
liveness: Solution[] | undefined;
|
|
726
|
+
}
|
|
727
|
+
| undefined;
|
|
683
728
|
findViolatedInvariant: (state: Value[], parent?: Value[]) => StateCheck | undefined;
|
|
684
729
|
getViolatedInvariants: (state: Value[]) => StateCheck[];
|
|
685
730
|
checkReplayedInitialState: (
|
|
@@ -724,7 +769,7 @@ export const getIncompleteSuccessorMessage = (
|
|
|
724
769
|
return `Successor state is not completely specified by ${subject}. The following variable${missing.length > 1 ? "s are" : " is"} not ${verb}: ${missing.join(", ")}.\n`;
|
|
725
770
|
};
|
|
726
771
|
|
|
727
|
-
const getContext = (
|
|
772
|
+
export const getContext = (
|
|
728
773
|
environment: Environment,
|
|
729
774
|
state: Value[] | undefined,
|
|
730
775
|
next: Value[] | undefined,
|
|
@@ -1051,15 +1096,24 @@ export const createSearch = (
|
|
|
1051
1096
|
const getViewValue = (expression: Expression, state: Value[]) =>
|
|
1052
1097
|
evaluate(expression, getContext(environment, state, undefined));
|
|
1053
1098
|
const getTlcStateFingerprint = (state: Value[]) => {
|
|
1054
|
-
const indices = getTlcOrder();
|
|
1055
1099
|
const representative =
|
|
1056
|
-
symmetryGroup === undefined ? state : getRepresentative(state, symmetryGroup,
|
|
1100
|
+
symmetryGroup === undefined ? state : getRepresentative(state, symmetryGroup, getTlcOrder());
|
|
1057
1101
|
return getTlcFingerprint(
|
|
1058
1102
|
view === undefined
|
|
1059
|
-
?
|
|
1103
|
+
? getTlcOrder().map((index) => representative[index])
|
|
1060
1104
|
: [getViewValue(view.expression, representative)],
|
|
1061
1105
|
);
|
|
1062
1106
|
};
|
|
1107
|
+
const findFailedInitialPredicate = (state: Value[]) =>
|
|
1108
|
+
isCoveredHeld(coveredInitialPredicates, state)
|
|
1109
|
+
? undefined
|
|
1110
|
+
: properties.initialPredicates.find(
|
|
1111
|
+
(predicate) =>
|
|
1112
|
+
!holdsLikeTlc(
|
|
1113
|
+
predicate.expression,
|
|
1114
|
+
getContext(environment, state, undefined, predicate.scope),
|
|
1115
|
+
),
|
|
1116
|
+
);
|
|
1063
1117
|
const violatingStates = new WeakSet<Value[]>();
|
|
1064
1118
|
const isViolated = (invariant: StateCheck, state: Value[], parent: Value[] | undefined) => {
|
|
1065
1119
|
const checkedParent = parent && !violatingStates.has(parent) ? parent : undefined;
|
|
@@ -1149,6 +1203,76 @@ export const createSearch = (
|
|
|
1149
1203
|
},
|
|
1150
1204
|
isSymmetric: symmetryGroup !== undefined,
|
|
1151
1205
|
isConstrained: constraints.length > 0 || actionConstraints.length > 0,
|
|
1206
|
+
getTypedChecks: (liveness) => {
|
|
1207
|
+
const isInterpreted =
|
|
1208
|
+
coverage !== undefined ||
|
|
1209
|
+
possible.length > 0 ||
|
|
1210
|
+
config.periodic !== undefined ||
|
|
1211
|
+
[...invariants, ...constraints].some((check) => check.scope !== undefined) ||
|
|
1212
|
+
actionConstraints.length > 0 ||
|
|
1213
|
+
properties.actionProperties.some((property) => property.scope !== undefined) ||
|
|
1214
|
+
(properties.liveness.length > 0 && (liveness === undefined || view !== undefined));
|
|
1215
|
+
if (isInterpreted || spec.init === undefined || spec.next === undefined) return undefined;
|
|
1216
|
+
const invariantExpressions = invariantPredicates.map((invariant) => invariant.predicate);
|
|
1217
|
+
const constraintExpressions = [
|
|
1218
|
+
...new Set(constraints.map((constraint) => constraint.predicate)),
|
|
1219
|
+
];
|
|
1220
|
+
const initialExpressions = properties.initialPredicates.map(
|
|
1221
|
+
(predicate) => predicate.expression,
|
|
1222
|
+
);
|
|
1223
|
+
const definitions = [...environment.facts.ids.keys()];
|
|
1224
|
+
const scopeExpressions = getScopeExpressions(spec.scope);
|
|
1225
|
+
// The interpreter evaluates again what the tier evaluated before it fell back. TLC evaluates
|
|
1226
|
+
// a constant definition without parameters once as it starts, so one with a startup value
|
|
1227
|
+
// never draws again. An operator a scope binds without its expression can reach any
|
|
1228
|
+
// definition.
|
|
1229
|
+
const isReplayed = (definition: Definition) =>
|
|
1230
|
+
getStartupValue(definition, environment) === undefined &&
|
|
1231
|
+
isImpureDefinition(definition, environment, "replayed");
|
|
1232
|
+
const hasReplayedEffects =
|
|
1233
|
+
scopeExpressions === undefined
|
|
1234
|
+
? definitions.some(isReplayed)
|
|
1235
|
+
: definitions.some(
|
|
1236
|
+
(definition) =>
|
|
1237
|
+
!(definition.kind === "Operator" && definition.params.length > 0) &&
|
|
1238
|
+
isConstantLevel(definition, environment) &&
|
|
1239
|
+
isReplayed(definition),
|
|
1240
|
+
) ||
|
|
1241
|
+
isExpressionImpure(
|
|
1242
|
+
[
|
|
1243
|
+
spec.init,
|
|
1244
|
+
spec.next,
|
|
1245
|
+
...invariantExpressions,
|
|
1246
|
+
...constraintExpressions,
|
|
1247
|
+
...initialExpressions,
|
|
1248
|
+
...properties.actionProperties.flatMap((property) => [
|
|
1249
|
+
property.action,
|
|
1250
|
+
property.subscript,
|
|
1251
|
+
]),
|
|
1252
|
+
...(view ? [view.expression] : []),
|
|
1253
|
+
...scopeExpressions,
|
|
1254
|
+
...getLiveExpressions(liveness ?? []),
|
|
1255
|
+
],
|
|
1256
|
+
environment,
|
|
1257
|
+
"replayed",
|
|
1258
|
+
);
|
|
1259
|
+
return hasReplayedEffects
|
|
1260
|
+
? undefined
|
|
1261
|
+
: {
|
|
1262
|
+
init: spec.init,
|
|
1263
|
+
next: spec.next,
|
|
1264
|
+
scope: spec.scope,
|
|
1265
|
+
invariants: invariantExpressions,
|
|
1266
|
+
constraints: constraintExpressions,
|
|
1267
|
+
holdsInitialPredicates: (state: Value[]) =>
|
|
1268
|
+
findFailedInitialPredicate(state) === undefined,
|
|
1269
|
+
actionProperties: properties.actionProperties,
|
|
1270
|
+
symmetry: symmetryGroup,
|
|
1271
|
+
view: view?.expression,
|
|
1272
|
+
variableOrder: getTlcOrder(),
|
|
1273
|
+
liveness,
|
|
1274
|
+
};
|
|
1275
|
+
},
|
|
1152
1276
|
getTlcOrder,
|
|
1153
1277
|
getStoredFingerprints: (states, fingerprintStates) => {
|
|
1154
1278
|
if (view !== undefined || isFingerprintedLikeTlc) {
|
|
@@ -1226,16 +1350,7 @@ export const createSearch = (
|
|
|
1226
1350
|
isUnchangedFor(constraint, state, parent) ||
|
|
1227
1351
|
holdsAsConjunct(constraint, getContext(environment, state, undefined)),
|
|
1228
1352
|
),
|
|
1229
|
-
findFailedInitialPredicate
|
|
1230
|
-
isCoveredHeld(coveredInitialPredicates, state)
|
|
1231
|
-
? undefined
|
|
1232
|
-
: properties.initialPredicates.find(
|
|
1233
|
-
(predicate) =>
|
|
1234
|
-
!holdsLikeTlc(
|
|
1235
|
-
predicate.expression,
|
|
1236
|
-
getContext(environment, state, undefined, predicate.scope),
|
|
1237
|
-
),
|
|
1238
|
-
),
|
|
1353
|
+
findFailedInitialPredicate,
|
|
1239
1354
|
findViolatedActionProperty: (state, next) =>
|
|
1240
1355
|
isCoveredHeld(coveredActionProperties, state, next)
|
|
1241
1356
|
? undefined
|
package/src/successors.ts
CHANGED
package/src/symmetry.ts
CHANGED
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
type Value,
|
|
21
21
|
} from "./values";
|
|
22
22
|
|
|
23
|
-
type Images = Map<string, ModelValue>;
|
|
23
|
+
export type Images = Map<string, ModelValue>;
|
|
24
24
|
|
|
25
25
|
const getPermutationKey = (permutation: Images) =>
|
|
26
26
|
[...permutation]
|
|
@@ -222,7 +222,7 @@ const permuteSortedElements = (elements: Value[], images: Images) => {
|
|
|
222
222
|
return merged;
|
|
223
223
|
};
|
|
224
224
|
|
|
225
|
-
const permuteValue = (value: Value, images: Images): Value => {
|
|
225
|
+
export const permuteValue = (value: Value, images: Images): Value => {
|
|
226
226
|
if (typeof value !== "object") return value;
|
|
227
227
|
const kind = value.kind;
|
|
228
228
|
if (kind === "ModelValue") return images.get(value.name) ?? value;
|
package/src/tableau.ts
CHANGED
|
@@ -8,7 +8,7 @@ interface LiveBoolean {
|
|
|
8
8
|
value: boolean;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
interface LiveState {
|
|
11
|
+
export interface LiveState {
|
|
12
12
|
kind: "State";
|
|
13
13
|
expression: Expression;
|
|
14
14
|
scope: Scope | undefined;
|
|
@@ -20,7 +20,7 @@ export interface LiveEnabled {
|
|
|
20
20
|
scope: Scope | undefined;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
interface LiveAction {
|
|
23
|
+
export interface LiveAction {
|
|
24
24
|
kind: "Action";
|
|
25
25
|
expression: Expression;
|
|
26
26
|
subscript: Expression | undefined;
|
package/src/tlc/fingerprint.ts
CHANGED
|
@@ -249,21 +249,87 @@ const extendScalar = (value: boolean | number | string | ModelValue) => {
|
|
|
249
249
|
return 5;
|
|
250
250
|
};
|
|
251
251
|
|
|
252
|
+
// TLC's fingerprint is linear in the bytes it extends by. A scalar extends it as zero bytes of its
|
|
253
|
+
// length would, and then by its fingerprint from zero, so code may extend by a scalar it knows
|
|
254
|
+
// without inspecting it.
|
|
255
|
+
export const getScalarExtension = (value: boolean | number | string | ModelValue) => {
|
|
256
|
+
const outerHigh = high;
|
|
257
|
+
const outerLow = low;
|
|
258
|
+
high = 0;
|
|
259
|
+
low = 0;
|
|
260
|
+
const extension = [extendScalar(value), high, low];
|
|
261
|
+
high = outerHigh;
|
|
262
|
+
low = outerLow;
|
|
263
|
+
return extension;
|
|
264
|
+
};
|
|
265
|
+
|
|
266
|
+
// Code that extends a fingerprint in the locals h and l as the functions here extend theirs, with
|
|
267
|
+
// a local m and the tables FINGERPRINT_TABLES gives as H0 to H3 and L0 to L3.
|
|
268
|
+
const getByteCode = (byte: string) =>
|
|
269
|
+
`m = (${byte} ^ l) & 255; l = ((l >>> 8) | (h << 24)) ^ L0[m]; h = (h >>> 8) ^ H0[m];`;
|
|
270
|
+
const getWordCode = (word: string) =>
|
|
271
|
+
`m = l ^ ${word}; l = h ^ L3[m & 255] ^ L2[(m >>> 8) & 255] ^ L1[(m >>> 16) & 255] ^ L0[m >>> 24]; h = H3[m & 255] ^ H2[(m >>> 8) & 255] ^ H1[(m >>> 16) & 255] ^ H0[m >>> 24];`;
|
|
272
|
+
|
|
273
|
+
export const FINGERPRINT_CODE = {
|
|
274
|
+
integer: (value: string) => `${getByteCode(String(INT_VALUE))} ${getWordCode(value)}`,
|
|
275
|
+
boolean: (value: string) =>
|
|
276
|
+
`${getByteCode(String(BOOL_VALUE))} ${getByteCode(`(${value} ? 116 : 102)`)}`,
|
|
277
|
+
set: (length: string) => `${getByteCode(String(SET_ENUM_VALUE))} ${getWordCode(length)}`,
|
|
278
|
+
function: (length: string) => `${getByteCode(String(FCN_RCD_VALUE))} ${getWordCode(length)}`,
|
|
279
|
+
// A scalar of the extension getScalarExtension gives.
|
|
280
|
+
scalar: (length: string, scalarHigh: string, scalarLow: string) =>
|
|
281
|
+
`{ let r = ${length}; for (; r >= 4; r -= 4) { ${getWordCode("0")} } for (; r > 0; r--) { ${getByteCode("0")} } h ^= ${scalarHigh}; l ^= ${scalarLow}; }`,
|
|
282
|
+
};
|
|
283
|
+
|
|
284
|
+
export const getFingerprintTables = () => ({
|
|
285
|
+
H0: SLICE_HIGH_0,
|
|
286
|
+
H1: SLICE_HIGH_1,
|
|
287
|
+
H2: SLICE_HIGH_2,
|
|
288
|
+
H3: SLICE_HIGH_3,
|
|
289
|
+
L0: SLICE_LOW_0,
|
|
290
|
+
L1: SLICE_LOW_1,
|
|
291
|
+
L2: SLICE_LOW_2,
|
|
292
|
+
L3: SLICE_LOW_3,
|
|
293
|
+
initialHigh,
|
|
294
|
+
initialLow,
|
|
295
|
+
});
|
|
296
|
+
|
|
297
|
+
// Extends the fingerprint held in state, as low and high words, by a value.
|
|
298
|
+
export const extendFingerprint = (state: Int32Array, value: Value) => {
|
|
299
|
+
const outerHigh = high;
|
|
300
|
+
const outerLow = low;
|
|
301
|
+
low = state[0];
|
|
302
|
+
high = state[1];
|
|
303
|
+
extendValue(value);
|
|
304
|
+
state[0] = low;
|
|
305
|
+
state[1] = high;
|
|
306
|
+
high = outerHigh;
|
|
307
|
+
low = outerLow;
|
|
308
|
+
};
|
|
309
|
+
|
|
310
|
+
const extendSet = (length: number) => {
|
|
311
|
+
extendByte(SET_ENUM_VALUE);
|
|
312
|
+
extendInt(length);
|
|
313
|
+
};
|
|
314
|
+
|
|
315
|
+
const extendFunction = (length: number) => {
|
|
316
|
+
extendByte(FCN_RCD_VALUE);
|
|
317
|
+
extendInt(length);
|
|
318
|
+
};
|
|
319
|
+
|
|
252
320
|
const extendValue = (value: Value) => {
|
|
253
321
|
if (typeof value !== "object" || isModelValue(value)) {
|
|
254
322
|
extendScalar(value);
|
|
255
323
|
} else if (isFunctionValue(value)) {
|
|
256
324
|
const functionValue = toFiniteFunction(value);
|
|
257
|
-
|
|
258
|
-
extendInt(functionValue.domain.length);
|
|
325
|
+
extendFunction(functionValue.domain.length);
|
|
259
326
|
for (let index = 0; index < functionValue.domain.length; index++) {
|
|
260
327
|
extendValue(functionValue.domain[index]);
|
|
261
328
|
extendValue(functionValue.range[index]);
|
|
262
329
|
}
|
|
263
330
|
} else {
|
|
264
331
|
const elements = toFiniteSet(value).elements;
|
|
265
|
-
|
|
266
|
-
extendInt(elements.length);
|
|
332
|
+
extendSet(elements.length);
|
|
267
333
|
for (const element of elements) extendValue(element);
|
|
268
334
|
}
|
|
269
335
|
};
|
|
@@ -280,19 +346,25 @@ export const getTlcFingerprint = (state: Value[]) => {
|
|
|
280
346
|
return fingerprint;
|
|
281
347
|
};
|
|
282
348
|
|
|
283
|
-
|
|
284
|
-
|
|
349
|
+
// Fingerprints each of count states from the values extend adds for it.
|
|
350
|
+
const getExtendedFingerprints = (count: number, extend: (position: number) => void) => {
|
|
351
|
+
const fingerprints = new BigInt64Array(count);
|
|
285
352
|
const words = new Int32Array(fingerprints.buffer);
|
|
286
353
|
const outerHigh = high;
|
|
287
354
|
const outerLow = low;
|
|
288
|
-
|
|
355
|
+
for (let position = 0; position < count; position++) {
|
|
289
356
|
high = initialHigh;
|
|
290
357
|
low = initialLow;
|
|
291
|
-
|
|
358
|
+
extend(position);
|
|
292
359
|
words[2 * position] = low;
|
|
293
360
|
words[2 * position + 1] = high;
|
|
294
|
-
}
|
|
361
|
+
}
|
|
295
362
|
high = outerHigh;
|
|
296
363
|
low = outerLow;
|
|
297
364
|
return fingerprints;
|
|
298
365
|
};
|
|
366
|
+
|
|
367
|
+
export const getTlcFingerprints = (states: Value[][], order: number[]) =>
|
|
368
|
+
getExtendedFingerprints(states.length, (position) => {
|
|
369
|
+
for (const index of order) extendValue(states[position][index]);
|
|
370
|
+
});
|
package/src/tlc/summary.ts
CHANGED
|
@@ -69,30 +69,45 @@ export const getActualProbability = (distance: bigint) => {
|
|
|
69
69
|
return Number(`${quotient + (isRoundedUp ? 1n : 0n)}e-${exponent + 1}`);
|
|
70
70
|
};
|
|
71
71
|
|
|
72
|
+
// The fingerprints come in runs, each of which holds only fingerprints below those of the next.
|
|
72
73
|
export const getFingerprintDistance = (
|
|
73
74
|
distinctStates: number,
|
|
74
75
|
generatedStates: number,
|
|
75
|
-
|
|
76
|
+
forEachRun: (visit: (run: BigInt64Array) => void) => void,
|
|
76
77
|
) => {
|
|
77
78
|
const probability = getOptimisticProbability(distinctStates, generatedStates);
|
|
78
79
|
if (probability < ACTUAL_PROBABILITY_THRESHOLD) return undefined;
|
|
79
|
-
const fingerprints = getFingerprints().sort();
|
|
80
|
-
const words = new Int32Array(fingerprints.buffer);
|
|
81
80
|
let narrowest = Number.POSITIVE_INFINITY;
|
|
82
81
|
let widest = 0x7fff_ffff_ffff_ffffn;
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
const gap = highGap * 0x1_0000_0000 + (words[2 * index] >>> 0) - (words[2 * index - 2] >>> 0);
|
|
90
|
-
narrowest = Math.min(narrowest, gap);
|
|
91
|
-
} else {
|
|
92
|
-
const gap = fingerprints[index] - fingerprints[index - 1];
|
|
82
|
+
let previous: bigint | undefined;
|
|
83
|
+
forEachRun((run) => {
|
|
84
|
+
if (run.length === 0) return;
|
|
85
|
+
const fingerprints = run.sort();
|
|
86
|
+
if (previous !== undefined && previous < 0n === fingerprints[0] < 0n) {
|
|
87
|
+
const gap = fingerprints[0] - previous;
|
|
93
88
|
if (gap < widest) widest = gap;
|
|
94
89
|
}
|
|
95
|
-
|
|
90
|
+
previous = fingerprints[fingerprints.length - 1];
|
|
91
|
+
const words = new Int32Array(
|
|
92
|
+
fingerprints.buffer,
|
|
93
|
+
fingerprints.byteOffset,
|
|
94
|
+
fingerprints.length * 2,
|
|
95
|
+
);
|
|
96
|
+
for (let index = 1; index < fingerprints.length; index++) {
|
|
97
|
+
const high = words[2 * index + 1];
|
|
98
|
+
const previousHigh = words[2 * index - 1];
|
|
99
|
+
if (high < 0 !== previousHigh < 0) continue;
|
|
100
|
+
const highGap = high - previousHigh;
|
|
101
|
+
if (highGap <= 0x10_0000) {
|
|
102
|
+
const gap =
|
|
103
|
+
highGap * 0x1_0000_0000 + (words[2 * index] >>> 0) - (words[2 * index - 2] >>> 0);
|
|
104
|
+
narrowest = Math.min(narrowest, gap);
|
|
105
|
+
} else {
|
|
106
|
+
const gap = fingerprints[index] - fingerprints[index - 1];
|
|
107
|
+
if (gap < widest) widest = gap;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
});
|
|
96
111
|
if (narrowest === Number.POSITIVE_INFINITY) return widest;
|
|
97
112
|
const narrow = BigInt(narrowest);
|
|
98
113
|
return narrow < widest ? narrow : widest;
|