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/search.ts
CHANGED
|
@@ -28,9 +28,12 @@ import {
|
|
|
28
28
|
isExpressionImpure,
|
|
29
29
|
isImpureDefinition,
|
|
30
30
|
} from "./dependencies";
|
|
31
|
-
import { createEnvironment, type ResolvedModuleOperator } from "./environment";
|
|
32
31
|
import {
|
|
33
|
-
|
|
32
|
+
createEnvironment,
|
|
33
|
+
type ResolvedModuleOperator,
|
|
34
|
+
type RuntimeInvariant,
|
|
35
|
+
} from "./environment";
|
|
36
|
+
import {
|
|
34
37
|
TlaConfigError,
|
|
35
38
|
TlaEvaluationError,
|
|
36
39
|
TlaModuleError,
|
|
@@ -49,6 +52,7 @@ import {
|
|
|
49
52
|
type Context,
|
|
50
53
|
type Environment,
|
|
51
54
|
type Scope,
|
|
55
|
+
type State,
|
|
52
56
|
} from "./evaluate";
|
|
53
57
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
54
58
|
import type { JavaOverride } from "./java-overrides";
|
|
@@ -82,11 +86,13 @@ import { createTlcOrder } from "./tlc/order";
|
|
|
82
86
|
import { getTlcFingerprint, getTlcFingerprints, setFingerprintPolynomial } from "./tlc/fingerprint";
|
|
83
87
|
import type { TlcVersion } from "./tlc/version";
|
|
84
88
|
import {
|
|
89
|
+
createModelValue,
|
|
85
90
|
formatValue,
|
|
86
91
|
freezeStringOrder,
|
|
87
92
|
getWrittenPairs,
|
|
88
93
|
isFunctionValue,
|
|
89
94
|
isUpdatedElementOf,
|
|
95
|
+
markNormalized,
|
|
90
96
|
setAliasName,
|
|
91
97
|
setStringOrder,
|
|
92
98
|
setValueOptions,
|
|
@@ -95,8 +101,9 @@ import {
|
|
|
95
101
|
type Value,
|
|
96
102
|
} from "./values";
|
|
97
103
|
|
|
98
|
-
export interface
|
|
104
|
+
export interface CliSettings {
|
|
99
105
|
readLine?: () => string | undefined;
|
|
106
|
+
runtimeInvariants?: RuntimeInvariant[];
|
|
100
107
|
}
|
|
101
108
|
|
|
102
109
|
interface EnvironmentSettings
|
|
@@ -121,7 +128,7 @@ interface EnvironmentSettings
|
|
|
121
128
|
| "isLazyValueExpanded"
|
|
122
129
|
| "isViewPrinted"
|
|
123
130
|
>,
|
|
124
|
-
|
|
131
|
+
CliSettings {}
|
|
125
132
|
|
|
126
133
|
interface NamedExpression {
|
|
127
134
|
name: string;
|
|
@@ -207,14 +214,7 @@ const isLiteralDefinition = (definition: Definition) =>
|
|
|
207
214
|
|
|
208
215
|
const getConstantValue = (name: string, definition: Definition, environment: Environment) => {
|
|
209
216
|
if (environment.constants.has(name)) return environment.constants.get(name);
|
|
210
|
-
|
|
211
|
-
return undefined;
|
|
212
|
-
try {
|
|
213
|
-
return evaluate(createIdentifier(name), getContext(environment, undefined, undefined));
|
|
214
|
-
} catch (error) {
|
|
215
|
-
if (error instanceof TlaEvaluationError || isStackOverflow(error)) return undefined;
|
|
216
|
-
throw error;
|
|
217
|
-
}
|
|
217
|
+
return isLiteralDefinition(definition) ? undefined : getStartupValue(definition, environment);
|
|
218
218
|
};
|
|
219
219
|
|
|
220
220
|
const getConfigDefinition = (kind: string, name: string, environment: Environment) => {
|
|
@@ -381,12 +381,20 @@ const getSpecification = (
|
|
|
381
381
|
let isUntaggedFound = false;
|
|
382
382
|
expandTemporal(definition.body, undefined, environment, false).forEach((item) => {
|
|
383
383
|
const conjunct = item.expression;
|
|
384
|
-
|
|
384
|
+
// TLC takes a state-level definition of the spec whole as an initial predicate.
|
|
385
|
+
const isInitial = item.path.some((name) => {
|
|
386
|
+
const expanded = getDefinition(name, environment);
|
|
387
|
+
return (
|
|
388
|
+
expanded?.kind === "Operator" &&
|
|
389
|
+
getLevel(expanded.body, undefined, environment) === VARIABLE_LEVEL
|
|
390
|
+
);
|
|
391
|
+
});
|
|
392
|
+
if (!isInitial && isConstantTrue(item, environment, "spec")) return;
|
|
385
393
|
const variableIndex =
|
|
386
394
|
conjunct.kind === "Identifier" && !isLocallyResolved(conjunct)
|
|
387
395
|
? environment.variableIndex.get(conjunct.name)
|
|
388
396
|
: undefined;
|
|
389
|
-
if (conjunct.kind === "Identifier" && variableIndex !== undefined) {
|
|
397
|
+
if (!isInitial && conjunct.kind === "Identifier" && variableIndex !== undefined) {
|
|
390
398
|
const range = variableLocations[variableIndex].range;
|
|
391
399
|
throw new TlaConfigError(
|
|
392
400
|
`The operator ${conjunct.name}, which equals ${range ? formatRange(range) : conjunct.name},\ncannot be used as a spec`,
|
|
@@ -651,20 +659,26 @@ const getPredicate = (expression: Expression, environment: Environment) => {
|
|
|
651
659
|
};
|
|
652
660
|
|
|
653
661
|
const getStateChecks = (named: NamedExpression[], environment: Environment): StateCheck[] =>
|
|
654
|
-
named.flatMap((item) =>
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
662
|
+
named.flatMap((item) => {
|
|
663
|
+
const predicate = getPredicate(item.expression, environment);
|
|
664
|
+
const isImpure =
|
|
665
|
+
item.scope === undefined && getReadVariables(predicate, environment) === undefined;
|
|
666
|
+
// TLC evaluates an invariant whole, so one that prints isn't split into conjuncts.
|
|
667
|
+
return (isImpure ? [predicate] : getConjuncts(item.expression, environment)).map(
|
|
668
|
+
(expression) => {
|
|
669
|
+
const variables =
|
|
670
|
+
item.scope === undefined ? getReadVariables(expression, environment) : undefined;
|
|
671
|
+
return {
|
|
672
|
+
name: item.name,
|
|
673
|
+
expression,
|
|
674
|
+
scope: item.scope,
|
|
675
|
+
variables,
|
|
676
|
+
membership: getMembership(expression, variables, environment),
|
|
677
|
+
predicate,
|
|
678
|
+
};
|
|
679
|
+
},
|
|
680
|
+
);
|
|
681
|
+
});
|
|
668
682
|
|
|
669
683
|
const isUnchangedFor = (stateCheck: StateCheck, state: Value[], parent: Value[] | undefined) => {
|
|
670
684
|
const variables = stateCheck.variables;
|
|
@@ -707,8 +721,8 @@ export interface Search {
|
|
|
707
721
|
toRecord: (state: Value[]) => Record<string, Value>;
|
|
708
722
|
evaluateAlias: (
|
|
709
723
|
alias: string,
|
|
710
|
-
state:
|
|
711
|
-
next:
|
|
724
|
+
state: State,
|
|
725
|
+
next: State | undefined,
|
|
712
726
|
isTool: boolean,
|
|
713
727
|
) => Record<string, Value>;
|
|
714
728
|
spec: Specification;
|
|
@@ -733,12 +747,13 @@ export interface Search {
|
|
|
733
747
|
}
|
|
734
748
|
| undefined;
|
|
735
749
|
findViolatedInvariant: (state: Value[], parent?: Value[]) => StateCheck | undefined;
|
|
736
|
-
|
|
750
|
+
forEachViolatedInvariant: (state: Value[], onViolated: (invariant: StateCheck) => void) => void;
|
|
737
751
|
checkReplayedInitialState: (
|
|
738
752
|
state: Value[],
|
|
739
753
|
tracing: Environment,
|
|
740
754
|
addFingerprint: () => void,
|
|
741
|
-
|
|
755
|
+
onViolated: (violation: Pick<InitialStateViolation, "status" | "name">) => void,
|
|
756
|
+
) => void;
|
|
742
757
|
checkReplayedSuccessor: (
|
|
743
758
|
state: Value[],
|
|
744
759
|
next: Value[],
|
|
@@ -778,8 +793,8 @@ export const getIncompleteSuccessorMessage = (
|
|
|
778
793
|
|
|
779
794
|
export const getContext = (
|
|
780
795
|
environment: Environment,
|
|
781
|
-
state:
|
|
782
|
-
next:
|
|
796
|
+
state: State | undefined,
|
|
797
|
+
next: State | undefined,
|
|
783
798
|
scope?: Scope,
|
|
784
799
|
) => ({ environment, scope, state, next });
|
|
785
800
|
|
|
@@ -812,7 +827,7 @@ const getExpectedBoolean = (expression: Expression, environment: Environment) =>
|
|
|
812
827
|
|
|
813
828
|
const holdsAsConjunct = (check: StateCheck, context: Context) =>
|
|
814
829
|
holdsLikeTlc(check.expression, context, (expression, environment) => {
|
|
815
|
-
holdsLikeTlc(check.predicate, context);
|
|
830
|
+
if (check.predicate !== check.expression) holdsLikeTlc(check.predicate, context);
|
|
816
831
|
return getExpectedBoolean(expression, environment);
|
|
817
832
|
});
|
|
818
833
|
|
|
@@ -860,7 +875,12 @@ export const createCheckEnvironment = (
|
|
|
860
875
|
isStringOrderFrozen = false,
|
|
861
876
|
) => {
|
|
862
877
|
const order = createTlcOrder(options.source, options.loadModule);
|
|
863
|
-
setStringOrder(
|
|
878
|
+
setStringOrder(
|
|
879
|
+
order.getStringOrder(
|
|
880
|
+
config,
|
|
881
|
+
(options.runtimeInvariants ?? []).flatMap((invariant) => invariant.module ?? []),
|
|
882
|
+
),
|
|
883
|
+
);
|
|
864
884
|
setValueOptions(options);
|
|
865
885
|
setFingerprintPolynomial(options.fingerprintPolynomial ?? 0);
|
|
866
886
|
if (isStringOrderFrozen) freezeStringOrder();
|
|
@@ -883,6 +903,7 @@ export const createCheckEnvironment = (
|
|
|
883
903
|
version: options.version,
|
|
884
904
|
moduleOperators: options.moduleOperators,
|
|
885
905
|
readLine: options.readLine,
|
|
906
|
+
runtimeInvariants: options.runtimeInvariants,
|
|
886
907
|
});
|
|
887
908
|
return { order, specification };
|
|
888
909
|
};
|
|
@@ -908,6 +929,7 @@ export const prepareSearch = (options: CheckOptions) => {
|
|
|
908
929
|
() => created.order.getDeclarationOrder("variable"),
|
|
909
930
|
options.onProgress,
|
|
910
931
|
specification.moduleOperators,
|
|
932
|
+
specification.runtimeInvariants,
|
|
911
933
|
);
|
|
912
934
|
return { config, specification, environment, search, getDescription };
|
|
913
935
|
};
|
|
@@ -948,6 +970,7 @@ export const createSearch = (
|
|
|
948
970
|
getVariableOrder: () => string[],
|
|
949
971
|
onProgress?: CheckOptions["onProgress"],
|
|
950
972
|
moduleOperators: ResolvedModuleOperator[] = [],
|
|
973
|
+
runtimeInvariants: RuntimeInvariant[] = [],
|
|
951
974
|
): Search | undefined => {
|
|
952
975
|
const getModuleOperators = (kind: ResolvedModuleOperator["kind"]) =>
|
|
953
976
|
moduleOperators
|
|
@@ -976,12 +999,12 @@ export const createSearch = (
|
|
|
976
999
|
text: `Implied-temporal checking is a tautology.\nThe temporal formula ${live} at ${formatRange(liveRange)} equals\nthe fairness constraints of the behavior specification ${specName} at ${formatRange(specRange)}.\nTherefore, checking whether ${specName} => ${live} using TLC will never result in a violation of ${live}.`,
|
|
977
1000
|
});
|
|
978
1001
|
}
|
|
979
|
-
const
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
1002
|
+
const checkedInvariants = getStateChecks(
|
|
1003
|
+
[...configInvariants, ...properties.invariants],
|
|
1004
|
+
environment,
|
|
1005
|
+
);
|
|
983
1006
|
const isCheckingBehaviors =
|
|
984
|
-
|
|
1007
|
+
checkedInvariants.length > 0 ||
|
|
985
1008
|
properties.actionProperties.length > 0 ||
|
|
986
1009
|
properties.liveness.length > 0;
|
|
987
1010
|
if (
|
|
@@ -999,6 +1022,22 @@ export const createSearch = (
|
|
|
999
1022
|
if (spec.next === undefined && isCheckingBehaviors) {
|
|
1000
1023
|
throw new TlaConfigError("The configuration file did not specify the next state predicate.");
|
|
1001
1024
|
}
|
|
1025
|
+
const runtimeChecks = getStateChecks(
|
|
1026
|
+
runtimeInvariants.map((invariant) => {
|
|
1027
|
+
const definition = getDefinition(invariant.name, environment);
|
|
1028
|
+
return {
|
|
1029
|
+
name: invariant.name,
|
|
1030
|
+
expression:
|
|
1031
|
+
definition?.kind === "Operator" ? definition.body : createIdentifier(invariant.name),
|
|
1032
|
+
scope: undefined,
|
|
1033
|
+
};
|
|
1034
|
+
}),
|
|
1035
|
+
environment,
|
|
1036
|
+
);
|
|
1037
|
+
const invariants = [...checkedInvariants, ...runtimeChecks];
|
|
1038
|
+
const invariantPredicates = [
|
|
1039
|
+
...new Map(invariants.map((invariant) => [invariant.predicate, invariant])).values(),
|
|
1040
|
+
];
|
|
1002
1041
|
const namedConstraints = getNamedExpressions(
|
|
1003
1042
|
"constraint",
|
|
1004
1043
|
[...config.constraints, ...getModuleOperators("constraint").map((operator) => operator.name)],
|
|
@@ -1023,6 +1062,12 @@ export const createSearch = (
|
|
|
1023
1062
|
...getCoveredChecks("invariant", configInvariants),
|
|
1024
1063
|
...getCoveredChecks("invariant", properties.invariants, false),
|
|
1025
1064
|
];
|
|
1065
|
+
const coveredInvariantChecks = new Map(
|
|
1066
|
+
[...configInvariants, ...properties.invariants].map((item, index) => [
|
|
1067
|
+
getPredicate(item.expression, environment),
|
|
1068
|
+
coveredInvariants[index],
|
|
1069
|
+
]),
|
|
1070
|
+
);
|
|
1026
1071
|
const coveredActionConstraints = getCoveredChecks("constraint", actionConstraints);
|
|
1027
1072
|
const coveredConstraints = getCoveredChecks("constraint", namedConstraints);
|
|
1028
1073
|
const coveredInitialPredicates = getCoveredChecks("implied", properties.initialPredicates, false);
|
|
@@ -1045,9 +1090,6 @@ export const createSearch = (
|
|
|
1045
1090
|
return undefined;
|
|
1046
1091
|
}
|
|
1047
1092
|
};
|
|
1048
|
-
const isCoveredHeld = (checks: CoveredCheck[], state: Value[], next?: Value[]) =>
|
|
1049
|
-
coverage !== undefined &&
|
|
1050
|
-
checks.every((check) => evaluateCovered(coverage, check, state, next) === true);
|
|
1051
1093
|
const satisfiesCovered = (checks: CoveredCheck[], state: Value[], next?: Value[]) => {
|
|
1052
1094
|
if (!coverage) return undefined;
|
|
1053
1095
|
for (const check of checks) {
|
|
@@ -1103,9 +1145,15 @@ export const createSearch = (
|
|
|
1103
1145
|
};
|
|
1104
1146
|
const getViewValue = (expression: Expression, state: Value[]) =>
|
|
1105
1147
|
evaluate(expression, getContext(environment, state, undefined));
|
|
1148
|
+
const getRepresentativeState = (state: Value[]) => {
|
|
1149
|
+
// TLC's TLCStateMut#fingerPrint deep-normalizes a state before it evaluates the view.
|
|
1150
|
+
if (view !== undefined) state.forEach(markNormalized);
|
|
1151
|
+
return symmetryGroup === undefined
|
|
1152
|
+
? state
|
|
1153
|
+
: getRepresentative(state, symmetryGroup, getTlcOrder());
|
|
1154
|
+
};
|
|
1106
1155
|
const getTlcStateFingerprint = (state: Value[]) => {
|
|
1107
|
-
const representative =
|
|
1108
|
-
symmetryGroup === undefined ? state : getRepresentative(state, symmetryGroup, getTlcOrder());
|
|
1156
|
+
const representative = getRepresentativeState(state);
|
|
1109
1157
|
return getTlcFingerprint(
|
|
1110
1158
|
view === undefined
|
|
1111
1159
|
? getTlcOrder().map((index) => representative[index])
|
|
@@ -1113,15 +1161,16 @@ export const createSearch = (
|
|
|
1113
1161
|
);
|
|
1114
1162
|
};
|
|
1115
1163
|
const findFailedInitialPredicate = (state: Value[]) =>
|
|
1116
|
-
|
|
1117
|
-
|
|
1118
|
-
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
|
|
1123
|
-
),
|
|
1124
|
-
|
|
1164
|
+
properties.initialPredicates.find((predicate, index) => {
|
|
1165
|
+
const value =
|
|
1166
|
+
coverage && evaluateCovered(coverage, coveredInitialPredicates[index], state, undefined);
|
|
1167
|
+
return typeof value === "boolean"
|
|
1168
|
+
? !value
|
|
1169
|
+
: !holdsLikeTlc(
|
|
1170
|
+
predicate.expression,
|
|
1171
|
+
getContext(environment, state, undefined, predicate.scope),
|
|
1172
|
+
);
|
|
1173
|
+
});
|
|
1125
1174
|
const violatingStates = new WeakSet<Value[]>();
|
|
1126
1175
|
const isViolated = (invariant: StateCheck, state: Value[], parent: Value[] | undefined) => {
|
|
1127
1176
|
const checkedParent = parent && !violatingStates.has(parent) ? parent : undefined;
|
|
@@ -1145,6 +1194,21 @@ export const createSearch = (
|
|
|
1145
1194
|
);
|
|
1146
1195
|
}
|
|
1147
1196
|
};
|
|
1197
|
+
const isPredicateViolated = (
|
|
1198
|
+
predicate: StateCheck,
|
|
1199
|
+
state: Value[],
|
|
1200
|
+
parent: Value[] | undefined,
|
|
1201
|
+
) => {
|
|
1202
|
+
const covered = coveredInvariantChecks.get(predicate.predicate);
|
|
1203
|
+
const value =
|
|
1204
|
+
coverage && covered ? evaluateCovered(coverage, covered, state, undefined) : undefined;
|
|
1205
|
+
return typeof value === "boolean"
|
|
1206
|
+
? !value
|
|
1207
|
+
: invariants.some(
|
|
1208
|
+
(invariant) =>
|
|
1209
|
+
invariant.predicate === predicate.predicate && isViolated(invariant, state, parent),
|
|
1210
|
+
);
|
|
1211
|
+
};
|
|
1148
1212
|
const isFingerprintedLikeTlc = hasWideString(config, environment);
|
|
1149
1213
|
runtime.getFingerprint = getTlcStateFingerprint;
|
|
1150
1214
|
const findUnwitnessedPossible = () => {
|
|
@@ -1200,14 +1264,16 @@ export const createSearch = (
|
|
|
1200
1264
|
spec,
|
|
1201
1265
|
toRecord,
|
|
1202
1266
|
evaluateAlias: (alias, state, next, isTool) => {
|
|
1267
|
+
const getStateRecord = () =>
|
|
1268
|
+
toRecord(state.map((value) => value ?? createModelValue("null")));
|
|
1203
1269
|
try {
|
|
1204
1270
|
getConfigDefinition("alias", alias, environment);
|
|
1205
1271
|
const value = evaluate(createIdentifier(alias), getContext(environment, state, next));
|
|
1206
1272
|
const record = toAliasRecord(value);
|
|
1207
|
-
return record === undefined ?
|
|
1273
|
+
return record === undefined ? getStateRecord() : setAliasName(record, alias);
|
|
1208
1274
|
} catch (error) {
|
|
1209
1275
|
if (!(error instanceof TlaConfigError || error instanceof TlaEvaluationError)) throw error;
|
|
1210
|
-
return { ...
|
|
1276
|
+
return { ...getStateRecord(), _ALIASEvalError: formatNestedMessage(error.message, isTool) };
|
|
1211
1277
|
}
|
|
1212
1278
|
},
|
|
1213
1279
|
isSymmetric: symmetryGroup !== undefined,
|
|
@@ -1291,40 +1357,38 @@ export const createSearch = (
|
|
|
1291
1357
|
},
|
|
1292
1358
|
getFingerprintState: (state) => {
|
|
1293
1359
|
if (isFingerprintedLikeTlc) return [String(getTlcStateFingerprint(state))];
|
|
1294
|
-
const representative =
|
|
1295
|
-
symmetryGroup === undefined
|
|
1296
|
-
? state
|
|
1297
|
-
: getRepresentative(state, symmetryGroup, getTlcOrder());
|
|
1360
|
+
const representative = getRepresentativeState(state);
|
|
1298
1361
|
return view === undefined ? representative : [getViewValue(view.expression, representative)];
|
|
1299
1362
|
},
|
|
1300
1363
|
findViolatedInvariant: (state, parent) => {
|
|
1301
|
-
|
|
1302
|
-
|
|
1364
|
+
const violated =
|
|
1365
|
+
coverage === undefined
|
|
1366
|
+
? invariants.find((invariant) => isViolated(invariant, state, parent))
|
|
1367
|
+
: invariantPredicates.find((predicate) => isPredicateViolated(predicate, state, parent));
|
|
1303
1368
|
if (violated) violatingStates.add(state);
|
|
1304
1369
|
return violated;
|
|
1305
1370
|
},
|
|
1306
|
-
|
|
1307
|
-
const
|
|
1308
|
-
|
|
1309
|
-
|
|
1310
|
-
|
|
1311
|
-
|
|
1312
|
-
);
|
|
1313
|
-
if (violated.length > 0) violatingStates.add(state);
|
|
1314
|
-
return violated;
|
|
1371
|
+
forEachViolatedInvariant: (state, onViolated) => {
|
|
1372
|
+
for (const predicate of invariantPredicates) {
|
|
1373
|
+
if (!isPredicateViolated(predicate, state, undefined)) continue;
|
|
1374
|
+
violatingStates.add(state);
|
|
1375
|
+
onViolated(predicate);
|
|
1376
|
+
}
|
|
1315
1377
|
},
|
|
1316
|
-
checkReplayedInitialState: (state, tracing, addFingerprint) => {
|
|
1378
|
+
checkReplayedInitialState: (state, tracing, addFingerprint, onViolated) => {
|
|
1317
1379
|
const holdsIn = (expression: Expression, scope: Scope | undefined) =>
|
|
1318
1380
|
holdsLikeTlc(expression, getContext(tracing, state, undefined, scope));
|
|
1319
1381
|
if (constraints.every((constraint) => holdsIn(constraint.predicate, constraint.scope))) {
|
|
1320
1382
|
addFingerprint();
|
|
1321
1383
|
}
|
|
1322
|
-
const invariant
|
|
1323
|
-
|
|
1384
|
+
for (const invariant of invariantPredicates) {
|
|
1385
|
+
if (holdsIn(invariant.predicate, invariant.scope)) continue;
|
|
1386
|
+
onViolated({ status: "invariant-violation", name: invariant.name });
|
|
1387
|
+
}
|
|
1324
1388
|
const predicate = properties.initialPredicates.find(
|
|
1325
1389
|
(check) => !holdsIn(check.expression, check.scope),
|
|
1326
1390
|
);
|
|
1327
|
-
|
|
1391
|
+
if (predicate) onViolated({ status: "liveness-violation", name: predicate.name });
|
|
1328
1392
|
},
|
|
1329
1393
|
checkReplayedSuccessor: (state, next, tracing, addFingerprint) => {
|
|
1330
1394
|
const isInModel =
|
|
@@ -1361,31 +1425,32 @@ export const createSearch = (
|
|
|
1361
1425
|
),
|
|
1362
1426
|
findFailedInitialPredicate,
|
|
1363
1427
|
findViolatedActionProperty: (state, next) =>
|
|
1364
|
-
|
|
1365
|
-
|
|
1366
|
-
|
|
1367
|
-
|
|
1368
|
-
|
|
1369
|
-
|
|
1370
|
-
|
|
1371
|
-
|
|
1372
|
-
|
|
1373
|
-
|
|
1374
|
-
)
|
|
1375
|
-
|
|
1376
|
-
|
|
1377
|
-
|
|
1378
|
-
|
|
1379
|
-
|
|
1380
|
-
|
|
1381
|
-
|
|
1382
|
-
|
|
1383
|
-
|
|
1384
|
-
|
|
1385
|
-
|
|
1386
|
-
|
|
1387
|
-
|
|
1388
|
-
|
|
1428
|
+
actionProperties.find((property, index) => {
|
|
1429
|
+
const value =
|
|
1430
|
+
coverage && evaluateCovered(coverage, coveredActionProperties[index], state, next);
|
|
1431
|
+
if (typeof value === "boolean") return !value;
|
|
1432
|
+
try {
|
|
1433
|
+
return (
|
|
1434
|
+
!holdsLikeTlc(
|
|
1435
|
+
property.action,
|
|
1436
|
+
getContext(environment, state, next, property.scope),
|
|
1437
|
+
() =>
|
|
1438
|
+
`Attempted to evaluate an expression of form [A]_e, but A was not a boolean.\n${describeRange(property.box)}`,
|
|
1439
|
+
) &&
|
|
1440
|
+
!holds(
|
|
1441
|
+
property.unchanged,
|
|
1442
|
+
getContext(environment, state, next, property.scope),
|
|
1443
|
+
"a subscript",
|
|
1444
|
+
)
|
|
1445
|
+
);
|
|
1446
|
+
} catch (error) {
|
|
1447
|
+
throw withHeadline(
|
|
1448
|
+
withNextStateExitCode(error),
|
|
1449
|
+
MESSAGE_CODE.actionPropertyEvaluationFailed,
|
|
1450
|
+
`Evaluating action property ${property.name} failed.`,
|
|
1451
|
+
);
|
|
1452
|
+
}
|
|
1453
|
+
}),
|
|
1389
1454
|
satisfiesActionConstraints: (state, next) =>
|
|
1390
1455
|
satisfiesCovered(coveredActionConstraints, state, next) ??
|
|
1391
1456
|
actionConstraints.every((constraint) => holdsActionConstraint(constraint, state, next)),
|