tla-ts 0.0.10-dev.8aec06f77 → 0.0.10-dev.94c3dd828
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/deciders.cjs +37 -36
- package/dist/deciders.js +55 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +146 -58
- package/dist/prove.js +142 -54
- package/dist/run.cjs +45 -43
- package/dist/run.js +47 -45
- package/dist/transfer.cjs +39 -36
- package/dist/transfer.js +23 -20
- package/dist/worker.cjs +1 -1
- package/dist/worker.js +1 -1
- package/package.json +1 -1
- package/src/ast.ts +3 -3
- package/src/check.ts +203 -33
- package/src/cli/tlapm.ts +261 -68
- package/src/dependencies.ts +23 -2
- package/src/errors.ts +1 -1
- package/src/exit-codes.ts +1 -0
- package/src/liveness-checker.ts +530 -201
- package/src/liveness.ts +47 -32
- package/src/obligations/anonymize.ts +2 -4
- package/src/obligations/index.ts +5 -3
- package/src/obligations/pragma.ts +2 -2
- package/src/parallel.ts +2 -2
- package/src/parser.ts +151 -42
- package/src/prover/deciders.ts +1 -8
- package/src/prover/isabelle/isar/attrib.ts +86 -45
- package/src/prover/isabelle/isar/context.ts +25 -22
- package/src/prover/isabelle/isar/induct.ts +2 -5
- package/src/prover/isabelle/isar/method.ts +5 -7
- package/src/prover/isabelle/isar/proof.ts +33 -16
- package/src/prover/isabelle/isar/rule-cases.ts +6 -14
- package/src/prover/isabelle/isar/theory.ts +16 -17
- package/src/prover/isabelle/isar/toplevel.ts +46 -52
- package/src/prover/isabelle/provers/classical.ts +1 -1
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +1 -0
- package/src/prover/prep/methods.ts +50 -3
- package/src/prover/prep/normalize.ts +4 -1
- package/src/prover/prove.ts +58 -32
- package/src/prover/ptl/decide.ts +43 -63
- package/src/prover/smt/data.ts +51 -45
- package/src/prover/smt/encode.ts +1 -2
- package/src/prover/smt/rewrite.ts +1 -0
- package/src/prover/smt/solver/aig-tactic.ts +25 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -5
- package/src/prover/smt/solver/asserted-formulas.ts +1 -1
- package/src/prover/smt/solver/ast-util.ts +3 -1
- package/src/prover/smt/solver/ast.ts +110 -152
- package/src/prover/smt/solver/bound-manager.ts +39 -28
- package/src/prover/smt/solver/bv-bound-chk.ts +2 -8
- package/src/prover/smt/solver/bv-rewriter.ts +14 -16
- package/src/prover/smt/solver/bv1-blast.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +19 -14
- package/src/prover/smt/solver/check-logic.ts +6 -1
- package/src/prover/smt/solver/context.ts +20 -10
- package/src/prover/smt/solver/demodulator.ts +2 -2
- package/src/prover/smt/solver/dependent-expr-state.ts +16 -0
- package/src/prover/smt/solver/distribute-forall.ts +1 -10
- package/src/prover/smt/solver/dom-simplify.ts +1 -1
- package/src/prover/smt/solver/dt2bv-tactic.ts +2 -7
- package/src/prover/smt/solver/e-matching.ts +6 -6
- package/src/prover/smt/solver/elim-uncnstr.ts +3 -14
- package/src/prover/smt/solver/enode.ts +15 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +19 -8
- package/src/prover/smt/solver/euf/dt-solver.ts +19 -19
- package/src/prover/smt/solver/euf/egraph.ts +65 -32
- package/src/prover/smt/solver/euf/euf-solver.ts +35 -18
- package/src/prover/smt/solver/euf/fpa-solver.ts +37 -51
- package/src/prover/smt/solver/euf/mam.ts +6 -48
- package/src/prover/smt/solver/euf/q-ematch.ts +21 -94
- package/src/prover/smt/solver/euf/q-mbi.ts +4 -2
- package/src/prover/smt/solver/euf/q-model-fixer.ts +1 -1
- package/src/prover/smt/solver/euf/q-solver.ts +2 -0
- package/src/prover/smt/solver/euf/th-solver.ts +1 -1
- package/src/prover/smt/solver/factor.ts +1 -11
- package/src/prover/smt/solver/fd-solver.ts +1 -2
- package/src/prover/smt/solver/fm-tactic.ts +19 -13
- package/src/prover/smt/solver/fpa-rewriter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-converter.ts +10 -6
- package/src/prover/smt/solver/internalizer.ts +41 -2
- package/src/prover/smt/solver/lia2pb.ts +18 -4
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +144 -107
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +50 -17
- package/src/prover/smt/solver/macro-finder.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +13 -13
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +1 -11
- package/src/prover/smt/solver/maxcore.ts +4 -12
- package/src/prover/smt/solver/maxlex.ts +0 -7
- package/src/prover/smt/solver/maxsmt-base.ts +7 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +2 -11
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +9 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +1 -9
- package/src/prover/smt/solver/model-evaluator.ts +9 -5
- package/src/prover/smt/solver/model-macro-solver.ts +3 -3
- package/src/prover/smt/solver/muz/dl-context.ts +57 -3
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +68 -20
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +7 -1
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +39 -10
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +76 -13
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +9 -2
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +0 -2
- package/src/prover/smt/solver/muz/dl-rule.ts +93 -29
- package/src/prover/smt/solver/muz/hnf.ts +6 -5
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +178 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +14 -3
- package/src/prover/smt/solver/muz/rule-properties.ts +194 -36
- package/src/prover/smt/solver/muz/spacer-context.ts +102 -84
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +15 -2
- package/src/prover/smt/solver/muz/spacer-pdr.ts +3 -3
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +2 -7
- package/src/prover/smt/solver/muz/spacer-util.ts +2 -2
- package/src/prover/smt/solver/muz/substitution.ts +88 -37
- package/src/prover/smt/solver/nlqsat.ts +2 -2
- package/src/prover/smt/solver/nlsat/algebraic.ts +1 -2
- package/src/prover/smt/solver/nlsat/explain.ts +5 -0
- package/src/prover/smt/solver/nlsat/solver.ts +36 -25
- package/src/prover/smt/solver/opt-context.ts +9 -8
- package/src/prover/smt/solver/opt-nlsat.ts +68 -58
- package/src/prover/smt/solver/opt-solver.ts +16 -7
- package/src/prover/smt/solver/optsmt.ts +12 -9
- package/src/prover/smt/solver/pattern-inference.ts +2 -2
- package/src/prover/smt/solver/pb-rewriter.ts +13 -13
- package/src/prover/smt/solver/poly-rewriter.ts +2 -2
- package/src/prover/smt/solver/probes.ts +1 -1
- package/src/prover/smt/solver/propagate-values.ts +4 -0
- package/src/prover/smt/solver/proto-model.ts +5 -5
- package/src/prover/smt/solver/purify-arith.ts +50 -15
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -1
- package/src/prover/smt/solver/qe-mbp.ts +13 -23
- package/src/prover/smt/solver/qe.ts +45 -53
- package/src/prover/smt/solver/qsat.ts +70 -90
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -9
- package/src/prover/smt/solver/quasi-macros.ts +9 -18
- package/src/prover/smt/solver/rational.ts +17 -0
- package/src/prover/smt/solver/recfun-decl-plugin.ts +33 -19
- package/src/prover/smt/solver/recfun-rewriter.ts +1 -1
- package/src/prover/smt/solver/rewriter-tpl.ts +6 -2
- package/src/prover/smt/solver/rewriter.ts +1 -1
- package/src/prover/smt/solver/sat/asymm-branch.ts +59 -46
- package/src/prover/smt/solver/sat/clause-use-list.ts +0 -6
- package/src/prover/smt/solver/sat/clause.ts +1 -3
- package/src/prover/smt/solver/sat/config.ts +3 -3
- package/src/prover/smt/solver/sat/consequences.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +1 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +4 -12
- package/src/prover/smt/solver/sat/model-converter.ts +1 -15
- package/src/prover/smt/solver/sat/pb-solver.ts +49 -23
- package/src/prover/smt/solver/sat/probing.ts +22 -19
- package/src/prover/smt/solver/sat/sat2goal.ts +9 -10
- package/src/prover/smt/solver/sat/simplifier.ts +15 -56
- package/src/prover/smt/solver/sat/solver.ts +20 -19
- package/src/prover/smt/solver/sat/watch-list.ts +7 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +7 -7
- package/src/prover/smt/solver/seq-derive.ts +6 -7
- package/src/prover/smt/solver/seq-eq-solver.ts +7 -7
- package/src/prover/smt/solver/seq-range-predicate.ts +14 -1
- package/src/prover/smt/solver/seq-re-rewriter.ts +1 -10
- package/src/prover/smt/solver/seq-re-util.ts +1 -2
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +4 -4
- package/src/prover/smt/solver/seq-rewriter.ts +1 -4
- package/src/prover/smt/solver/smt-setup.ts +15 -9
- package/src/prover/smt/solver/smtlib-parser.ts +1174 -579
- package/src/prover/smt/solver/smtlib-script.ts +866 -728
- package/src/prover/smt/solver/tactic.ts +66 -14
- package/src/prover/smt/solver/theory-array.ts +25 -58
- package/src/prover/smt/solver/theory-bv.ts +13 -50
- package/src/prover/smt/solver/theory-fpa.ts +46 -78
- package/src/prover/smt/solver/theory-pb.ts +10 -6
- package/src/prover/smt/solver/theory-recfun.ts +2 -2
- package/src/prover/smt/solver/theory-seq-regex.ts +3 -6
- package/src/prover/smt/solver/theory-seq-solve.ts +5 -5
- package/src/prover/smt/solver/theory-seq-state.ts +6 -3
- package/src/prover/smt/solver/theory-seq.ts +32 -54
- package/src/prover/smt/solver/theory.ts +16 -1
- package/src/prover/smt/solver/tseitin-cnf.ts +3 -3
- package/src/prover/smt/solver/var-subst.ts +2 -2
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/zenon/decide.ts +9 -11
- package/src/prover/zenon/node.ts +12 -11
- package/src/prover/zenon/tla/sets.ts +1 -1
- package/src/search.ts +131 -16
- package/src/successors.ts +1 -1
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/summary.ts +29 -14
- package/src/typed-tier.ts +6535 -0
- package/src/prover/smt/solver/seq-regex-witness.ts +0 -100
|
@@ -6,7 +6,16 @@ import {
|
|
|
6
6
|
SmtTacticError,
|
|
7
7
|
SmtUnsupportedError,
|
|
8
8
|
} from "../../../errors";
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
type AstManager,
|
|
11
|
+
KIND_APP,
|
|
12
|
+
OP_DIV0,
|
|
13
|
+
OP_IDIV0,
|
|
14
|
+
OP_ITE,
|
|
15
|
+
OP_MOD0,
|
|
16
|
+
OP_POWER0,
|
|
17
|
+
SORT_BOOL,
|
|
18
|
+
} from "./ast";
|
|
10
19
|
import { createQfufbvAckrTactic, runAckermannizeBv } from "./ackermannize-bv-tactic";
|
|
11
20
|
import { AssertedFormulas } from "./asserted-formulas";
|
|
12
21
|
import { createAigTactic } from "./aig-tactic";
|
|
@@ -332,6 +341,10 @@ export const getSatParams = (parameters: ReadonlyMap<string, string>) =>
|
|
|
332
341
|
}),
|
|
333
342
|
);
|
|
334
343
|
|
|
344
|
+
// sat_params reads what using-params leaves unset from the sat module's global parameters.
|
|
345
|
+
const getSatTacticParams = (environment: TacticEnvironment, params: TacticParams) =>
|
|
346
|
+
new Map([...getSatParams(environment.parameters), ...params]);
|
|
347
|
+
|
|
335
348
|
const runSmt = (environment: TacticEnvironment, params: TacticParams) => (goal: Goal) => {
|
|
336
349
|
const manager = environment.manager;
|
|
337
350
|
// mk_smt_tactic: with sat.euf, the smt tactic is the sat tactic.
|
|
@@ -526,6 +539,8 @@ const SAT_DESCRS = getDescrs("sat", [
|
|
|
526
539
|
["search.sat.conflicts", PARAM_UINT, 400, true],
|
|
527
540
|
["search.unsat.conflicts", PARAM_UINT, 400, true],
|
|
528
541
|
["restart.initial", PARAM_UINT, 2, true],
|
|
542
|
+
["restart.max", PARAM_UINT, UINT_MAX, true],
|
|
543
|
+
["inprocess.max", PARAM_UINT, UINT_MAX, true],
|
|
529
544
|
["random_seed", PARAM_UINT, 0, true],
|
|
530
545
|
["burst_search", PARAM_UINT, 100, true],
|
|
531
546
|
["enable_pre_simplify", PARAM_BOOL, false, true],
|
|
@@ -728,6 +743,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
728
743
|
build: (environment, params) =>
|
|
729
744
|
inPlace((goal) => {
|
|
730
745
|
const manager = environment.manager;
|
|
746
|
+
const original = new RefVector(manager);
|
|
747
|
+
for (const form of goal.forms.items) original.push(form);
|
|
731
748
|
try {
|
|
732
749
|
tseitinCnf(manager, goal);
|
|
733
750
|
} catch (error) {
|
|
@@ -738,6 +755,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
738
755
|
isKeepingDistinct: false,
|
|
739
756
|
});
|
|
740
757
|
tseitinCnf(manager, goal);
|
|
758
|
+
} finally {
|
|
759
|
+
original.reset();
|
|
741
760
|
}
|
|
742
761
|
}),
|
|
743
762
|
},
|
|
@@ -799,6 +818,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
799
818
|
[
|
|
800
819
|
"lia2card",
|
|
801
820
|
{
|
|
821
|
+
isTrackingDependencies: true,
|
|
802
822
|
descrs: getDescrs("", [["compile_equality", PARAM_BOOL, true, true]]),
|
|
803
823
|
build: (environment, params) =>
|
|
804
824
|
inPlace((goal) =>
|
|
@@ -864,6 +884,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
864
884
|
["lia2pb_total_bits", PARAM_UINT, 2048, true],
|
|
865
885
|
]),
|
|
866
886
|
]),
|
|
887
|
+
isTrackingDependencies: true,
|
|
867
888
|
build: (environment, params) =>
|
|
868
889
|
inPlace((goal) =>
|
|
869
890
|
lia2pb(environment.manager, goal, {
|
|
@@ -906,6 +927,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
906
927
|
[
|
|
907
928
|
"fm",
|
|
908
929
|
{
|
|
930
|
+
isTrackingDependencies: true,
|
|
909
931
|
descrs: new Map([
|
|
910
932
|
...REWRITER_DESCRS,
|
|
911
933
|
...getDescrs("", [
|
|
@@ -929,6 +951,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
929
951
|
new Map([...params, ["arith_lhs", true], ["elim_and", true], ["som", true]]),
|
|
930
952
|
),
|
|
931
953
|
);
|
|
954
|
+
// and_then stops at a decided goal.
|
|
955
|
+
if (goal.isDecided()) return;
|
|
932
956
|
fm(manager, goal, {
|
|
933
957
|
isRealOnly: getBool(params, "fm_real_only", true),
|
|
934
958
|
limit: getUint(params, "fm_limit", 5000000),
|
|
@@ -996,6 +1020,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
996
1020
|
[
|
|
997
1021
|
"fix-dl-var",
|
|
998
1022
|
{
|
|
1023
|
+
isTrackingDependencies: true,
|
|
999
1024
|
descrs: REWRITER_DESCRS,
|
|
1000
1025
|
build: (environment, params) =>
|
|
1001
1026
|
inPlace((goal) =>
|
|
@@ -1006,6 +1031,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1006
1031
|
[
|
|
1007
1032
|
"factor",
|
|
1008
1033
|
{
|
|
1034
|
+
isTrackingDependencies: true,
|
|
1009
1035
|
descrs: getDescrs("", [
|
|
1010
1036
|
["split_factors", PARAM_BOOL, true, true],
|
|
1011
1037
|
["max_search_size", PARAM_UINT, UINT_MAX],
|
|
@@ -1087,7 +1113,14 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1087
1113
|
build: (environment) => inPlace((goal) => occf(environment.manager, goal)),
|
|
1088
1114
|
},
|
|
1089
1115
|
],
|
|
1090
|
-
[
|
|
1116
|
+
[
|
|
1117
|
+
"fpa2bv",
|
|
1118
|
+
{
|
|
1119
|
+
descrs: new Map(),
|
|
1120
|
+
isTrackingDependencies: true,
|
|
1121
|
+
build: (environment) => runFpa2Bv(environment.manager),
|
|
1122
|
+
},
|
|
1123
|
+
],
|
|
1091
1124
|
[
|
|
1092
1125
|
"elim-small-bv",
|
|
1093
1126
|
{
|
|
@@ -1282,7 +1315,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1282
1315
|
{
|
|
1283
1316
|
descrs: SAT_DESCRS,
|
|
1284
1317
|
isRejectingUnknown: false,
|
|
1285
|
-
build: (environment, params) =>
|
|
1318
|
+
build: (environment, params) =>
|
|
1319
|
+
createSatTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1286
1320
|
},
|
|
1287
1321
|
],
|
|
1288
1322
|
[
|
|
@@ -1290,7 +1324,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1290
1324
|
{
|
|
1291
1325
|
descrs: SAT_DESCRS,
|
|
1292
1326
|
isRejectingUnknown: false,
|
|
1293
|
-
build: (environment, params) =>
|
|
1327
|
+
build: (environment, params) =>
|
|
1328
|
+
createFdTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1294
1329
|
},
|
|
1295
1330
|
],
|
|
1296
1331
|
[
|
|
@@ -1298,7 +1333,8 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1298
1333
|
{
|
|
1299
1334
|
descrs: SAT_DESCRS,
|
|
1300
1335
|
isRejectingUnknown: false,
|
|
1301
|
-
build: (environment, params) =>
|
|
1336
|
+
build: (environment, params) =>
|
|
1337
|
+
createSatTactic(environment.manager, getSatTacticParams(environment, params)),
|
|
1302
1338
|
},
|
|
1303
1339
|
],
|
|
1304
1340
|
[
|
|
@@ -1317,6 +1353,7 @@ const NAMED_TACTICS = new Map<string, NamedTactic>([
|
|
|
1317
1353
|
"aig",
|
|
1318
1354
|
{
|
|
1319
1355
|
descrs: getDescrs("", [["max_memory", PARAM_UINT, UINT_MAX, true]]),
|
|
1356
|
+
isTrackingDependencies: true,
|
|
1320
1357
|
build: (environment) => createAigTactic(environment.manager),
|
|
1321
1358
|
},
|
|
1322
1359
|
],
|
|
@@ -1845,8 +1882,13 @@ interface TacticCheck {
|
|
|
1845
1882
|
status: number;
|
|
1846
1883
|
model: ProtoModel | undefined;
|
|
1847
1884
|
core: Dependency | undefined;
|
|
1885
|
+
// What check_sat leaves in reason_unknown, or undefined where the port does not track it.
|
|
1886
|
+
reasonUnknown: string | undefined;
|
|
1848
1887
|
}
|
|
1849
1888
|
|
|
1889
|
+
// The port's declarations of division by zero leave out their domain; Z3's have two arguments.
|
|
1890
|
+
const DIVISION_BY_ZERO_DECLS = new Set([OP_DIV0, OP_IDIV0, OP_MOD0, OP_POWER0]);
|
|
1891
|
+
|
|
1850
1892
|
// A constant of an uninterpreted sort the model lacks puts its value in that sort's universe.
|
|
1851
1893
|
const applyDefinitions = (definitions: Definition[], model: ProtoModel) => {
|
|
1852
1894
|
const manager = model.manager;
|
|
@@ -1860,7 +1902,9 @@ const applyDefinitions = (definitions: Definition[], model: ProtoModel) => {
|
|
|
1860
1902
|
continue;
|
|
1861
1903
|
}
|
|
1862
1904
|
const value = evaluator.rewrite(definition.def);
|
|
1863
|
-
const arity =
|
|
1905
|
+
const arity = DIVISION_BY_ZERO_DECLS.has(definition.decl)
|
|
1906
|
+
? 2
|
|
1907
|
+
: manager.funcDecls[definition.decl].domain.length;
|
|
1864
1908
|
if (arity > 0) {
|
|
1865
1909
|
const oldInterp = model.funcInterps.get(definition.decl);
|
|
1866
1910
|
const isChanged = oldInterp?.elseExpr !== value;
|
|
@@ -1907,23 +1951,31 @@ export const convertModel = (goal: Goal, model: ProtoModel) =>
|
|
|
1907
1951
|
}, model);
|
|
1908
1952
|
|
|
1909
1953
|
export const checkSatUsing = (tactic: Tactic, goal: Goal): TacticCheck => {
|
|
1954
|
+
const undecided = { status: L_UNDEF, model: undefined, core: undefined };
|
|
1910
1955
|
const goals = (() => {
|
|
1911
1956
|
try {
|
|
1912
1957
|
return tactic(goal);
|
|
1913
1958
|
} catch (error) {
|
|
1914
|
-
if (error instanceof SmtTacticError
|
|
1959
|
+
if (error instanceof SmtTacticError) return error.message;
|
|
1960
|
+
if (error instanceof SmtCanceledError) return undefined;
|
|
1915
1961
|
throw error;
|
|
1916
1962
|
}
|
|
1917
1963
|
})();
|
|
1918
|
-
if (goals
|
|
1964
|
+
if (typeof goals === "string") return { ...undecided, reasonUnknown: goals };
|
|
1965
|
+
if (goals !== undefined && isDecidedSat(goals)) {
|
|
1966
|
+
const model = convertModel(goals[0], goals[0].model ?? new ProtoModel(goal.manager));
|
|
1967
|
+
return goal.manager.limit.inc()
|
|
1968
|
+
? { status: L_TRUE, model, core: undefined, reasonUnknown: "" }
|
|
1969
|
+
: { ...undecided, model, reasonUnknown: "canceled" };
|
|
1970
|
+
}
|
|
1971
|
+
if (goals !== undefined && isDecidedUnsat(goals))
|
|
1919
1972
|
return {
|
|
1920
|
-
status:
|
|
1921
|
-
model:
|
|
1922
|
-
core:
|
|
1973
|
+
status: L_FALSE,
|
|
1974
|
+
model: undefined,
|
|
1975
|
+
core: goals[0].getDependency(0),
|
|
1976
|
+
reasonUnknown: "",
|
|
1923
1977
|
};
|
|
1924
|
-
|
|
1925
|
-
return { status: L_FALSE, model: undefined, core: goals[0].getDependency(0) };
|
|
1926
|
-
return { status: L_UNDEF, model: undefined, core: undefined };
|
|
1978
|
+
return { ...undecided, reasonUnknown: undefined };
|
|
1927
1979
|
};
|
|
1928
1980
|
|
|
1929
1981
|
export const applyTactic = (tactic: Tactic, goal: Goal) => {
|
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
import type { Context } from "./context";
|
|
20
20
|
import { type Enode, TheoryJustification } from "./enode";
|
|
21
21
|
import { FALSE_LITERAL, getVar, isNegated, type Literal, negate, TRUE_LITERAL } from "./literal";
|
|
22
|
+
import { UnionFind } from "./lp/union-find";
|
|
22
23
|
import { FuncInterp, type ProtoModel } from "./proto-model";
|
|
23
24
|
import {
|
|
24
25
|
type DependentValue,
|
|
@@ -64,9 +65,7 @@ interface Reach {
|
|
|
64
65
|
|
|
65
66
|
export class TheoryArray extends Theory {
|
|
66
67
|
readonly name = "array";
|
|
67
|
-
private
|
|
68
|
-
private sizes: number[] = [];
|
|
69
|
-
private nexts: number[] = [];
|
|
68
|
+
private unionFind: UnionFind;
|
|
70
69
|
private trail: (() => void)[] = [];
|
|
71
70
|
private trailLimits: number[] = [];
|
|
72
71
|
private stores: Enode[][] = [];
|
|
@@ -98,6 +97,8 @@ export class TheoryArray extends Theory {
|
|
|
98
97
|
|
|
99
98
|
constructor(context: Context) {
|
|
100
99
|
super(context, FAMILY_ARRAY);
|
|
100
|
+
this.unionFind = new UnionFind(this.trail);
|
|
101
|
+
this.unionFind.handler = { mergeEh: (root, joining) => this.mergeEh(root, joining) };
|
|
101
102
|
}
|
|
102
103
|
|
|
103
104
|
private isOp(node: Enode, op: number) {
|
|
@@ -108,34 +109,6 @@ export class TheoryArray extends Theory {
|
|
|
108
109
|
return this.manager.isArraySort(this.manager.sorts[node.owner]);
|
|
109
110
|
}
|
|
110
111
|
|
|
111
|
-
private find(thVar: number) {
|
|
112
|
-
let current = thVar;
|
|
113
|
-
while (this.finds[current] !== current) current = this.finds[current];
|
|
114
|
-
return current;
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
private merge(inputFirst: number, inputSecond: number) {
|
|
118
|
-
const firstRoot = this.find(inputFirst);
|
|
119
|
-
const secondRoot = this.find(inputSecond);
|
|
120
|
-
if (firstRoot === secondRoot) return;
|
|
121
|
-
const isSwapped = this.sizes[firstRoot] > this.sizes[secondRoot];
|
|
122
|
-
const joining = isSwapped ? secondRoot : firstRoot;
|
|
123
|
-
const root = isSwapped ? firstRoot : secondRoot;
|
|
124
|
-
this.mergeEh(root, joining);
|
|
125
|
-
this.finds[joining] = root;
|
|
126
|
-
this.sizes[root] += this.sizes[joining];
|
|
127
|
-
const next = this.nexts[joining];
|
|
128
|
-
this.nexts[joining] = this.nexts[root];
|
|
129
|
-
this.nexts[root] = next;
|
|
130
|
-
this.trail.push(() => {
|
|
131
|
-
this.sizes[root] -= this.sizes[joining];
|
|
132
|
-
this.finds[joining] = joining;
|
|
133
|
-
const restored = this.nexts[joining];
|
|
134
|
-
this.nexts[joining] = this.nexts[root];
|
|
135
|
-
this.nexts[root] = restored;
|
|
136
|
-
});
|
|
137
|
-
}
|
|
138
|
-
|
|
139
112
|
private pushBack(list: Enode[], node: Enode) {
|
|
140
113
|
list.push(node);
|
|
141
114
|
this.trail.push(() => list.pop());
|
|
@@ -189,14 +162,7 @@ export class TheoryArray extends Theory {
|
|
|
189
162
|
const manager = this.manager;
|
|
190
163
|
const thVar = this.varEnodes.length;
|
|
191
164
|
this.varEnodes.push(node);
|
|
192
|
-
this.
|
|
193
|
-
this.sizes.push(1);
|
|
194
|
-
this.nexts.push(thVar);
|
|
195
|
-
this.trail.push(() => {
|
|
196
|
-
this.finds.pop();
|
|
197
|
-
this.sizes.pop();
|
|
198
|
-
this.nexts.pop();
|
|
199
|
-
});
|
|
165
|
+
this.unionFind.mkVar();
|
|
200
166
|
const isStore = this.isOp(node, OP_STORE);
|
|
201
167
|
this.stores.push(isStore ? [node] : []);
|
|
202
168
|
this.parentSelects.push([]);
|
|
@@ -311,12 +277,12 @@ export class TheoryArray extends Theory {
|
|
|
311
277
|
}
|
|
312
278
|
|
|
313
279
|
newEqEh(first: number, second: number) {
|
|
314
|
-
this.merge(first, second);
|
|
280
|
+
this.unionFind.merge(first, second);
|
|
315
281
|
}
|
|
316
282
|
|
|
317
283
|
newDiseqEh(inputFirst: number, inputSecond: number) {
|
|
318
|
-
const first = this.find(inputFirst);
|
|
319
|
-
const second = this.find(inputSecond);
|
|
284
|
+
const first = this.unionFind.find(inputFirst);
|
|
285
|
+
const second = this.unionFind.find(inputSecond);
|
|
320
286
|
if (this.isArrayNode(this.getEnode(first)))
|
|
321
287
|
this.assertExtensionality(this.getEnode(first), this.getEnode(second));
|
|
322
288
|
}
|
|
@@ -343,7 +309,7 @@ export class TheoryArray extends Theory {
|
|
|
343
309
|
}
|
|
344
310
|
|
|
345
311
|
private addParentSelect(inputVar: number, select: Enode) {
|
|
346
|
-
const thVar = this.find(inputVar);
|
|
312
|
+
const thVar = this.unionFind.find(inputVar);
|
|
347
313
|
this.pushBack(this.parentSelects[thVar], select);
|
|
348
314
|
const stores = this.stores[thVar];
|
|
349
315
|
for (let index = 0; index < stores.length; index++)
|
|
@@ -357,11 +323,11 @@ export class TheoryArray extends Theory {
|
|
|
357
323
|
}
|
|
358
324
|
|
|
359
325
|
private addParentStore(inputVar: number, store: Enode) {
|
|
360
|
-
this.pushBack(this.parentStores[this.find(inputVar)], store);
|
|
326
|
+
this.pushBack(this.parentStores[this.unionFind.find(inputVar)], store);
|
|
361
327
|
}
|
|
362
328
|
|
|
363
329
|
private addStore(inputVar: number, store: Enode) {
|
|
364
|
-
const thVar = this.find(inputVar);
|
|
330
|
+
const thVar = this.unionFind.find(inputVar);
|
|
365
331
|
this.setPropUpwardStores(thVar);
|
|
366
332
|
this.pushBack(this.stores[thVar], store);
|
|
367
333
|
const parentSelects = this.parentSelects[thVar];
|
|
@@ -371,7 +337,7 @@ export class TheoryArray extends Theory {
|
|
|
371
337
|
}
|
|
372
338
|
|
|
373
339
|
private addMap(inputVar: number, map: Enode) {
|
|
374
|
-
const thVar = this.find(inputVar);
|
|
340
|
+
const thVar = this.unionFind.find(inputVar);
|
|
375
341
|
this.setPropUpwardStores(thVar);
|
|
376
342
|
this.pushBack(this.maps[thVar], map);
|
|
377
343
|
const parentSelects = this.parentSelects[thVar];
|
|
@@ -381,7 +347,7 @@ export class TheoryArray extends Theory {
|
|
|
381
347
|
}
|
|
382
348
|
|
|
383
349
|
private addParentMap(inputVar: number, map: Enode) {
|
|
384
|
-
this.pushBack(this.parentMaps[this.find(inputVar)], map);
|
|
350
|
+
this.pushBack(this.parentMaps[this.unionFind.find(inputVar)], map);
|
|
385
351
|
}
|
|
386
352
|
|
|
387
353
|
// add_const and add_as_array take the variable as it is, the root that merge_eh passes.
|
|
@@ -403,13 +369,13 @@ export class TheoryArray extends Theory {
|
|
|
403
369
|
}
|
|
404
370
|
|
|
405
371
|
private addParentDefault(inputVar: number) {
|
|
406
|
-
const stores = this.stores[this.find(inputVar)];
|
|
372
|
+
const stores = this.stores[this.unionFind.find(inputVar)];
|
|
407
373
|
for (let index = 0; index < stores.length; index++)
|
|
408
374
|
if (this.isOp(stores[index], OP_STORE)) this.instantiateDefaultStoreAxiom(stores[index]);
|
|
409
375
|
}
|
|
410
376
|
|
|
411
377
|
private setPropUpwardVar(inputVar: number) {
|
|
412
|
-
const thVar = this.find(inputVar);
|
|
378
|
+
const thVar = this.unionFind.find(inputVar);
|
|
413
379
|
if (this.isPropUpward[thVar]) return;
|
|
414
380
|
this.isPropUpward[thVar] = true;
|
|
415
381
|
this.trail.push(() => {
|
|
@@ -454,19 +420,19 @@ export class TheoryArray extends Theory {
|
|
|
454
420
|
const node = context.getEnode(expr);
|
|
455
421
|
if (node === undefined) return;
|
|
456
422
|
if (op === OP_SELECT)
|
|
457
|
-
this.addParentSelect(this.find(this.getVar(this.getArgNode(expr, 0))), node);
|
|
423
|
+
this.addParentSelect(this.unionFind.find(this.getVar(this.getArgNode(expr, 0))), node);
|
|
458
424
|
else if (op === OP_ARRAY_DEFAULT) {
|
|
459
425
|
const thVar = this.getVar(this.getArgNode(expr, 0));
|
|
460
426
|
this.setPropUpwardVar(thVar);
|
|
461
|
-
this.addParentDefault(this.find(thVar));
|
|
427
|
+
this.addParentDefault(this.unionFind.find(thVar));
|
|
462
428
|
} else if (op === OP_CONST_ARRAY) {
|
|
463
429
|
this.instantiateDefaultConstAxiom(node);
|
|
464
430
|
const thVar = this.getVar(node);
|
|
465
431
|
this.setPropUpwardVar(thVar);
|
|
466
|
-
this.addParentDefault(this.find(thVar));
|
|
432
|
+
this.addParentDefault(this.unionFind.find(thVar));
|
|
467
433
|
} else if (op === OP_ARRAY_MAP) {
|
|
468
434
|
for (let index = 0; index < node.numArgs; index++) {
|
|
469
|
-
const thVar = this.find(this.getVar(node.getArg(index)));
|
|
435
|
+
const thVar = this.unionFind.find(this.getVar(node.getArg(index)));
|
|
470
436
|
this.addParentMap(thVar, node);
|
|
471
437
|
this.setPropUpwardVar(thVar);
|
|
472
438
|
}
|
|
@@ -741,7 +707,7 @@ export class TheoryArray extends Theory {
|
|
|
741
707
|
|
|
742
708
|
private instantiateParentStoresDefault(inputVar: number) {
|
|
743
709
|
let result = false;
|
|
744
|
-
for (const store of this.parentStores[this.find(inputVar)])
|
|
710
|
+
for (const store of this.parentStores[this.unionFind.find(inputVar)])
|
|
745
711
|
if (this.instantiateDefaultStoreAxiom(store)) result = true;
|
|
746
712
|
return result;
|
|
747
713
|
}
|
|
@@ -936,7 +902,7 @@ export class TheoryArray extends Theory {
|
|
|
936
902
|
const current = result[qhead];
|
|
937
903
|
const thVar = this.getVar(current.root);
|
|
938
904
|
if (thVar < 0) continue;
|
|
939
|
-
for (const store of this.parentStores[this.find(thVar)]) {
|
|
905
|
+
for (const store of this.parentStores[this.unionFind.find(thVar)]) {
|
|
940
906
|
if (
|
|
941
907
|
!this.isOp(store, OP_STORE) ||
|
|
942
908
|
!context.isRelevant(store.owner) ||
|
|
@@ -1153,8 +1119,9 @@ export class TheoryArray extends Theory {
|
|
|
1153
1119
|
for (let thVar = 0; thVar < numVars; thVar++) {
|
|
1154
1120
|
const node = this.getEnode(thVar);
|
|
1155
1121
|
if (!this.context.isRelevant(node.owner)) continue;
|
|
1156
|
-
this.mgMerge(thVar, this.find(thVar));
|
|
1157
|
-
if (this.isOp(node, OP_STORE))
|
|
1122
|
+
this.mgMerge(thVar, this.unionFind.find(thVar));
|
|
1123
|
+
if (this.isOp(node, OP_STORE))
|
|
1124
|
+
this.mgMerge(thVar, this.unionFind.find(this.getVar(node.getArg(0))));
|
|
1158
1125
|
else if (this.isOp(node, OP_CONST_ARRAY)) this.setDefault(thVar, node.getArg(0));
|
|
1159
1126
|
else if (this.isOp(node, OP_ARRAY_DEFAULT))
|
|
1160
1127
|
this.setDefault(this.getVar(node.getArg(0)), node);
|
|
@@ -1175,7 +1142,7 @@ export class TheoryArray extends Theory {
|
|
|
1175
1142
|
const context = this.context;
|
|
1176
1143
|
for (let thVar = 0; thVar < this.getNumVars(); thVar++) {
|
|
1177
1144
|
const root = this.getEnode(thVar).root;
|
|
1178
|
-
if (this.find(thVar) !== thVar || !context.isRelevant(root.owner)) continue;
|
|
1145
|
+
if (this.unionFind.find(thVar) !== thVar || !context.isRelevant(root.owner)) continue;
|
|
1179
1146
|
for (const parent of root.parents)
|
|
1180
1147
|
if (
|
|
1181
1148
|
parent.cg === parent &&
|
|
@@ -76,6 +76,7 @@ import {
|
|
|
76
76
|
TRUE_BOOL_VAR,
|
|
77
77
|
TRUE_LITERAL,
|
|
78
78
|
} from "./literal";
|
|
79
|
+
import { UnionFind } from "./lp/union-find";
|
|
79
80
|
import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
|
|
80
81
|
import { Theory } from "./theory";
|
|
81
82
|
|
|
@@ -236,9 +237,7 @@ export class TheoryBv extends Theory {
|
|
|
236
237
|
private blaster: BitBlaster;
|
|
237
238
|
private trail: (() => void)[] = [];
|
|
238
239
|
private trailLimits: number[] = [];
|
|
239
|
-
private
|
|
240
|
-
private sizes: number[] = [];
|
|
241
|
-
private nexts: number[] = [];
|
|
240
|
+
private unionFind = new UnionFind(this.trail);
|
|
242
241
|
private bits: Literal[][] = [];
|
|
243
242
|
private wpos: number[] = [];
|
|
244
243
|
private zeroOneBits: ZeroOneBit[][] = [];
|
|
@@ -254,6 +253,10 @@ export class TheoryBv extends Theory {
|
|
|
254
253
|
constructor(context: Context) {
|
|
255
254
|
super(context, FAMILY_BV);
|
|
256
255
|
this.blaster = new BitBlaster(context.manager);
|
|
256
|
+
this.unionFind.handler = {
|
|
257
|
+
mergeEh: (root, joining, second, first) => this.mergeEh(root, joining, second, first),
|
|
258
|
+
unmergeEh: (root) => this.unmergeEh(root),
|
|
259
|
+
};
|
|
257
260
|
}
|
|
258
261
|
|
|
259
262
|
private getBvSize(thVar: number) {
|
|
@@ -261,51 +264,10 @@ export class TheoryBv extends Theory {
|
|
|
261
264
|
return manager.getBvSize(manager.sorts[this.getExpr(thVar)]);
|
|
262
265
|
}
|
|
263
266
|
|
|
264
|
-
private find(thVar: number) {
|
|
265
|
-
let current = thVar;
|
|
266
|
-
while (this.finds[current] !== current) current = this.finds[current];
|
|
267
|
-
return current;
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
private merge(inputFirst: number, inputSecond: number) {
|
|
271
|
-
const firstRoot = this.find(inputFirst);
|
|
272
|
-
const secondRoot = this.find(inputSecond);
|
|
273
|
-
if (firstRoot === secondRoot) return;
|
|
274
|
-
const isSwapped = this.sizes[firstRoot] > this.sizes[secondRoot];
|
|
275
|
-
const joining = isSwapped ? secondRoot : firstRoot;
|
|
276
|
-
const root = isSwapped ? firstRoot : secondRoot;
|
|
277
|
-
this.mergeEh(
|
|
278
|
-
root,
|
|
279
|
-
joining,
|
|
280
|
-
isSwapped ? inputFirst : inputSecond,
|
|
281
|
-
isSwapped ? inputSecond : inputFirst,
|
|
282
|
-
);
|
|
283
|
-
this.finds[joining] = root;
|
|
284
|
-
this.sizes[root] += this.sizes[joining];
|
|
285
|
-
const next = this.nexts[joining];
|
|
286
|
-
this.nexts[joining] = this.nexts[root];
|
|
287
|
-
this.nexts[root] = next;
|
|
288
|
-
this.trail.push(() => {
|
|
289
|
-
this.sizes[root] -= this.sizes[joining];
|
|
290
|
-
this.finds[joining] = joining;
|
|
291
|
-
const restored = this.nexts[joining];
|
|
292
|
-
this.nexts[joining] = this.nexts[root];
|
|
293
|
-
this.nexts[root] = restored;
|
|
294
|
-
this.unmergeEh(root);
|
|
295
|
-
});
|
|
296
|
-
}
|
|
297
|
-
|
|
298
267
|
private mkVar(node: Enode) {
|
|
299
268
|
const thVar = this.varEnodes.length;
|
|
300
269
|
this.varEnodes.push(node);
|
|
301
|
-
this.
|
|
302
|
-
this.sizes.push(1);
|
|
303
|
-
this.nexts.push(thVar);
|
|
304
|
-
this.trail.push(() => {
|
|
305
|
-
this.finds.pop();
|
|
306
|
-
this.sizes.pop();
|
|
307
|
-
this.nexts.pop();
|
|
308
|
-
});
|
|
270
|
+
this.unionFind.mkVar();
|
|
309
271
|
this.bits.push([]);
|
|
310
272
|
this.wpos.push(0);
|
|
311
273
|
this.zeroOneBits.push([]);
|
|
@@ -878,7 +840,7 @@ export class TheoryBv extends Theory {
|
|
|
878
840
|
}
|
|
879
841
|
|
|
880
842
|
newEqEh(first: number, second: number) {
|
|
881
|
-
this.merge(first, second);
|
|
843
|
+
this.unionFind.merge(first, second);
|
|
882
844
|
}
|
|
883
845
|
|
|
884
846
|
newDiseqEh(first: number, second: number) {
|
|
@@ -924,6 +886,7 @@ export class TheoryBv extends Theory {
|
|
|
924
886
|
|
|
925
887
|
private propagateBits() {
|
|
926
888
|
const context = this.context;
|
|
889
|
+
const unionFind = this.unionFind;
|
|
927
890
|
const queue = this.propQueue;
|
|
928
891
|
for (let entry = 0; entry < queue.length; entry += 2) {
|
|
929
892
|
const thVar = queue[entry];
|
|
@@ -933,7 +896,7 @@ export class TheoryBv extends Theory {
|
|
|
933
896
|
const value = context.getAssignment(bit);
|
|
934
897
|
if (value === L_UNDEF) continue;
|
|
935
898
|
const antecedent = value === L_FALSE ? negate(bit) : bit;
|
|
936
|
-
for (let other =
|
|
899
|
+
for (let other = unionFind.next(thVar); other !== thVar; other = unionFind.next(other)) {
|
|
937
900
|
const otherBit = this.bits[other][index];
|
|
938
901
|
if (bit === negate(otherBit)) {
|
|
939
902
|
this.addNewDiseqAxiom(thVar, other, index);
|
|
@@ -984,9 +947,9 @@ export class TheoryBv extends Theory {
|
|
|
984
947
|
if (this.wpos[second] === index) this.findWpos(second);
|
|
985
948
|
const atom = this.atoms[getVar(consequent)];
|
|
986
949
|
if (atom === undefined || !atom.isBit) return;
|
|
987
|
-
const root = this.find(second);
|
|
950
|
+
const root = this.unionFind.find(second);
|
|
988
951
|
for (let occ = atom.occs; occ !== null; occ = occ.next)
|
|
989
|
-
if (isPropagatingClass || this.find(occ.thVar) !== root || occ.index !== index)
|
|
952
|
+
if (isPropagatingClass || this.unionFind.find(occ.thVar) !== root || occ.index !== index)
|
|
990
953
|
this.propQueue.push(occ.thVar, occ.index);
|
|
991
954
|
}
|
|
992
955
|
|
|
@@ -1145,7 +1108,7 @@ export class TheoryBv extends Theory {
|
|
|
1145
1108
|
private unmergeEh(root: number) {
|
|
1146
1109
|
const bits = this.zeroOneBits[root];
|
|
1147
1110
|
for (let index = bits.length - 1; index >= 0; index--)
|
|
1148
|
-
if (this.find(bits[index].owner) === root) {
|
|
1111
|
+
if (this.unionFind.find(bits[index].owner) === root) {
|
|
1149
1112
|
bits.length = index + 1;
|
|
1150
1113
|
return;
|
|
1151
1114
|
}
|