tla-ts 0.0.10-dev.3a85c3a9e → 0.0.10-dev.45c0eaef5
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 +79 -79
- 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 -107
- package/src/check.ts +535 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +21 -7
- package/src/cli/tlc.ts +31 -11
- 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 +131 -41
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -13
- package/src/instances.ts +135 -11
- 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 +204 -62
- 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/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 +27 -1
- 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 +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 +1 -2
- 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 +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- 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 -10
- 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 +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 +15 -5
- package/src/prover/smt/solver/lp/containers.ts +7 -1
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
- 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/nex-creator.ts +3 -2
- package/src/prover/smt/solver/lp/nex.ts +2 -1
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -1
- package/src/prover/smt/solver/lp/nla-core.ts +26 -6
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -81
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -95
- 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 +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 -71
- 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 +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/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 +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/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +20 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- 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 +17 -7
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- 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 +4 -7
- 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 +713 -210
- 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 +350 -195
- 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 +10 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +11 -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 +1 -0
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/equality-rules.ts +24 -0
- package/src/prover/zenon/expr.ts +21 -0
- package/src/prover/zenon/index-table.ts +7 -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/prover/zenon/rules.ts +2 -1
- package/src/resolve.ts +1274 -258
- package/src/runtime.ts +25 -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 +18 -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 +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +348 -153
- package/src/simulate.ts +250 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +564 -138
- 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 +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- 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/dfid.ts
CHANGED
|
@@ -1,21 +1,25 @@
|
|
|
1
1
|
import type { Expression } from "./ast";
|
|
2
2
|
import type { CheckOptions } from "./check";
|
|
3
|
+
import type { CoverageOutput } from "./coverage";
|
|
3
4
|
import {
|
|
4
5
|
getErrorExitCode,
|
|
5
6
|
getUnexpectedException,
|
|
6
7
|
isStackOverflow,
|
|
7
8
|
TlaEvaluationError,
|
|
8
|
-
TlaIncompleteSuccessorError,
|
|
9
9
|
TlaStackOverflowError,
|
|
10
10
|
TlaTooManyStatesError,
|
|
11
11
|
TlaUnsupportedError,
|
|
12
12
|
} from "./errors";
|
|
13
|
-
import { createTracingEnvironment } from "./evaluate";
|
|
13
|
+
import { createTracingEnvironment, type State } from "./evaluate";
|
|
14
14
|
import { EXIT_STATUS, getMessageExitStatus, withLivenessExitCode } from "./exit-codes";
|
|
15
15
|
import { createLivenessChecker } from "./liveness-checker";
|
|
16
|
-
import {
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
import {
|
|
17
|
+
addActionCoverage,
|
|
18
|
+
getIncompleteSuccessorMessage,
|
|
19
|
+
prepareSearch,
|
|
20
|
+
reportAssumptionViolation,
|
|
21
|
+
} from "./search";
|
|
22
|
+
import { forEachInitialState, forEachSuccessor, getSuccessors, type Successor } from "./successors";
|
|
19
23
|
import {
|
|
20
24
|
formatNestedMessage,
|
|
21
25
|
formatTlcDate,
|
|
@@ -26,9 +30,10 @@ import {
|
|
|
26
30
|
withUnexpectedException,
|
|
27
31
|
} from "./tlc/messages";
|
|
28
32
|
import { getTlcFingerprint } from "./tlc/fingerprint";
|
|
29
|
-
import {
|
|
33
|
+
import { createJavaRandom } from "./tlc/random";
|
|
34
|
+
import { replayInitialStates, replaySuccessors, walkSuccessors } from "./tlc/replay";
|
|
30
35
|
import { getOptimisticProbability, getActualProbability } from "./tlc/summary";
|
|
31
|
-
import { createModelValue, formatState, getSetBound, type Value } from "./values";
|
|
36
|
+
import { createModelValue, formatState, getSetBound, isSameValue, type Value } from "./values";
|
|
32
37
|
|
|
33
38
|
export interface DepthFirstOptions extends CheckOptions {
|
|
34
39
|
maxDepth: number;
|
|
@@ -39,6 +44,7 @@ export type DepthFirstOutput =
|
|
|
39
44
|
| { kind: "message"; code: number; isError: boolean; message: string; toolMessage: string }
|
|
40
45
|
| { kind: "behavior"; states: Record<string, Value>[]; isInvariant: boolean }
|
|
41
46
|
| { kind: "nested-expressions"; callStack: Expression[] }
|
|
47
|
+
| CoverageOutput
|
|
42
48
|
| { kind: "success"; optimistic: number; actual: number };
|
|
43
49
|
|
|
44
50
|
interface StateEntry {
|
|
@@ -131,7 +137,7 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
131
137
|
withUnexpectedException(() =>
|
|
132
138
|
createLivenessChecker(temporalProperties, search.spec.temporals, environment, {
|
|
133
139
|
getFingerprint: () => 0,
|
|
134
|
-
|
|
140
|
+
forEachActionSuccessors: () => {},
|
|
135
141
|
}),
|
|
136
142
|
),
|
|
137
143
|
)?.branches;
|
|
@@ -164,7 +170,17 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
164
170
|
);
|
|
165
171
|
if (assumptionStatus !== undefined) return assumptionStatus;
|
|
166
172
|
|
|
167
|
-
const
|
|
173
|
+
const description = prepared.getDescription();
|
|
174
|
+
const nextActions = description.actions;
|
|
175
|
+
const coverage = prepared.coverage;
|
|
176
|
+
const covered = coverage && addActionCoverage(coverage, environment, description);
|
|
177
|
+
// Deviation from TLC: TLCExt#pickSuccessor casts the DFID checker to ModelChecker and fails, so tla-ts asks as model checking does.
|
|
178
|
+
runtime.getSuccessorAction = (state, next) =>
|
|
179
|
+
nextActions.find((action) =>
|
|
180
|
+
getSuccessors(action.expression, state, environment, action.scope).some((successor) =>
|
|
181
|
+
successor.state.every((value, index) => isSameValue(value, next[index])),
|
|
182
|
+
),
|
|
183
|
+
);
|
|
168
184
|
const statuses = new Map<bigint, number>();
|
|
169
185
|
const fingerprintSet = { level: 1, leveled: 0, buckets: INITIAL_BUCKETS };
|
|
170
186
|
const setStatus = (fingerprint: bigint, status: number) => {
|
|
@@ -204,6 +220,8 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
204
220
|
const toRecord = (state: (Value | undefined)[]) =>
|
|
205
221
|
search.toRecord(state.map((value) => value ?? createModelValue("null")));
|
|
206
222
|
const printSummary = () => {
|
|
223
|
+
const report = nextActions.length > 0 ? prepared.getCoverage() : undefined;
|
|
224
|
+
if (report) output({ kind: "coverage", coverage: report });
|
|
207
225
|
const counts = `${generatedCount} states generated, ${statuses.size} distinct states found`;
|
|
208
226
|
if (isTool) {
|
|
209
227
|
message(
|
|
@@ -240,7 +258,13 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
240
258
|
return false;
|
|
241
259
|
};
|
|
242
260
|
const init = search.spec.init;
|
|
243
|
-
if (
|
|
261
|
+
if (covered) {
|
|
262
|
+
replayInitialStates(covered.inits, environment, addGenerated, (partial) =>
|
|
263
|
+
addGenerated([...partial]),
|
|
264
|
+
);
|
|
265
|
+
} else if (init) {
|
|
266
|
+
forEachInitialState(init, environment, addGenerated, search.spec.scope, addGenerated);
|
|
267
|
+
}
|
|
244
268
|
generatedCount = generated.length;
|
|
245
269
|
for (const state of generated) {
|
|
246
270
|
if (!state.every((value) => value !== undefined)) {
|
|
@@ -261,16 +285,21 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
261
285
|
config.alias === undefined
|
|
262
286
|
? search.toRecord(state)
|
|
263
287
|
: search.evaluateAlias(config.alias, state, state, isTool);
|
|
264
|
-
const
|
|
265
|
-
? search.getViolatedInvariants(state)
|
|
266
|
-
: [search.findViolatedInvariant(state)].filter((invariant) => invariant !== undefined);
|
|
267
|
-
for (const invariant of violated) {
|
|
288
|
+
const reportInvariant = (name: string) =>
|
|
268
289
|
message(
|
|
269
290
|
MESSAGE_CODE.invariantViolatedInitial,
|
|
270
|
-
`Invariant ${
|
|
291
|
+
`Invariant ${name} is violated by the initial state:\n${formatState(alias())}`,
|
|
271
292
|
);
|
|
272
|
-
|
|
273
|
-
|
|
293
|
+
if (isContinued) {
|
|
294
|
+
search.forEachViolatedInvariant(state, (invariant) => {
|
|
295
|
+
reportInvariant(invariant.name);
|
|
296
|
+
checker.continuedCode = MESSAGE_CODE.invariantViolatedInitial;
|
|
297
|
+
});
|
|
298
|
+
}
|
|
299
|
+
const violated = isContinued ? undefined : search.findViolatedInvariant(state);
|
|
300
|
+
if (violated) {
|
|
301
|
+
reportInvariant(violated.name);
|
|
302
|
+
return MESSAGE_CODE.invariantViolatedInitial;
|
|
274
303
|
}
|
|
275
304
|
const predicate = search.findFailedInitialPredicate(state);
|
|
276
305
|
if (predicate) {
|
|
@@ -284,25 +313,56 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
284
313
|
return NO_ERROR;
|
|
285
314
|
};
|
|
286
315
|
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
316
|
+
let actionSuccessors: Value[][] = [];
|
|
317
|
+
let incompleteSuccessor: State | undefined;
|
|
318
|
+
let actionSuccessorCount = 0;
|
|
319
|
+
const addActionSuccessor = (successor: Value[]) => {
|
|
320
|
+
actionSuccessorCount++;
|
|
321
|
+
if (incompleteSuccessor) return false;
|
|
322
|
+
if (actionSuccessors.length === getSetBound()) throw new TlaTooManyStatesError();
|
|
323
|
+
actionSuccessors.push(successor);
|
|
324
|
+
return false;
|
|
325
|
+
};
|
|
326
|
+
const visitActionSuccessor = (successor: Successor) => addActionSuccessor(successor.state);
|
|
327
|
+
const addIncompleteSuccessor = (partial: State) => {
|
|
328
|
+
actionSuccessorCount++;
|
|
329
|
+
incompleteSuccessor ??= [...partial];
|
|
330
|
+
return true;
|
|
331
|
+
};
|
|
332
|
+
// TLC's Tool#getNextStates generates every successor of the action before DFIDWorker finds an incomplete one.
|
|
333
|
+
const getActionSuccessors = (index: number, state: Value[]) => {
|
|
334
|
+
const action = nextActions[index];
|
|
335
|
+
const coveredAction = covered?.actions[index];
|
|
336
|
+
actionSuccessors = [];
|
|
337
|
+
incompleteSuccessor = undefined;
|
|
338
|
+
actionSuccessorCount = 0;
|
|
339
|
+
if (coverage && coveredAction) {
|
|
340
|
+
walkSuccessors(
|
|
341
|
+
coveredAction,
|
|
342
|
+
coveredAction.node,
|
|
343
|
+
state,
|
|
344
|
+
environment,
|
|
345
|
+
addActionSuccessor,
|
|
346
|
+
addIncompleteSuccessor,
|
|
347
|
+
);
|
|
348
|
+
coverage.primary[coveredAction.node] += actionSuccessorCount;
|
|
349
|
+
} else {
|
|
290
350
|
forEachSuccessor(
|
|
291
351
|
action.expression,
|
|
292
352
|
state,
|
|
293
353
|
environment,
|
|
294
|
-
|
|
295
|
-
if (successors.length === getSetBound()) throw new TlaTooManyStatesError();
|
|
296
|
-
successors.push(successor.state);
|
|
297
|
-
return false;
|
|
298
|
-
},
|
|
354
|
+
visitActionSuccessor,
|
|
299
355
|
action.scope,
|
|
356
|
+
undefined,
|
|
357
|
+
undefined,
|
|
358
|
+
addIncompleteSuccessor,
|
|
300
359
|
);
|
|
301
|
-
return { successors, incomplete: undefined };
|
|
302
|
-
} catch (error) {
|
|
303
|
-
if (!(error instanceof TlaIncompleteSuccessorError)) throw error;
|
|
304
|
-
return { successors, incomplete: error };
|
|
305
360
|
}
|
|
361
|
+
return {
|
|
362
|
+
successors: actionSuccessors,
|
|
363
|
+
incomplete: incompleteSuccessor,
|
|
364
|
+
count: actionSuccessorCount,
|
|
365
|
+
};
|
|
306
366
|
};
|
|
307
367
|
|
|
308
368
|
const findCheckFailure = (state: Value[], successor: Value[], isNew: boolean) => {
|
|
@@ -368,12 +428,12 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
368
428
|
};
|
|
369
429
|
currentState = state;
|
|
370
430
|
try {
|
|
371
|
-
for (
|
|
372
|
-
const
|
|
431
|
+
for (let index = 0; index < nextActions.length; index++) {
|
|
432
|
+
const action = nextActions[index];
|
|
433
|
+
const next = getActionSuccessors(index, state);
|
|
373
434
|
const incomplete = next.incomplete;
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
isDeadlocked &&= count === 0;
|
|
435
|
+
generatedCount += next.count;
|
|
436
|
+
isDeadlocked &&= next.count === 0;
|
|
377
437
|
for (const successor of next.successors) {
|
|
378
438
|
processedSuccessor = successor;
|
|
379
439
|
levels.set(successor, depth + 2);
|
|
@@ -399,11 +459,13 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
399
459
|
if (failure) return report(failure.code, failure.text, !failure.isViolated);
|
|
400
460
|
}
|
|
401
461
|
if (incomplete) {
|
|
402
|
-
processedSuccessor = incomplete
|
|
462
|
+
processedSuccessor = incomplete;
|
|
403
463
|
return report(
|
|
404
464
|
MESSAGE_CODE.incompleteSuccessor,
|
|
405
465
|
getIncompleteSuccessorMessage(
|
|
406
|
-
|
|
466
|
+
environment.variables.filter(
|
|
467
|
+
(_variable, position) => incomplete[position] === undefined,
|
|
468
|
+
),
|
|
407
469
|
action.name,
|
|
408
470
|
nextActions.length,
|
|
409
471
|
options.version,
|
|
@@ -608,6 +670,9 @@ export const checkDepthFirst = (options: DepthFirstOptions): number => {
|
|
|
608
670
|
);
|
|
609
671
|
fingerprintSet.level++;
|
|
610
672
|
fingerprintSet.leveled = LEVELED - fingerprintSet.leveled;
|
|
673
|
+
// TLC starts a new DFIDWorker thread for each level, whose generator for random values starts over from the seed.
|
|
674
|
+
const random = createJavaRandom(runtime.seed);
|
|
675
|
+
runtime.getRandom = () => random;
|
|
611
676
|
searchLevel(level);
|
|
612
677
|
checker.isDone = false;
|
|
613
678
|
levelCode = checker.isKeepingCallStack ? NO_ERROR : checker.errorCode;
|
package/src/environment.ts
CHANGED
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
type Instance,
|
|
10
10
|
type Module,
|
|
11
11
|
type OperatorParam,
|
|
12
|
+
type Proof,
|
|
12
13
|
type SourceLocation,
|
|
13
14
|
} from "./ast";
|
|
14
15
|
import type { ModuleOperator } from "./check";
|
|
@@ -49,7 +50,9 @@ import {
|
|
|
49
50
|
import { overrideDefinitions, type JavaOverride } from "./java-overrides";
|
|
50
51
|
import { extractModule } from "./parser";
|
|
51
52
|
import {
|
|
53
|
+
collectSemanticErrors,
|
|
52
54
|
getArity,
|
|
55
|
+
getFunctionArity,
|
|
53
56
|
getParamArities,
|
|
54
57
|
isBefore,
|
|
55
58
|
isTheoremDefinition,
|
|
@@ -99,6 +102,13 @@ interface EnvironmentOptions {
|
|
|
99
102
|
isWarningEnabled?: boolean;
|
|
100
103
|
version?: TlcVersion;
|
|
101
104
|
moduleOperators?: ModuleOperator[];
|
|
105
|
+
readLine?: () => string | undefined;
|
|
106
|
+
runtimeInvariants?: RuntimeInvariant[];
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
export interface RuntimeInvariant {
|
|
110
|
+
name: string;
|
|
111
|
+
module: string | undefined;
|
|
102
112
|
}
|
|
103
113
|
|
|
104
114
|
export interface ResolvedModuleOperator extends ModuleOperator {
|
|
@@ -113,6 +123,7 @@ export interface Specification {
|
|
|
113
123
|
startupDefinitions: Definition[];
|
|
114
124
|
javaOverrides: JavaOverride[];
|
|
115
125
|
moduleOperators: ResolvedModuleOperator[];
|
|
126
|
+
runtimeInvariants: RuntimeInvariant[];
|
|
116
127
|
rootName: string;
|
|
117
128
|
}
|
|
118
129
|
|
|
@@ -142,7 +153,7 @@ interface ModuleScope {
|
|
|
142
153
|
nested: Module[];
|
|
143
154
|
errors: SanyError[];
|
|
144
155
|
warnings: SanyError[];
|
|
145
|
-
levelChecks:
|
|
156
|
+
levelChecks: ReturnType<typeof checkModuleLevels>[];
|
|
146
157
|
}
|
|
147
158
|
|
|
148
159
|
const getDeclarations = (linked: LinkedModule): Declaration[] => [
|
|
@@ -228,6 +239,19 @@ const getSubstitutions = (instances: Instance[]) =>
|
|
|
228
239
|
instance.substitutions.map((substitution) => substitution.expression),
|
|
229
240
|
);
|
|
230
241
|
|
|
242
|
+
const getProofInstances = (proof: Proof | undefined): Instance[] =>
|
|
243
|
+
proof?.kind === "Steps"
|
|
244
|
+
? proof.steps.flatMap((step) => [
|
|
245
|
+
...(step.body.kind === "Instance" ? [step.body] : []),
|
|
246
|
+
...(step.body.kind === "Define"
|
|
247
|
+
? step.body.definitions.flatMap((definition) =>
|
|
248
|
+
definition.kind === "Instance" ? [definition] : [],
|
|
249
|
+
)
|
|
250
|
+
: []),
|
|
251
|
+
...getProofInstances(step.proof),
|
|
252
|
+
])
|
|
253
|
+
: [];
|
|
254
|
+
|
|
231
255
|
const rejectLiterals = (expressions: Expression[]): void =>
|
|
232
256
|
expressions.forEach((expression) => {
|
|
233
257
|
if (expression.kind === "Decimal") throw createRealNumberError(expression);
|
|
@@ -260,15 +284,17 @@ export const createEnvironment = (
|
|
|
260
284
|
runtime.isWarningEnabled = options.isWarningEnabled ?? true;
|
|
261
285
|
runtime.isTool = options.isTool ?? false;
|
|
262
286
|
runtime.version = options.version ?? "master";
|
|
287
|
+
runtime.readLine = options.readLine;
|
|
263
288
|
const linkedModules = new Map<string, LinkedModule>();
|
|
264
289
|
const checkedModules = new Map<string, LinkedModule>();
|
|
265
290
|
const linkOrder: LinkedModule[] = [];
|
|
266
291
|
const dependencies = new Map<string, Set<string>>();
|
|
267
292
|
const loading: Set<string>[] = [];
|
|
268
293
|
const linking: string[] = [];
|
|
294
|
+
const usedModules = new Set<string>();
|
|
269
295
|
|
|
270
296
|
const useModule = (name: string, used: Iterable<string>) =>
|
|
271
|
-
loading.forEach((closure) => {
|
|
297
|
+
[usedModules, ...loading].forEach((closure) => {
|
|
272
298
|
closure.add(name);
|
|
273
299
|
[...used].forEach((dependency) => closure.add(dependency));
|
|
274
300
|
});
|
|
@@ -380,7 +406,7 @@ export const createEnvironment = (
|
|
|
380
406
|
const closure = new Set<string>();
|
|
381
407
|
const nested: Module[] = [];
|
|
382
408
|
const errors: SanyError[] = [];
|
|
383
|
-
const levelChecks:
|
|
409
|
+
const levelChecks: ReturnType<typeof checkModuleLevels>[] = [];
|
|
384
410
|
linking.push(parsed.name);
|
|
385
411
|
loading.push(closure);
|
|
386
412
|
const linked = linkModule(parsed, {
|
|
@@ -400,7 +426,20 @@ export const createEnvironment = (
|
|
|
400
426
|
const redefinition = loaded && getModuleRedefinition(duplicate, loaded.module);
|
|
401
427
|
if (redefinition) throw createSanyError([redefinition], false, undefined, warnings);
|
|
402
428
|
if (duplicate) throw createModuleRedefinedError(duplicate);
|
|
403
|
-
|
|
429
|
+
// SANY's Errors#addMessage drops a message it already has, such as an instantiated body's.
|
|
430
|
+
const levelErrors = [
|
|
431
|
+
...collectSemanticErrors(
|
|
432
|
+
levelChecks.flatMap((check) => check.sections),
|
|
433
|
+
warnings,
|
|
434
|
+
),
|
|
435
|
+
...levelChecks.flatMap((check) => check.check(check !== levelChecks.at(-1))),
|
|
436
|
+
].filter(
|
|
437
|
+
(error, index, all) =>
|
|
438
|
+
all.findIndex(
|
|
439
|
+
(other) => other.location === error.location && other.message === error.message,
|
|
440
|
+
) === index,
|
|
441
|
+
);
|
|
442
|
+
if (levelErrors.length > 0) throw createSanyError(levelErrors, false, undefined, warnings);
|
|
404
443
|
return { linked, closure };
|
|
405
444
|
};
|
|
406
445
|
|
|
@@ -496,7 +535,7 @@ export const createEnvironment = (
|
|
|
496
535
|
const instantiation = createInstantiation({
|
|
497
536
|
params,
|
|
498
537
|
substitutions: new Map(
|
|
499
|
-
[...substitutions].map((
|
|
538
|
+
[...substitutions].map((entry) => [entry[0], renameLocals(entry[1], renamed)]),
|
|
500
539
|
),
|
|
501
540
|
variables: new Set(linked.variables),
|
|
502
541
|
getDefinition: (key) => definitions.get(key),
|
|
@@ -539,9 +578,14 @@ export const createEnvironment = (
|
|
|
539
578
|
instance.name === undefined
|
|
540
579
|
? standardSymbols
|
|
541
580
|
: new Map(
|
|
542
|
-
[...standardSymbols].map((
|
|
543
|
-
`${instance.name}!${
|
|
544
|
-
{
|
|
581
|
+
[...standardSymbols].map((entry) => [
|
|
582
|
+
`${instance.name}!${entry[0]}`,
|
|
583
|
+
{
|
|
584
|
+
key: entry[1].key,
|
|
585
|
+
arity: entry[1].arity,
|
|
586
|
+
params: entry[1].params,
|
|
587
|
+
kind: entry[1].kind,
|
|
588
|
+
},
|
|
545
589
|
]),
|
|
546
590
|
);
|
|
547
591
|
|
|
@@ -554,40 +598,52 @@ export const createEnvironment = (
|
|
|
554
598
|
const declared = new Set(declarations.map((declaration) => declaration.name));
|
|
555
599
|
return new Map(
|
|
556
600
|
[...exported]
|
|
557
|
-
.filter(
|
|
558
|
-
|
|
601
|
+
.filter(
|
|
602
|
+
(entry) =>
|
|
603
|
+
!declared.has(entry[0]) &&
|
|
604
|
+
(instance.name !== undefined || entry[1].kind !== "Instance"),
|
|
605
|
+
)
|
|
606
|
+
.map((entry): [string, ModuleSymbol] => {
|
|
559
607
|
if (instance.name === undefined) {
|
|
560
608
|
return [
|
|
561
|
-
|
|
609
|
+
entry[0],
|
|
562
610
|
{
|
|
563
|
-
key: getKey(
|
|
564
|
-
arity:
|
|
565
|
-
params:
|
|
566
|
-
kind:
|
|
611
|
+
key: getKey(entry[1].key, entry[0]),
|
|
612
|
+
arity: entry[1].arity,
|
|
613
|
+
params: entry[1].params,
|
|
614
|
+
kind: entry[1].kind,
|
|
567
615
|
range:
|
|
568
|
-
parameterized.get(
|
|
616
|
+
parameterized.get(entry[1].key) === true
|
|
617
|
+
? instance.location.range
|
|
618
|
+
: entry[1].range,
|
|
619
|
+
functionArity:
|
|
620
|
+
parameterized.get(entry[1].key) === true ? undefined : entry[1].functionArity,
|
|
569
621
|
},
|
|
570
622
|
];
|
|
571
623
|
}
|
|
572
|
-
const qualified = `${instance.name}!${
|
|
624
|
+
const qualified = `${instance.name}!${entry[0]}`;
|
|
573
625
|
return [
|
|
574
626
|
qualified,
|
|
575
627
|
{
|
|
576
|
-
key: getKey(
|
|
577
|
-
arity:
|
|
578
|
-
params:
|
|
628
|
+
key: entry[1].kind === "Instance" ? qualified : getKey(entry[1].key, qualified),
|
|
629
|
+
arity: entry[1].arity + instance.params.length,
|
|
630
|
+
params: entry[1].params && [
|
|
579
631
|
...instance.params.map((param) => param.arity),
|
|
580
|
-
...
|
|
632
|
+
...entry[1].params,
|
|
581
633
|
],
|
|
582
|
-
kind:
|
|
634
|
+
kind: entry[1].kind,
|
|
635
|
+
functionArity: declarations.length > 0 ? undefined : entry[1].functionArity,
|
|
583
636
|
},
|
|
584
637
|
];
|
|
585
638
|
}),
|
|
586
639
|
);
|
|
587
640
|
};
|
|
588
641
|
|
|
589
|
-
const createArgumentParams = (arity: number) =>
|
|
590
|
-
Array.from({ length: arity }, (_value, index) => ({
|
|
642
|
+
const createArgumentParams = (arity: number, params: number[] | undefined) =>
|
|
643
|
+
Array.from({ length: arity }, (_value, index) => ({
|
|
644
|
+
name: `argument${index}`,
|
|
645
|
+
arity: params?.[index] ?? 0,
|
|
646
|
+
}));
|
|
591
647
|
|
|
592
648
|
const getSubstitutionBody = (
|
|
593
649
|
replacement: Expression,
|
|
@@ -601,7 +657,7 @@ export const createEnvironment = (
|
|
|
601
657
|
body: replacement.body,
|
|
602
658
|
};
|
|
603
659
|
}
|
|
604
|
-
const params = createArgumentParams(declaration.arity);
|
|
660
|
+
const params = createArgumentParams(declaration.arity, undefined);
|
|
605
661
|
const operator =
|
|
606
662
|
replacement.kind === "Identifier"
|
|
607
663
|
? replacement.name
|
|
@@ -624,11 +680,11 @@ export const createEnvironment = (
|
|
|
624
680
|
const standardSymbols = nested ? undefined : getStandardSymbols(instance.module);
|
|
625
681
|
if (standardSymbols) {
|
|
626
682
|
if (instance.name === undefined) return [];
|
|
627
|
-
return [...standardSymbols].map((
|
|
628
|
-
const forwarded = createArgumentParams(
|
|
683
|
+
return [...standardSymbols].map((entry) => {
|
|
684
|
+
const forwarded = createArgumentParams(entry[1].arity, entry[1].params);
|
|
629
685
|
return createLocalAlias(
|
|
630
|
-
`${instance.name}!${
|
|
631
|
-
|
|
686
|
+
`${instance.name}!${entry[0]}`,
|
|
687
|
+
entry[1].key,
|
|
632
688
|
[...instance.params, ...forwarded],
|
|
633
689
|
forwarded,
|
|
634
690
|
location,
|
|
@@ -709,16 +765,16 @@ export const createEnvironment = (
|
|
|
709
765
|
});
|
|
710
766
|
const declared = new Set(declarations.map((declaration) => declaration.name));
|
|
711
767
|
const aliases = [...linked.exported]
|
|
712
|
-
.filter((
|
|
713
|
-
.map((
|
|
714
|
-
const key = instantiation.getKey(
|
|
715
|
-
const ownParams = createArgumentParams(
|
|
768
|
+
.filter((entry) => !declared.has(entry[0]) && entry[1].kind !== "Instance")
|
|
769
|
+
.map((entry) => {
|
|
770
|
+
const key = instantiation.getKey(entry[1].key);
|
|
771
|
+
const ownParams = createArgumentParams(entry[1].arity, entry[1].params);
|
|
716
772
|
const params = [...instance.params, ...ownParams];
|
|
717
773
|
return createLocalAlias(
|
|
718
|
-
instance.name === undefined ?
|
|
774
|
+
instance.name === undefined ? entry[0] : `${instance.name}!${entry[0]}`,
|
|
719
775
|
key,
|
|
720
776
|
params,
|
|
721
|
-
key ===
|
|
777
|
+
key === entry[1].key ? ownParams : params,
|
|
722
778
|
location,
|
|
723
779
|
);
|
|
724
780
|
});
|
|
@@ -726,9 +782,9 @@ export const createEnvironment = (
|
|
|
726
782
|
};
|
|
727
783
|
|
|
728
784
|
const getAvailableDefinitions = (visible: Symbols) =>
|
|
729
|
-
[...visible].flatMap((
|
|
730
|
-
const definition = definitions.get(
|
|
731
|
-
return definition ? [{ ...definition, name }] : [];
|
|
785
|
+
[...visible].flatMap((entry) => {
|
|
786
|
+
const definition = definitions.get(entry[1].key);
|
|
787
|
+
return definition ? [{ ...definition, name: entry[0] }] : [];
|
|
732
788
|
});
|
|
733
789
|
|
|
734
790
|
const javaOverrides = new Map<string, JavaOverride[]>();
|
|
@@ -838,6 +894,7 @@ export const createEnvironment = (
|
|
|
838
894
|
params: getParamArities(definition),
|
|
839
895
|
kind: isTheoremDefinition(parsed, definition) ? "Theorem" : "Definition",
|
|
840
896
|
range: definition.location.range,
|
|
897
|
+
functionArity: getFunctionArity(definition),
|
|
841
898
|
});
|
|
842
899
|
const isParameterFree = constants.length === 0 && variables.length === 0;
|
|
843
900
|
const getKey = (definition: Definition) =>
|
|
@@ -877,6 +934,13 @@ export const createEnvironment = (
|
|
|
877
934
|
module.definitions.toReversed().map((definition) => [definition.name, definition]),
|
|
878
935
|
),
|
|
879
936
|
getKey,
|
|
937
|
+
isModuleKnown: (name, location) =>
|
|
938
|
+
name === parsed.name ||
|
|
939
|
+
usedModules.has(name) ||
|
|
940
|
+
scope.modules.has(name) ||
|
|
941
|
+
parsed.modules.some(
|
|
942
|
+
(nested) => nested.name === name && isBefore(nested.location, location),
|
|
943
|
+
),
|
|
880
944
|
instanced,
|
|
881
945
|
facts,
|
|
882
946
|
reports,
|
|
@@ -897,7 +961,7 @@ export const createEnvironment = (
|
|
|
897
961
|
getDefinitionSymbol(definition),
|
|
898
962
|
]),
|
|
899
963
|
].reduce(
|
|
900
|
-
(symbols,
|
|
964
|
+
(symbols, entry) => (symbols.has(entry[0]) ? symbols : symbols.set(entry[0], entry[1])),
|
|
901
965
|
new Map(visible),
|
|
902
966
|
);
|
|
903
967
|
const linkNested = (nested: Module) => {
|
|
@@ -938,6 +1002,14 @@ export const createEnvironment = (
|
|
|
938
1002
|
visible.set(name, symbol);
|
|
939
1003
|
if (!instance.isLocal) exported.set(name, symbol);
|
|
940
1004
|
});
|
|
1005
|
+
if (instance.name !== undefined && !instance.isLocal) {
|
|
1006
|
+
exported.set(instance.name, {
|
|
1007
|
+
key: `${instance.name}${KEY_SEPARATOR}${scope.id}`,
|
|
1008
|
+
arity: instance.params.length,
|
|
1009
|
+
kind: "Instance",
|
|
1010
|
+
range: instance.location.range,
|
|
1011
|
+
});
|
|
1012
|
+
}
|
|
941
1013
|
},
|
|
942
1014
|
})),
|
|
943
1015
|
...parsed.modules.map((nested) => ({
|
|
@@ -953,6 +1025,13 @@ export const createEnvironment = (
|
|
|
953
1025
|
),
|
|
954
1026
|
getAvailableDefinitions(visible),
|
|
955
1027
|
);
|
|
1028
|
+
parsed.theorems
|
|
1029
|
+
.flatMap((theorem) => getProofInstances(theorem.proof))
|
|
1030
|
+
.filter((instance) => !getVisibleModules().has(instance.module))
|
|
1031
|
+
.forEach(
|
|
1032
|
+
(instance) =>
|
|
1033
|
+
getStandardSymbols(instance.module) ?? getLinkedModule(instance.module, parsed.name),
|
|
1034
|
+
);
|
|
956
1035
|
scope.errors.push(...resolveModule(module, getUnit(module)));
|
|
957
1036
|
module.definitions.forEach((definition) => {
|
|
958
1037
|
const key = getKey(definition);
|
|
@@ -988,7 +1067,7 @@ export const createEnvironment = (
|
|
|
988
1067
|
const checks = instanceChecks
|
|
989
1068
|
.splice(firstCheck)
|
|
990
1069
|
.map((check) => ({ location: check.location, check: () => checkInstance(check) }));
|
|
991
|
-
scope.levelChecks.push(
|
|
1070
|
+
scope.levelChecks.push(
|
|
992
1071
|
checkModuleLevels(
|
|
993
1072
|
module,
|
|
994
1073
|
{
|
|
@@ -1026,6 +1105,15 @@ export const createEnvironment = (
|
|
|
1026
1105
|
);
|
|
1027
1106
|
linkOrder.push(...linkOrder.splice(linkOrder.indexOf(linkedRoot), 1));
|
|
1028
1107
|
if (warnings.length > 0 && !options.isSanyReported) options.print(formatSanyWarnings(warnings));
|
|
1108
|
+
const runtimeInvariants = options.runtimeInvariants ?? [];
|
|
1109
|
+
runtimeInvariants.forEach((invariant) => {
|
|
1110
|
+
if (invariant.module === undefined) return;
|
|
1111
|
+
linkedModules.set(root.name, linkedRoot);
|
|
1112
|
+
const linked = getLinkedModule(invariant.module, root.name);
|
|
1113
|
+
linkOrder.splice(linkOrder.indexOf(linked), 1);
|
|
1114
|
+
const definition = definitions.get(linked.visible.get(invariant.name)?.key ?? invariant.name);
|
|
1115
|
+
if (definition) definitions.set(invariant.name, definition);
|
|
1116
|
+
});
|
|
1029
1117
|
linkedRoot.visible.forEach((symbol, name) => {
|
|
1030
1118
|
const definition = definitions.get(symbol.key);
|
|
1031
1119
|
if (definition && symbol.key !== name) definitions.set(name, definition);
|
|
@@ -1052,7 +1140,7 @@ export const createEnvironment = (
|
|
|
1052
1140
|
root: linkedRoot,
|
|
1053
1141
|
moduleSymbols: new Map([
|
|
1054
1142
|
...standardExports,
|
|
1055
|
-
...[...linkedModules].map((
|
|
1143
|
+
...[...linkedModules].map((entry): [string, Symbols] => [entry[0], entry[1].visible]),
|
|
1056
1144
|
[root.name, linkedRoot.visible],
|
|
1057
1145
|
]),
|
|
1058
1146
|
definitions,
|
|
@@ -1103,6 +1191,7 @@ export const createEnvironment = (
|
|
|
1103
1191
|
variableIndex,
|
|
1104
1192
|
facts,
|
|
1105
1193
|
startupValues: Array.from({ length: facts.ids.size }, (): Value | undefined => undefined),
|
|
1194
|
+
tlcEvalValues: new WeakMap(),
|
|
1106
1195
|
substitutedDefinitions,
|
|
1107
1196
|
instanceParams,
|
|
1108
1197
|
evaluators: new WeakMap(),
|
|
@@ -1166,6 +1255,7 @@ export const createEnvironment = (
|
|
|
1166
1255
|
),
|
|
1167
1256
|
javaOverrides: linkOrder.flatMap((linked) => javaOverrides.get(linked.module.name) ?? []),
|
|
1168
1257
|
moduleOperators,
|
|
1258
|
+
runtimeInvariants,
|
|
1169
1259
|
rootName: root.name,
|
|
1170
1260
|
};
|
|
1171
1261
|
};
|
package/src/errors.ts
CHANGED
|
@@ -320,6 +320,13 @@ export class SmtTacticError extends TlaError {
|
|
|
320
320
|
}
|
|
321
321
|
}
|
|
322
322
|
|
|
323
|
+
export class SmtDefaultError extends TlaError {
|
|
324
|
+
constructor(message: string) {
|
|
325
|
+
super(message);
|
|
326
|
+
this.name = "SmtDefaultError";
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
|
|
323
330
|
export class SmtInvariantError extends TlaError {
|
|
324
331
|
constructor(message: string) {
|
|
325
332
|
super(message);
|