tla-ts 0.0.10-dev.37a75eb5b → 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 +33 -33
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +17 -3
- package/dist/index.d.ts +17 -3
- 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 +55 -55
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -42
- package/dist/run.js +42 -44
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +96 -91
- package/dist/transfer.js +95 -90
- 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 +12 -10
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +418 -246
- package/src/cli/tlc-output.ts +17 -2
- package/src/cli/tlc.ts +5 -4
- 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 +93 -35
- package/src/environment.ts +106 -39
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +415 -132
- package/src/exit-codes.ts +28 -15
- package/src/instances.ts +135 -11
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +674 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +161 -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/parser.ts +110 -111
- 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 +164 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +65 -13
- 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 +65 -14
- 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 +3 -9
- 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/fd-solver.ts +608 -141
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/goal.ts +4 -3
- 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/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-grobner.ts +2 -2
- 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/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 +14 -42
- 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 +1 -4
- 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 +4 -5
- package/src/prover/smt/solver/nlsat/levelwise.ts +0 -4
- package/src/prover/smt/solver/nlsat/polynomial.ts +1 -36
- package/src/prover/smt/solver/nlsat/upolynomial.ts +1 -1
- 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 +16 -7
- 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 +4 -3
- 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/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 +7 -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 +15 -6
- 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 +1 -1
- 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 +40 -6
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +579 -214
- package/src/prover/smt/solver/smtlib-script.ts +600 -170
- 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 +342 -196
- 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-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/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 +1226 -246
- package/src/runtime.ts +19 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +4 -2
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +4 -2
- package/src/sany/generator-expressions.ts +51 -20
- package/src/sany/generator-proofs.ts +17 -11
- package/src/sany/generator.ts +11 -5
- 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 +283 -126
- 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 +563 -139
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- package/src/tlc/jar-data.ts +1 -3
- package/src/tlc/messages.ts +3 -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 +26 -10
- 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
|
@@ -59,8 +59,7 @@ export const collectUnconstrained = (manager: AstManager, goal: Goal) => {
|
|
|
59
59
|
const repeated = new Set<number>();
|
|
60
60
|
for (const form of goal.forms.items) {
|
|
61
61
|
const todo = [form];
|
|
62
|
-
|
|
63
|
-
const expr = todo.pop() as number;
|
|
62
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
64
63
|
const isConst = manager.kinds[expr] === KIND_APP && manager.isUninterpretedConst(expr);
|
|
65
64
|
if (visited.has(expr)) {
|
|
66
65
|
if (isConst) repeated.add(expr);
|
|
@@ -82,8 +81,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
|
|
|
82
81
|
const disabled = new Set<number>();
|
|
83
82
|
const visited = new Set<number>();
|
|
84
83
|
const todo = [...goal.forms.items];
|
|
85
|
-
|
|
86
|
-
const expr = todo.pop() as number;
|
|
84
|
+
for (let expr = todo.pop(); expr !== undefined; expr = todo.pop()) {
|
|
87
85
|
if (visited.has(expr)) continue;
|
|
88
86
|
visited.add(expr);
|
|
89
87
|
if (manager.kinds[expr] === KIND_QUANTIFIER) {
|
|
@@ -92,8 +90,7 @@ export const disableQuantified = (manager: AstManager, goal: Goal, bodies: RefVe
|
|
|
92
90
|
if (disabled.has(body)) continue;
|
|
93
91
|
bodies.push(body);
|
|
94
92
|
const marks = [body];
|
|
95
|
-
|
|
96
|
-
const marked = marks.pop() as number;
|
|
93
|
+
for (let marked = marks.pop(); marked !== undefined; marked = marks.pop()) {
|
|
97
94
|
if (disabled.has(marked)) continue;
|
|
98
95
|
disabled.add(marked);
|
|
99
96
|
if (manager.kinds[marked] === KIND_APP) manager.pushArgs(marked, marks);
|
|
@@ -259,7 +256,7 @@ class UncnstrRewriter extends RewriterTpl {
|
|
|
259
256
|
if (index === -1) return -1;
|
|
260
257
|
const found = this.mkFreshFor(decl, args, sort);
|
|
261
258
|
if (!found.isNew) return found.fresh;
|
|
262
|
-
const rest = args.filter((
|
|
259
|
+
const rest = args.filter((_value, other) => other !== index);
|
|
263
260
|
const restExpr =
|
|
264
261
|
rest.length === 0
|
|
265
262
|
? -1
|
|
@@ -525,7 +522,7 @@ export const elimUncnstr = (manager: AstManager, goal: Goal, bodies: RefVector)
|
|
|
525
522
|
const rewritten = rewriter.rewrite(form);
|
|
526
523
|
if (rewritten !== form) {
|
|
527
524
|
isModified = true;
|
|
528
|
-
goal.update(index, rewritten);
|
|
525
|
+
goal.update(index, rewritten, goal.dependencies[index]);
|
|
529
526
|
}
|
|
530
527
|
manager.decRef(rewritten);
|
|
531
528
|
}
|
|
@@ -71,7 +71,7 @@ import { type Enode, NULL_THEORY_VAR } from "./egraph";
|
|
|
71
71
|
import type { EufSolver } from "./euf-solver";
|
|
72
72
|
import { ThSolver } from "./th-solver";
|
|
73
73
|
|
|
74
|
-
|
|
74
|
+
interface ZeroOneBit {
|
|
75
75
|
readonly owner: number;
|
|
76
76
|
readonly index: number;
|
|
77
77
|
readonly isTrue: boolean;
|
|
@@ -23,8 +23,8 @@ export const NULL_THEORY_VAR = -1;
|
|
|
23
23
|
export const NULL_BOOL_VAR = -1;
|
|
24
24
|
|
|
25
25
|
const J_AXIOM = 0;
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
const J_CONGRUENCE = 1;
|
|
27
|
+
const J_EXTERNAL = 2;
|
|
28
28
|
|
|
29
29
|
export interface Justification {
|
|
30
30
|
readonly kind: number;
|
|
@@ -32,7 +32,7 @@ export interface Justification {
|
|
|
32
32
|
readonly external: number;
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
|
|
35
|
+
const AXIOM: Justification = {
|
|
36
36
|
kind: J_AXIOM,
|
|
37
37
|
isCommutative: false,
|
|
38
38
|
external: 0,
|
|
@@ -522,12 +522,6 @@ export class Egraph {
|
|
|
522
522
|
this.push(U_TOGGLE_CGC, node);
|
|
523
523
|
}
|
|
524
524
|
|
|
525
|
-
setRelevant(node: Enode) {
|
|
526
|
-
if (node.isRelevant) return;
|
|
527
|
-
node.isRelevant = true;
|
|
528
|
-
this.push(U_SET_RELEVANT, node);
|
|
529
|
-
}
|
|
530
|
-
|
|
531
525
|
private toggleCgcEnabled(node: Enode, isBacktracking: boolean) {
|
|
532
526
|
const isEnabled = !node.isCgcEnabled;
|
|
533
527
|
node.isCgcEnabled = isEnabled;
|
|
@@ -465,8 +465,7 @@ export class EufSolver implements SatExtension {
|
|
|
465
465
|
let generation = 0;
|
|
466
466
|
const visited = new Set<number>();
|
|
467
467
|
const todo = [expr];
|
|
468
|
-
|
|
469
|
-
const current = todo.pop() as number;
|
|
468
|
+
for (let current = todo.pop(); current !== undefined; current = todo.pop()) {
|
|
470
469
|
if (visited.has(current)) continue;
|
|
471
470
|
visited.add(current);
|
|
472
471
|
const node = this.egraph.find(current);
|
|
@@ -42,7 +42,7 @@ import { type Egraph, type Enode, getClass } from "./egraph";
|
|
|
42
42
|
import type { TrailStack } from "./th-solver";
|
|
43
43
|
|
|
44
44
|
// euf::mam_solver: the solver whose trail undoes the matcher.
|
|
45
|
-
|
|
45
|
+
interface MamSolver {
|
|
46
46
|
readonly manager: AstManager;
|
|
47
47
|
readonly egraph: Egraph;
|
|
48
48
|
readonly trail: TrailStack;
|
|
@@ -590,10 +590,6 @@ export class Mam implements LabelHasher<Enode> {
|
|
|
590
590
|
return this.ctx.egraph.find(expr) ?? null;
|
|
591
591
|
}
|
|
592
592
|
|
|
593
|
-
canPropagate() {
|
|
594
|
-
return this.toMatch.length > 0 || this.newPatterns.length > 0;
|
|
595
|
-
}
|
|
596
|
-
|
|
597
593
|
private setLbls(root: Enode, isParent: boolean, hash: number) {
|
|
598
594
|
const low = isParent ? root.plbls : root.lbls;
|
|
599
595
|
const high = isParent ? root.plblsHigh : root.lblsHigh;
|
|
@@ -493,8 +493,7 @@ export class Ematch {
|
|
|
493
493
|
const manager = this.ctx.manager;
|
|
494
494
|
const todo = [expr];
|
|
495
495
|
const marked = new Set<number>();
|
|
496
|
-
|
|
497
|
-
const term = todo.pop() as number;
|
|
496
|
+
for (let term = todo.pop(); term !== undefined; term = todo.pop()) {
|
|
498
497
|
if (marked.has(term)) continue;
|
|
499
498
|
marked.add(term);
|
|
500
499
|
if (manager.isGroundApp(term)) {
|
|
@@ -25,10 +25,6 @@ export class TrailStack {
|
|
|
25
25
|
this.scopes.length -= numScopes;
|
|
26
26
|
while (this.undos.length > lim) (this.undos.pop() as () => void)();
|
|
27
27
|
}
|
|
28
|
-
|
|
29
|
-
get numScopes() {
|
|
30
|
-
return this.scopes.length;
|
|
31
|
-
}
|
|
32
28
|
}
|
|
33
29
|
|
|
34
30
|
// A th_explain: the literals and equalities that explain a propagation or a conflict.
|
|
@@ -109,9 +105,6 @@ export abstract class ThSolver {
|
|
|
109
105
|
isBetaRedex(_parent: Enode, _node: Enode) {
|
|
110
106
|
return false;
|
|
111
107
|
}
|
|
112
|
-
isFixed(_thVar: number, _lits: number[]): number {
|
|
113
|
-
return -1;
|
|
114
|
-
}
|
|
115
108
|
addValue(_node: Enode, _model: ProtoModel, _values: (number | undefined)[]) {}
|
|
116
109
|
addDep(node: Enode, deps: Dependencies) {
|
|
117
110
|
deps.set(node, null);
|