tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -4
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +56 -56
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -92
- package/dist/transfer.js +97 -92
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +518 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +18 -4
- package/src/cli/tlc.ts +18 -12
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +155 -66
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +152 -25
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +179 -60
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +3 -2
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +28 -2
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/bv1-blast.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +84 -15
- package/src/prover/smt/solver/ctx-simplify.ts +9 -4
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +9 -8
- package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +31 -28
- package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -11
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/expr2polynomial.ts +204 -79
- package/src/prover/smt/solver/factor.ts +36 -14
- package/src/prover/smt/solver/fd-solver.ts +608 -139
- package/src/prover/smt/solver/fix-dl-var.ts +2 -3
- package/src/prover/smt/solver/fm-tactic.ts +9 -7
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -1
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/lia2pb.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +22 -44
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +2 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
- package/src/prover/smt/solver/nlsat/explain.ts +375 -217
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
- package/src/prover/smt/solver/nlsat/solver.ts +74 -64
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/normalize-bounds.ts +2 -2
- package/src/prover/smt/solver/occf.ts +1 -1
- package/src/prover/smt/solver/opt-context.ts +21 -7
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +10 -6
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/pb2bv-tactic.ts +9 -3
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/purify-arith.ts +51 -49
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +23 -8
- package/src/prover/smt/solver/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/reduce-args.ts +2 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +75 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +54 -25
- package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +2 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +718 -213
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -4
- package/src/prover/smt/solver/tactic.ts +389 -199
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +12 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +15 -5
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +1311 -268
- package/src/runtime.ts +21 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +19 -12
- package/src/sany/generator.ts +12 -6
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +12 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +321 -135
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +666 -147
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +2 -1
- package/src/tlc/replay.ts +147 -46
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +44 -15
- package/src/tlc/trace-spec.ts +9 -22
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
package/src/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
|
@@ -6,9 +6,11 @@ import {
|
|
|
6
6
|
type Declaration,
|
|
7
7
|
type Definition,
|
|
8
8
|
type Expression,
|
|
9
|
+
type FunctionDefinition,
|
|
9
10
|
type Instance,
|
|
10
11
|
type Module,
|
|
11
12
|
type OperatorParam,
|
|
13
|
+
type Proof,
|
|
12
14
|
type SourceLocation,
|
|
13
15
|
} from "./ast";
|
|
14
16
|
import type { ModuleOperator } from "./check";
|
|
@@ -43,13 +45,18 @@ import {
|
|
|
43
45
|
createLocalArguments,
|
|
44
46
|
createLocalIdentifier,
|
|
45
47
|
getEnabledVariableName,
|
|
48
|
+
getFunctionBody,
|
|
46
49
|
renameLocals,
|
|
50
|
+
withInstanceParams,
|
|
47
51
|
withLetInstances,
|
|
52
|
+
withSubstitutionFrames,
|
|
48
53
|
} from "./instances";
|
|
49
54
|
import { overrideDefinitions, type JavaOverride } from "./java-overrides";
|
|
50
55
|
import { extractModule } from "./parser";
|
|
51
56
|
import {
|
|
57
|
+
collectSemanticErrors,
|
|
52
58
|
getArity,
|
|
59
|
+
getFunctionArity,
|
|
53
60
|
getParamArities,
|
|
54
61
|
isBefore,
|
|
55
62
|
isTheoremDefinition,
|
|
@@ -100,6 +107,12 @@ interface EnvironmentOptions {
|
|
|
100
107
|
version?: TlcVersion;
|
|
101
108
|
moduleOperators?: ModuleOperator[];
|
|
102
109
|
readLine?: () => string | undefined;
|
|
110
|
+
runtimeInvariants?: RuntimeInvariant[];
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
export interface RuntimeInvariant {
|
|
114
|
+
name: string;
|
|
115
|
+
module: string | undefined;
|
|
103
116
|
}
|
|
104
117
|
|
|
105
118
|
export interface ResolvedModuleOperator extends ModuleOperator {
|
|
@@ -114,6 +127,7 @@ export interface Specification {
|
|
|
114
127
|
startupDefinitions: Definition[];
|
|
115
128
|
javaOverrides: JavaOverride[];
|
|
116
129
|
moduleOperators: ResolvedModuleOperator[];
|
|
130
|
+
runtimeInvariants: RuntimeInvariant[];
|
|
117
131
|
rootName: string;
|
|
118
132
|
}
|
|
119
133
|
|
|
@@ -143,7 +157,7 @@ interface ModuleScope {
|
|
|
143
157
|
nested: Module[];
|
|
144
158
|
errors: SanyError[];
|
|
145
159
|
warnings: SanyError[];
|
|
146
|
-
levelChecks:
|
|
160
|
+
levelChecks: ReturnType<typeof checkModuleLevels>[];
|
|
147
161
|
}
|
|
148
162
|
|
|
149
163
|
const getDeclarations = (linked: LinkedModule): Declaration[] => [
|
|
@@ -193,21 +207,30 @@ const getNodeWord = (kind: SymbolKind) =>
|
|
|
193
207
|
const getNodeClass = (kind: SymbolKind) =>
|
|
194
208
|
kind === "Theorem" ? "ThmOrAssumpDefNode" : getNodeWord(kind);
|
|
195
209
|
|
|
196
|
-
const createLocalFunction = (definition:
|
|
210
|
+
const createLocalFunction = (definition: FunctionDefinition, key: string): Definition => ({
|
|
197
211
|
kind: "Operator",
|
|
198
212
|
name: key,
|
|
199
213
|
params: [],
|
|
200
|
-
body:
|
|
201
|
-
kind: "Let",
|
|
202
|
-
definitions: [definition],
|
|
203
|
-
body: createLocalIdentifier(definition.name, definition.location),
|
|
204
|
-
location: definition.location,
|
|
205
|
-
},
|
|
214
|
+
body: getFunctionBody(definition),
|
|
206
215
|
isLocal: true,
|
|
207
216
|
isRecursive: false,
|
|
208
217
|
location: definition.location,
|
|
209
218
|
});
|
|
210
219
|
|
|
220
|
+
const getSubstitutionFrame = (instance: Instance): Expression => {
|
|
221
|
+
const range = instance.definitionRange
|
|
222
|
+
? {
|
|
223
|
+
...instance.definitionRange,
|
|
224
|
+
start: { line: instance.location.line, column: instance.location.column },
|
|
225
|
+
}
|
|
226
|
+
: instance.instanceRange;
|
|
227
|
+
return {
|
|
228
|
+
kind: "Identifier",
|
|
229
|
+
name: instance.name ?? instance.module,
|
|
230
|
+
location: { ...range.start, range },
|
|
231
|
+
};
|
|
232
|
+
};
|
|
233
|
+
|
|
211
234
|
const mentionsName = (expression: Expression, names: Set<string>): boolean => {
|
|
212
235
|
const name = getReferencedName(expression);
|
|
213
236
|
return (
|
|
@@ -229,6 +252,19 @@ const getSubstitutions = (instances: Instance[]) =>
|
|
|
229
252
|
instance.substitutions.map((substitution) => substitution.expression),
|
|
230
253
|
);
|
|
231
254
|
|
|
255
|
+
const getProofInstances = (proof: Proof | undefined): Instance[] =>
|
|
256
|
+
proof?.kind === "Steps"
|
|
257
|
+
? proof.steps.flatMap((step) => [
|
|
258
|
+
...(step.body.kind === "Instance" ? [step.body] : []),
|
|
259
|
+
...(step.body.kind === "Define"
|
|
260
|
+
? step.body.definitions.flatMap((definition) =>
|
|
261
|
+
definition.kind === "Instance" ? [definition] : [],
|
|
262
|
+
)
|
|
263
|
+
: []),
|
|
264
|
+
...getProofInstances(step.proof),
|
|
265
|
+
])
|
|
266
|
+
: [];
|
|
267
|
+
|
|
232
268
|
const rejectLiterals = (expressions: Expression[]): void =>
|
|
233
269
|
expressions.forEach((expression) => {
|
|
234
270
|
if (expression.kind === "Decimal") throw createRealNumberError(expression);
|
|
@@ -268,9 +304,10 @@ export const createEnvironment = (
|
|
|
268
304
|
const dependencies = new Map<string, Set<string>>();
|
|
269
305
|
const loading: Set<string>[] = [];
|
|
270
306
|
const linking: string[] = [];
|
|
307
|
+
const usedModules = new Set<string>();
|
|
271
308
|
|
|
272
309
|
const useModule = (name: string, used: Iterable<string>) =>
|
|
273
|
-
loading.forEach((closure) => {
|
|
310
|
+
[usedModules, ...loading].forEach((closure) => {
|
|
274
311
|
closure.add(name);
|
|
275
312
|
[...used].forEach((dependency) => closure.add(dependency));
|
|
276
313
|
});
|
|
@@ -382,7 +419,7 @@ export const createEnvironment = (
|
|
|
382
419
|
const closure = new Set<string>();
|
|
383
420
|
const nested: Module[] = [];
|
|
384
421
|
const errors: SanyError[] = [];
|
|
385
|
-
const levelChecks:
|
|
422
|
+
const levelChecks: ReturnType<typeof checkModuleLevels>[] = [];
|
|
386
423
|
linking.push(parsed.name);
|
|
387
424
|
loading.push(closure);
|
|
388
425
|
const linked = linkModule(parsed, {
|
|
@@ -402,7 +439,20 @@ export const createEnvironment = (
|
|
|
402
439
|
const redefinition = loaded && getModuleRedefinition(duplicate, loaded.module);
|
|
403
440
|
if (redefinition) throw createSanyError([redefinition], false, undefined, warnings);
|
|
404
441
|
if (duplicate) throw createModuleRedefinedError(duplicate);
|
|
405
|
-
|
|
442
|
+
// SANY's Errors#addMessage drops a message it already has, such as an instantiated body's.
|
|
443
|
+
const levelErrors = [
|
|
444
|
+
...collectSemanticErrors(
|
|
445
|
+
levelChecks.flatMap((check) => check.sections),
|
|
446
|
+
warnings,
|
|
447
|
+
),
|
|
448
|
+
...levelChecks.flatMap((check) => check.check(check !== levelChecks.at(-1))),
|
|
449
|
+
].filter(
|
|
450
|
+
(error, index, all) =>
|
|
451
|
+
all.findIndex(
|
|
452
|
+
(other) => other.location === error.location && other.message === error.message,
|
|
453
|
+
) === index,
|
|
454
|
+
);
|
|
455
|
+
if (levelErrors.length > 0) throw createSanyError(levelErrors, false, undefined, warnings);
|
|
406
456
|
return { linked, closure };
|
|
407
457
|
};
|
|
408
458
|
|
|
@@ -489,16 +539,10 @@ export const createEnvironment = (
|
|
|
489
539
|
});
|
|
490
540
|
const params = instance.params.map((param) => ({ ...param, name: `${param.name}${suffix}` }));
|
|
491
541
|
params.forEach((param) => instanceParams.add(param));
|
|
492
|
-
const substitutionRange = instance.definitionRange
|
|
493
|
-
? {
|
|
494
|
-
...instance.definitionRange,
|
|
495
|
-
start: { line: instance.location.line, column: instance.location.column },
|
|
496
|
-
}
|
|
497
|
-
: instance.instanceRange;
|
|
498
542
|
const instantiation = createInstantiation({
|
|
499
543
|
params,
|
|
500
544
|
substitutions: new Map(
|
|
501
|
-
[...substitutions].map((
|
|
545
|
+
[...substitutions].map((entry) => [entry[0], renameLocals(entry[1], renamed)]),
|
|
502
546
|
),
|
|
503
547
|
variables: new Set(linked.variables),
|
|
504
548
|
getDefinition: (key) => definitions.get(key),
|
|
@@ -518,13 +562,7 @@ export const createEnvironment = (
|
|
|
518
562
|
return key;
|
|
519
563
|
},
|
|
520
564
|
createName,
|
|
521
|
-
...(declarations.length > 0 && {
|
|
522
|
-
frame: {
|
|
523
|
-
kind: "Identifier",
|
|
524
|
-
name: instance.name ?? instance.module,
|
|
525
|
-
location: { ...substitutionRange.start, range: substitutionRange },
|
|
526
|
-
},
|
|
527
|
-
}),
|
|
565
|
+
...(declarations.length > 0 && { frame: getSubstitutionFrame(instance) }),
|
|
528
566
|
});
|
|
529
567
|
return getInstanceSymbols(instance, linked.exported, declarations, (key, name) => {
|
|
530
568
|
const copy =
|
|
@@ -541,9 +579,14 @@ export const createEnvironment = (
|
|
|
541
579
|
instance.name === undefined
|
|
542
580
|
? standardSymbols
|
|
543
581
|
: new Map(
|
|
544
|
-
[...standardSymbols].map((
|
|
545
|
-
`${instance.name}!${
|
|
546
|
-
{
|
|
582
|
+
[...standardSymbols].map((entry) => [
|
|
583
|
+
`${instance.name}!${entry[0]}`,
|
|
584
|
+
{
|
|
585
|
+
key: entry[1].key,
|
|
586
|
+
arity: entry[1].arity,
|
|
587
|
+
params: entry[1].params,
|
|
588
|
+
kind: entry[1].kind,
|
|
589
|
+
},
|
|
547
590
|
]),
|
|
548
591
|
);
|
|
549
592
|
|
|
@@ -556,32 +599,41 @@ export const createEnvironment = (
|
|
|
556
599
|
const declared = new Set(declarations.map((declaration) => declaration.name));
|
|
557
600
|
return new Map(
|
|
558
601
|
[...exported]
|
|
559
|
-
.filter(
|
|
560
|
-
|
|
602
|
+
.filter(
|
|
603
|
+
(entry) =>
|
|
604
|
+
!declared.has(entry[0]) &&
|
|
605
|
+
(instance.name !== undefined || entry[1].kind !== "Instance"),
|
|
606
|
+
)
|
|
607
|
+
.map((entry): [string, ModuleSymbol] => {
|
|
561
608
|
if (instance.name === undefined) {
|
|
562
609
|
return [
|
|
563
|
-
|
|
610
|
+
entry[0],
|
|
564
611
|
{
|
|
565
|
-
key: getKey(
|
|
566
|
-
arity:
|
|
567
|
-
params:
|
|
568
|
-
kind:
|
|
612
|
+
key: getKey(entry[1].key, entry[0]),
|
|
613
|
+
arity: entry[1].arity,
|
|
614
|
+
params: entry[1].params,
|
|
615
|
+
kind: entry[1].kind,
|
|
569
616
|
range:
|
|
570
|
-
parameterized.get(
|
|
617
|
+
parameterized.get(entry[1].key) === true
|
|
618
|
+
? instance.location.range
|
|
619
|
+
: entry[1].range,
|
|
620
|
+
functionArity:
|
|
621
|
+
parameterized.get(entry[1].key) === true ? undefined : entry[1].functionArity,
|
|
571
622
|
},
|
|
572
623
|
];
|
|
573
624
|
}
|
|
574
|
-
const qualified = `${instance.name}!${
|
|
625
|
+
const qualified = `${instance.name}!${entry[0]}`;
|
|
575
626
|
return [
|
|
576
627
|
qualified,
|
|
577
628
|
{
|
|
578
|
-
key: getKey(
|
|
579
|
-
arity:
|
|
580
|
-
params:
|
|
629
|
+
key: entry[1].kind === "Instance" ? qualified : getKey(entry[1].key, qualified),
|
|
630
|
+
arity: entry[1].arity + instance.params.length,
|
|
631
|
+
params: entry[1].params && [
|
|
581
632
|
...instance.params.map((param) => param.arity),
|
|
582
|
-
...
|
|
633
|
+
...entry[1].params,
|
|
583
634
|
],
|
|
584
|
-
kind:
|
|
635
|
+
kind: entry[1].kind,
|
|
636
|
+
functionArity: declarations.length > 0 ? undefined : entry[1].functionArity,
|
|
585
637
|
},
|
|
586
638
|
];
|
|
587
639
|
}),
|
|
@@ -629,11 +681,11 @@ export const createEnvironment = (
|
|
|
629
681
|
const standardSymbols = nested ? undefined : getStandardSymbols(instance.module);
|
|
630
682
|
if (standardSymbols) {
|
|
631
683
|
if (instance.name === undefined) return [];
|
|
632
|
-
return [...standardSymbols].map((
|
|
633
|
-
const forwarded = createArgumentParams(
|
|
684
|
+
return [...standardSymbols].map((entry) => {
|
|
685
|
+
const forwarded = createArgumentParams(entry[1].arity, entry[1].params);
|
|
634
686
|
return createLocalAlias(
|
|
635
|
-
`${instance.name}!${
|
|
636
|
-
|
|
687
|
+
`${instance.name}!${entry[0]}`,
|
|
688
|
+
entry[1].key,
|
|
637
689
|
[...instance.params, ...forwarded],
|
|
638
690
|
forwarded,
|
|
639
691
|
location,
|
|
@@ -712,28 +764,31 @@ export const createEnvironment = (
|
|
|
712
764
|
},
|
|
713
765
|
createName,
|
|
714
766
|
});
|
|
767
|
+
const frames = declarations.length > 0 ? [getSubstitutionFrame(instance)] : [];
|
|
715
768
|
const declared = new Set(declarations.map((declaration) => declaration.name));
|
|
716
|
-
const
|
|
717
|
-
.filter((
|
|
718
|
-
.map((
|
|
719
|
-
const
|
|
720
|
-
const
|
|
721
|
-
const
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
769
|
+
const exported = [...linked.exported]
|
|
770
|
+
.filter((entry) => !declared.has(entry[0]) && entry[1].kind !== "Instance")
|
|
771
|
+
.map((entry) => {
|
|
772
|
+
const name = instance.name === undefined ? entry[0] : `${instance.name}!${entry[0]}`;
|
|
773
|
+
const key = instantiation.getKey(entry[1].key);
|
|
774
|
+
const copy = copies.find((candidate) => candidate.name === key);
|
|
775
|
+
const original = definitions.get(key);
|
|
776
|
+
const definition = copy ?? (original && withInstanceParams(original, instance.params));
|
|
777
|
+
if (definition) {
|
|
778
|
+
const operator =
|
|
779
|
+
definition.kind === "Operator" ? definition : createLocalFunction(definition, name);
|
|
780
|
+
return { ...operator, name, body: withSubstitutionFrames(operator.body, frames) };
|
|
781
|
+
}
|
|
782
|
+
const ownParams = createArgumentParams(entry[1].arity, entry[1].params);
|
|
783
|
+
return createLocalAlias(name, key, [...instance.params, ...ownParams], ownParams, location);
|
|
729
784
|
});
|
|
730
|
-
return [...substitutionDefinitions, ...copies, ...
|
|
785
|
+
return [...substitutionDefinitions, ...copies, ...exported];
|
|
731
786
|
};
|
|
732
787
|
|
|
733
788
|
const getAvailableDefinitions = (visible: Symbols) =>
|
|
734
|
-
[...visible].flatMap((
|
|
735
|
-
const definition = definitions.get(
|
|
736
|
-
return definition ? [{ ...definition, name }] : [];
|
|
789
|
+
[...visible].flatMap((entry) => {
|
|
790
|
+
const definition = definitions.get(entry[1].key);
|
|
791
|
+
return definition ? [{ ...definition, name: entry[0] }] : [];
|
|
737
792
|
});
|
|
738
793
|
|
|
739
794
|
const javaOverrides = new Map<string, JavaOverride[]>();
|
|
@@ -843,6 +898,7 @@ export const createEnvironment = (
|
|
|
843
898
|
params: getParamArities(definition),
|
|
844
899
|
kind: isTheoremDefinition(parsed, definition) ? "Theorem" : "Definition",
|
|
845
900
|
range: definition.location.range,
|
|
901
|
+
functionArity: getFunctionArity(definition),
|
|
846
902
|
});
|
|
847
903
|
const isParameterFree = constants.length === 0 && variables.length === 0;
|
|
848
904
|
const getKey = (definition: Definition) =>
|
|
@@ -882,6 +938,13 @@ export const createEnvironment = (
|
|
|
882
938
|
module.definitions.toReversed().map((definition) => [definition.name, definition]),
|
|
883
939
|
),
|
|
884
940
|
getKey,
|
|
941
|
+
isModuleKnown: (name, location) =>
|
|
942
|
+
name === parsed.name ||
|
|
943
|
+
usedModules.has(name) ||
|
|
944
|
+
scope.modules.has(name) ||
|
|
945
|
+
parsed.modules.some(
|
|
946
|
+
(nested) => nested.name === name && isBefore(nested.location, location),
|
|
947
|
+
),
|
|
885
948
|
instanced,
|
|
886
949
|
facts,
|
|
887
950
|
reports,
|
|
@@ -902,7 +965,7 @@ export const createEnvironment = (
|
|
|
902
965
|
getDefinitionSymbol(definition),
|
|
903
966
|
]),
|
|
904
967
|
].reduce(
|
|
905
|
-
(symbols,
|
|
968
|
+
(symbols, entry) => (symbols.has(entry[0]) ? symbols : symbols.set(entry[0], entry[1])),
|
|
906
969
|
new Map(visible),
|
|
907
970
|
);
|
|
908
971
|
const linkNested = (nested: Module) => {
|
|
@@ -943,6 +1006,14 @@ export const createEnvironment = (
|
|
|
943
1006
|
visible.set(name, symbol);
|
|
944
1007
|
if (!instance.isLocal) exported.set(name, symbol);
|
|
945
1008
|
});
|
|
1009
|
+
if (instance.name !== undefined && !instance.isLocal) {
|
|
1010
|
+
exported.set(instance.name, {
|
|
1011
|
+
key: `${instance.name}${KEY_SEPARATOR}${scope.id}`,
|
|
1012
|
+
arity: instance.params.length,
|
|
1013
|
+
kind: "Instance",
|
|
1014
|
+
range: instance.location.range,
|
|
1015
|
+
});
|
|
1016
|
+
}
|
|
946
1017
|
},
|
|
947
1018
|
})),
|
|
948
1019
|
...parsed.modules.map((nested) => ({
|
|
@@ -958,6 +1029,13 @@ export const createEnvironment = (
|
|
|
958
1029
|
),
|
|
959
1030
|
getAvailableDefinitions(visible),
|
|
960
1031
|
);
|
|
1032
|
+
parsed.theorems
|
|
1033
|
+
.flatMap((theorem) => getProofInstances(theorem.proof))
|
|
1034
|
+
.filter((instance) => !getVisibleModules().has(instance.module))
|
|
1035
|
+
.forEach(
|
|
1036
|
+
(instance) =>
|
|
1037
|
+
getStandardSymbols(instance.module) ?? getLinkedModule(instance.module, parsed.name),
|
|
1038
|
+
);
|
|
961
1039
|
scope.errors.push(...resolveModule(module, getUnit(module)));
|
|
962
1040
|
module.definitions.forEach((definition) => {
|
|
963
1041
|
const key = getKey(definition);
|
|
@@ -993,7 +1071,7 @@ export const createEnvironment = (
|
|
|
993
1071
|
const checks = instanceChecks
|
|
994
1072
|
.splice(firstCheck)
|
|
995
1073
|
.map((check) => ({ location: check.location, check: () => checkInstance(check) }));
|
|
996
|
-
scope.levelChecks.push(
|
|
1074
|
+
scope.levelChecks.push(
|
|
997
1075
|
checkModuleLevels(
|
|
998
1076
|
module,
|
|
999
1077
|
{
|
|
@@ -1031,6 +1109,15 @@ export const createEnvironment = (
|
|
|
1031
1109
|
);
|
|
1032
1110
|
linkOrder.push(...linkOrder.splice(linkOrder.indexOf(linkedRoot), 1));
|
|
1033
1111
|
if (warnings.length > 0 && !options.isSanyReported) options.print(formatSanyWarnings(warnings));
|
|
1112
|
+
const runtimeInvariants = options.runtimeInvariants ?? [];
|
|
1113
|
+
runtimeInvariants.forEach((invariant) => {
|
|
1114
|
+
if (invariant.module === undefined) return;
|
|
1115
|
+
linkedModules.set(root.name, linkedRoot);
|
|
1116
|
+
const linked = getLinkedModule(invariant.module, root.name);
|
|
1117
|
+
linkOrder.splice(linkOrder.indexOf(linked), 1);
|
|
1118
|
+
const definition = definitions.get(linked.visible.get(invariant.name)?.key ?? invariant.name);
|
|
1119
|
+
if (definition) definitions.set(invariant.name, definition);
|
|
1120
|
+
});
|
|
1034
1121
|
linkedRoot.visible.forEach((symbol, name) => {
|
|
1035
1122
|
const definition = definitions.get(symbol.key);
|
|
1036
1123
|
if (definition && symbol.key !== name) definitions.set(name, definition);
|
|
@@ -1057,7 +1144,7 @@ export const createEnvironment = (
|
|
|
1057
1144
|
root: linkedRoot,
|
|
1058
1145
|
moduleSymbols: new Map([
|
|
1059
1146
|
...standardExports,
|
|
1060
|
-
...[...linkedModules].map((
|
|
1147
|
+
...[...linkedModules].map((entry): [string, Symbols] => [entry[0], entry[1].visible]),
|
|
1061
1148
|
[root.name, linkedRoot.visible],
|
|
1062
1149
|
]),
|
|
1063
1150
|
definitions,
|
|
@@ -1108,6 +1195,7 @@ export const createEnvironment = (
|
|
|
1108
1195
|
variableIndex,
|
|
1109
1196
|
facts,
|
|
1110
1197
|
startupValues: Array.from({ length: facts.ids.size }, (): Value | undefined => undefined),
|
|
1198
|
+
tlcEvalValues: new WeakMap(),
|
|
1111
1199
|
substitutedDefinitions,
|
|
1112
1200
|
instanceParams,
|
|
1113
1201
|
evaluators: new WeakMap(),
|
|
@@ -1171,6 +1259,7 @@ export const createEnvironment = (
|
|
|
1171
1259
|
),
|
|
1172
1260
|
javaOverrides: linkOrder.flatMap((linked) => javaOverrides.get(linked.module.name) ?? []),
|
|
1173
1261
|
moduleOperators,
|
|
1262
|
+
runtimeInvariants,
|
|
1174
1263
|
rootName: root.name,
|
|
1175
1264
|
};
|
|
1176
1265
|
};
|