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
package/src/cli/tlapm.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { spawnSync } from "node:child_process";
|
|
|
2
2
|
import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, writeFileSync } from "node:fs";
|
|
3
3
|
import { dirname, join } from "node:path";
|
|
4
4
|
import { availableParallelism } from "node:os";
|
|
5
|
-
import { TlaProofError } from "../errors";
|
|
5
|
+
import { TlaProofError, TlaProverError } from "../errors";
|
|
6
6
|
import { EXIT_STATUS } from "../exit-codes";
|
|
7
7
|
import type { LineRange } from "../obligations/generate";
|
|
8
8
|
import { getAtPrefix, getLocusText, type ObligationWarning } from "../obligations/expression";
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
} from "../obligations";
|
|
16
16
|
import { format, renderDoc } from "../obligations/format";
|
|
17
17
|
import { printSequent, type PrinterOptions } from "../obligations/printer";
|
|
18
|
-
import { parseDefaultMethods } from "../prover/prep/methods";
|
|
18
|
+
import { parseDefaultMethods, parseOcamlFloat, parseOcamlInt } from "../prover/prep/methods";
|
|
19
19
|
import {
|
|
20
20
|
encodeProofTheory,
|
|
21
21
|
formatNormalized,
|
|
@@ -39,7 +39,186 @@ import { formatTlcDate } from "../tlc/messages";
|
|
|
39
39
|
import { TLAPM_COMMAND, USAGE, type ParsedArgs } from "./options";
|
|
40
40
|
import { getInputPaths } from "./shared";
|
|
41
41
|
|
|
42
|
-
|
|
42
|
+
interface TlapmArgument {
|
|
43
|
+
name: string;
|
|
44
|
+
values: ("int" | "float" | "string")[];
|
|
45
|
+
doc: string;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const BLANK_ARGUMENT: TlapmArgument = { name: "", values: [], doc: " " };
|
|
49
|
+
|
|
50
|
+
// The option list of tlapm_args.ml's init.
|
|
51
|
+
const TLAPM_ARGUMENTS: TlapmArgument[] = [
|
|
52
|
+
BLANK_ARGUMENT,
|
|
53
|
+
{ name: "(basic options)", values: [], doc: " " },
|
|
54
|
+
BLANK_ARGUMENT,
|
|
55
|
+
{ name: "--help", values: [], doc: " show this help message and exit" },
|
|
56
|
+
{ name: "-help", values: [], doc: " (same as --help)" },
|
|
57
|
+
{ name: "--version", values: [], doc: " show version number and exit" },
|
|
58
|
+
{ name: "--verbose", values: [], doc: " produce verbose messages" },
|
|
59
|
+
{ name: "-v", values: [], doc: " (same as --verbose)" },
|
|
60
|
+
BLANK_ARGUMENT,
|
|
61
|
+
{ name: "--where", values: [], doc: " show location of standard library and exit" },
|
|
62
|
+
{ name: "--config", values: [], doc: " show configuration and exit" },
|
|
63
|
+
{ name: "--summary", values: [], doc: " show summary of theorems (implies -N and not -C)" },
|
|
64
|
+
{
|
|
65
|
+
name: "--strict",
|
|
66
|
+
values: [],
|
|
67
|
+
doc: " report incomplete proofs, empty proof targets and failed obligations as errors and exit with a non-zero status",
|
|
68
|
+
},
|
|
69
|
+
{ name: "--timing", values: [], doc: " show runtime statistics" },
|
|
70
|
+
BLANK_ARGUMENT,
|
|
71
|
+
{ name: "-I", values: ["string"], doc: "<dir> add <dir> to search path" },
|
|
72
|
+
{ name: "-d", values: ["string"], doc: "" },
|
|
73
|
+
BLANK_ARGUMENT,
|
|
74
|
+
{ name: "-k", values: [], doc: " keep going on backend failures" },
|
|
75
|
+
{ name: "-N", values: [], doc: " do not run any backend verifiers" },
|
|
76
|
+
{ name: "-C", values: [], doc: " check proofs in Isabelle/TLA+" },
|
|
77
|
+
BLANK_ARGUMENT,
|
|
78
|
+
{ name: "--threads", values: ["int"], doc: "<int> set number of worker threads to <int>" },
|
|
79
|
+
{
|
|
80
|
+
name: "--method",
|
|
81
|
+
values: ["string"],
|
|
82
|
+
doc: "<meth> set default method to <meth> (try --method help)",
|
|
83
|
+
},
|
|
84
|
+
{ name: "--solver", values: ["string"], doc: "<solver> set SMT solver to <solver>" },
|
|
85
|
+
{ name: "--smt-logic", values: ["string"], doc: "<logic> set SMT logic to <logic>" },
|
|
86
|
+
{ name: "--stretch", values: ["float"], doc: "<f> multiply all timeouts by <f>" },
|
|
87
|
+
{ name: "--fast-isabelle", values: [], doc: "" },
|
|
88
|
+
BLANK_ARGUMENT,
|
|
89
|
+
{ name: "(advanced options)", values: [], doc: " " },
|
|
90
|
+
BLANK_ARGUMENT,
|
|
91
|
+
{ name: "--noflatten", values: [], doc: " do not flatten obligations" },
|
|
92
|
+
{ name: "--nonormal", values: [], doc: " do not normalize obligations before printing" },
|
|
93
|
+
{ name: "--debug", values: ["string"], doc: "{[-]<flag>} enable/disable debugging flags" },
|
|
94
|
+
{ name: "--paranoid", values: [], doc: "" },
|
|
95
|
+
{ name: "--isaprove", values: [], doc: "" },
|
|
96
|
+
BLANK_ARGUMENT,
|
|
97
|
+
{ name: "--toolbox", values: ["int", "int"], doc: "<int><int> toolbox mode" },
|
|
98
|
+
{
|
|
99
|
+
name: "--toolbox-vsn",
|
|
100
|
+
values: ["int"],
|
|
101
|
+
doc: "<int> Toolbox protocol version, 1|2, 1 by default.",
|
|
102
|
+
},
|
|
103
|
+
{ name: "--line", values: ["int"], doc: "<int> line to prove" },
|
|
104
|
+
{
|
|
105
|
+
name: "--wait",
|
|
106
|
+
values: ["int"],
|
|
107
|
+
doc: "<time> wait for <time> before printing obligations in progress",
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
name: "--stdin",
|
|
111
|
+
values: [],
|
|
112
|
+
doc: " read the tla file from stdin instead of file system. Only applies if single tla file is provided as input.",
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
name: "--prefer-stdlib",
|
|
116
|
+
values: [],
|
|
117
|
+
doc: " prefer built-in standard modules if the module search path contains files with the same names as modules in stdlib.",
|
|
118
|
+
},
|
|
119
|
+
{
|
|
120
|
+
name: "--parser",
|
|
121
|
+
values: ["string"],
|
|
122
|
+
doc: " Set parser backend to use: TLAPM (default) or SANY.",
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
name: "--module-jar",
|
|
126
|
+
values: ["string"],
|
|
127
|
+
doc: " Add a path to a .jar file containing additional TLA+ modules, such\n as the community modules. Multiple .jar files can be added by using\n this option multiple times.",
|
|
128
|
+
},
|
|
129
|
+
{ name: "--noproving", values: [], doc: " do not prove, report fingerprinted results only" },
|
|
130
|
+
BLANK_ARGUMENT,
|
|
131
|
+
{ name: "--printallobs", values: [], doc: " print obligations in all toolbox messages" },
|
|
132
|
+
BLANK_ARGUMENT,
|
|
133
|
+
{ name: "--fpdir", values: ["string"], doc: "" },
|
|
134
|
+
{ name: "--safefp", values: [], doc: " check tlapm, zenon, Isabelle versions for fingerprints" },
|
|
135
|
+
{
|
|
136
|
+
name: "--nofp",
|
|
137
|
+
values: [],
|
|
138
|
+
doc: " do not use existing fingerprints, but overwrite any preexisting fingerprints associated with the current proof obligations, using the newly computed fingerprints and results",
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
name: "--nofpl",
|
|
142
|
+
values: ["int", "int"],
|
|
143
|
+
doc: "<int><int> disable fingerprint use between given lines",
|
|
144
|
+
},
|
|
145
|
+
{ name: "--cleanfp", values: [], doc: " erase fingerprint file before starting" },
|
|
146
|
+
BLANK_ARGUMENT,
|
|
147
|
+
{
|
|
148
|
+
name: "--erasefp",
|
|
149
|
+
values: ["string", "string"],
|
|
150
|
+
doc: "<f><back> erase from file <f> all results of backend <back>",
|
|
151
|
+
},
|
|
152
|
+
{
|
|
153
|
+
name: "--printfp",
|
|
154
|
+
values: ["string"],
|
|
155
|
+
doc: "<f> print the fingerprints stored in file <f> and quit",
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
name: "--usefp",
|
|
159
|
+
values: ["string"],
|
|
160
|
+
doc: "<f> load fingerprints from file <f> (save as usual)",
|
|
161
|
+
},
|
|
162
|
+
{ name: "--fpp", values: [], doc: " print the fingerprints of obligations in toolbox messages" },
|
|
163
|
+
{
|
|
164
|
+
name: "--cache-dir",
|
|
165
|
+
values: ["string"],
|
|
166
|
+
doc: '<directory> save auxiliary and temporary files under <directory>. Alternatively, this directory can be defined via the variable `TLAPM_CACHE_DIR` of the runtime environment. The command-line parameter takes precedence over the environment variable. If neither is specified, the default value is ".tlacache".',
|
|
167
|
+
},
|
|
168
|
+
];
|
|
169
|
+
|
|
170
|
+
const getMetavariableLength = (doc: string) => /^[^ ]* */.exec(doc)?.[0].length ?? 0;
|
|
171
|
+
|
|
172
|
+
// OCaml's Arg.align and Arg.usage_string.
|
|
173
|
+
const getArgumentUsage = () => {
|
|
174
|
+
const width = Math.max(
|
|
175
|
+
...TLAPM_ARGUMENTS.map(
|
|
176
|
+
(argument) => argument.name.length + getMetavariableLength(argument.doc),
|
|
177
|
+
),
|
|
178
|
+
);
|
|
179
|
+
return `Usage: tla-ts tlapm <options> FILE ...\noptions are:\n${TLAPM_ARGUMENTS.filter(
|
|
180
|
+
(argument) => argument.doc !== "",
|
|
181
|
+
)
|
|
182
|
+
.map((argument) => {
|
|
183
|
+
const cut = getMetavariableLength(argument.doc);
|
|
184
|
+
return ` ${argument.name} ${argument.doc.slice(0, cut)}${" ".repeat(width - argument.name.length - cut)}${argument.doc.slice(cut)}\n`;
|
|
185
|
+
})
|
|
186
|
+
.join("")}`;
|
|
187
|
+
};
|
|
188
|
+
|
|
189
|
+
// OCaml's Arg.parse_argv: the first argument it rejects, with the Arg.Bad of tlapm_args.ml's setters.
|
|
190
|
+
const getArgumentError = (args: string[]) => {
|
|
191
|
+
for (let index = 0; index < args.length; index++) {
|
|
192
|
+
const name = args[index];
|
|
193
|
+
if (name === "--version") return undefined;
|
|
194
|
+
if (!name.startsWith("-")) continue;
|
|
195
|
+
const argument = TLAPM_ARGUMENTS.find((innerArgument) => innerArgument.name === name);
|
|
196
|
+
if (!argument) return `unknown option '${name}'`;
|
|
197
|
+
for (const kind of argument.values) {
|
|
198
|
+
index++;
|
|
199
|
+
if (index === args.length) return `option '${name}' needs an argument`;
|
|
200
|
+
const value = args[index];
|
|
201
|
+
if (kind === "int" && parseOcamlInt(value) === undefined)
|
|
202
|
+
return `wrong argument '${value}'; option '${name}' expects an integer`;
|
|
203
|
+
if (kind === "float" && parseOcamlFloat(value) === undefined)
|
|
204
|
+
return `wrong argument '${value}'; option '${name}' expects a float`;
|
|
205
|
+
}
|
|
206
|
+
const value = args[index];
|
|
207
|
+
if (name === "--threads" && (parseOcamlInt(value) ?? 0) < 0)
|
|
208
|
+
return "--threads requires a positive argument";
|
|
209
|
+
if (name === "--debug" && value.split(",").includes("oldsmt"))
|
|
210
|
+
return "--debug oldsmt: the old SMT encoding has been removed";
|
|
211
|
+
if (name === "--method") {
|
|
212
|
+
try {
|
|
213
|
+
parseDefaultMethods(value);
|
|
214
|
+
} catch (error) {
|
|
215
|
+
if (!(error instanceof TlaProverError)) throw error;
|
|
216
|
+
return error.message;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
return undefined;
|
|
221
|
+
};
|
|
43
222
|
|
|
44
223
|
const getLibraryDirectories = (parsed: ParsedArgs) => [
|
|
45
224
|
".",
|
|
@@ -93,6 +272,8 @@ const checkStrictly = (module: ModuleObligations, isTargeted: boolean, isSummary
|
|
|
93
272
|
|
|
94
273
|
const TLAPM_FAILURE_STATUS = 3;
|
|
95
274
|
|
|
275
|
+
const TLAPM_USAGE_STATUS = 2;
|
|
276
|
+
|
|
96
277
|
const UNPROVED_ENDING = [
|
|
97
278
|
' tlapm ending abnormally with Failure("backend errors: there are unproved obligations")',
|
|
98
279
|
'Raised at Stdlib.failwith in file "stdlib.ml", line 29, characters 17-33',
|
|
@@ -130,17 +311,18 @@ const reportAbnormalEnding = (
|
|
|
130
311
|
);
|
|
131
312
|
};
|
|
132
313
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
)
|
|
137
|
-
|
|
314
|
+
type Outcome<Value> = { kind: "done"; value: Value } | { kind: "aborted"; error: TlaProofError };
|
|
315
|
+
|
|
316
|
+
const getAbortedOutcome = (error: unknown): Outcome<never> => {
|
|
317
|
+
if (!(error instanceof TlaProofError)) throw error;
|
|
318
|
+
return { kind: "aborted", error };
|
|
319
|
+
};
|
|
320
|
+
|
|
321
|
+
const generateObligations = (generate: () => ModuleObligations[]): Outcome<ModuleObligations[]> => {
|
|
138
322
|
try {
|
|
139
|
-
return generate(
|
|
323
|
+
return { kind: "done", value: generate() };
|
|
140
324
|
} catch (error) {
|
|
141
|
-
|
|
142
|
-
reportAbnormalEnding(error, errorSetting, isToolbox);
|
|
143
|
-
return undefined;
|
|
325
|
+
return getAbortedOutcome(error);
|
|
144
326
|
}
|
|
145
327
|
};
|
|
146
328
|
|
|
@@ -162,8 +344,15 @@ const printAttempt = (
|
|
|
162
344
|
const reason = getFailureReason(attempt);
|
|
163
345
|
const isProved = isProvedAttempt(attempt);
|
|
164
346
|
const isReused = attempt.kind === "reused";
|
|
165
|
-
const note =
|
|
166
|
-
|
|
347
|
+
const note =
|
|
348
|
+
attempt.kind === "decided"
|
|
349
|
+
? attempt.note
|
|
350
|
+
: attempt.kind === "refused"
|
|
351
|
+
? `${attempt.reason}\nObligation:\n\n`
|
|
352
|
+
: attempt.kind === "unavailable"
|
|
353
|
+
? `\n\\* ${attempt.warning}\n`
|
|
354
|
+
: undefined;
|
|
355
|
+
const shipped = attempt.kind === "unavailable" || isReused ? attempt.shipped : undefined;
|
|
167
356
|
printObligationMessage(obligation, isProved ? "proved" : "failed", [
|
|
168
357
|
`prover:${attempt.method.prover}`,
|
|
169
358
|
...(method === "" ? [] : [`meth:${method}`]),
|
|
@@ -262,19 +451,21 @@ const proveModule = async (
|
|
|
262
451
|
report.attempts.forEach((attempt) => {
|
|
263
452
|
if (attempt.kind === "decided" && attempt.errorOutput !== undefined)
|
|
264
453
|
process.stdout.write(attempt.errorOutput);
|
|
265
|
-
if (attempt.kind === "
|
|
266
|
-
process.stderr.write(`${attempt.warning}\n`);
|
|
454
|
+
if (attempt.kind === "unavailable") process.stderr.write(`${attempt.warning}\n`);
|
|
267
455
|
});
|
|
268
456
|
report.warnings.forEach((warning) => printWarning(warning, settings.isToolbox));
|
|
269
457
|
if (!settings.isToolbox) return;
|
|
270
|
-
if (report.obligation.status === "trivial")
|
|
271
|
-
return printObligationMessage(obligation, "trivial", ["prover:tlapm", "already:false"]);
|
|
272
458
|
if (obligation.kind.kind === "Error") return printFailedObligation(obligation, "user error");
|
|
273
459
|
report.attempts.forEach((attempt) => printAttempt(obligation, attempt, settings.printing));
|
|
460
|
+
if (report.obligation.status === "trivial")
|
|
461
|
+
printObligationMessage(obligation, "trivial", ["prover:tlapm", "already:false"]);
|
|
274
462
|
},
|
|
275
463
|
});
|
|
276
464
|
const theoryPath = `${directory}/${module.name}.thy`;
|
|
277
|
-
writeFileSync(
|
|
465
|
+
writeFileSync(
|
|
466
|
+
theoryPath,
|
|
467
|
+
encodeProofTheory(module.name, reports, module.obligations, settings.backends.isFlattened),
|
|
468
|
+
);
|
|
278
469
|
console.log(`(* created new ${JSON.stringify(theoryPath)} *)`);
|
|
279
470
|
knownResults.save(fingerprintsPath);
|
|
280
471
|
console.log(`(* fingerprints written in ${JSON.stringify(fingerprintsPath)} *)`);
|
|
@@ -344,6 +535,15 @@ export const runTlapm = async (args: string[]) => {
|
|
|
344
535
|
isTyped && rewriteFlags.length > 0
|
|
345
536
|
? `smarter_types with --debug ${rewriteFlags.at(-1)}`
|
|
346
537
|
: [...debugFlags].find((flag) => !DEBUG_FLAGS.has(flag));
|
|
538
|
+
const argumentError = getArgumentError(args);
|
|
539
|
+
if (argumentError !== undefined) {
|
|
540
|
+
console.error(`tla-ts tlapm: ${argumentError}.\n${getArgumentUsage()}`);
|
|
541
|
+
return TLAPM_USAGE_STATUS;
|
|
542
|
+
}
|
|
543
|
+
if (parsed.has("--version")) {
|
|
544
|
+
console.log(TLAPM_VERSION);
|
|
545
|
+
return EXIT_STATUS.success;
|
|
546
|
+
}
|
|
347
547
|
const unsupported =
|
|
348
548
|
parsed.unknown[0] ??
|
|
349
549
|
(isProcessing && parsed.has("--printallobs") ? "--printallobs" : undefined) ??
|
|
@@ -352,27 +552,6 @@ export const runTlapm = async (args: string[]) => {
|
|
|
352
552
|
console.error(`Error: tla-ts tlapm does not support the tlapm option ${unsupported}.`);
|
|
353
553
|
return 1;
|
|
354
554
|
}
|
|
355
|
-
if (parsed.incomplete) {
|
|
356
|
-
console.error(`Error: option '${parsed.incomplete.name}' needs an argument.`);
|
|
357
|
-
return 1;
|
|
358
|
-
}
|
|
359
|
-
const nonInteger = parsed.options.find(
|
|
360
|
-
(option) =>
|
|
361
|
-
TLAPM_INTEGER_OPTIONS.has(option.name) &&
|
|
362
|
-
option.values.some((value) => !/^-?\d+$/.test(value)),
|
|
363
|
-
);
|
|
364
|
-
if (nonInteger) {
|
|
365
|
-
console.error(`Error: option '${nonInteger.name}' expects an integer.`);
|
|
366
|
-
return 1;
|
|
367
|
-
}
|
|
368
|
-
if (parsed.get("--stretch")?.some((value) => Number.isNaN(Number(value)))) {
|
|
369
|
-
console.error("Error: option '--stretch' expects a float.");
|
|
370
|
-
return 1;
|
|
371
|
-
}
|
|
372
|
-
if (parsed.has("--version")) {
|
|
373
|
-
console.log(TLAPM_VERSION);
|
|
374
|
-
return EXIT_STATUS.success;
|
|
375
|
-
}
|
|
376
555
|
const files = getInputPaths(parsed.positionals).map((input) => input.path);
|
|
377
556
|
const modulePaths = files.map((path) => (path.endsWith(".tla") ? path : `${path}.tla`));
|
|
378
557
|
if (modulePaths.length === 0) {
|
|
@@ -386,7 +565,7 @@ export const runTlapm = async (args: string[]) => {
|
|
|
386
565
|
);
|
|
387
566
|
}
|
|
388
567
|
const lines = parsed.options.reduce<LineRange>((range, option) => {
|
|
389
|
-
const [start, end] = option.values.map(
|
|
568
|
+
const [start, end] = option.values.map((value) => parseOcamlInt(value) ?? 0);
|
|
390
569
|
if (option.name === "--toolbox") return { start, end: end === 0 ? Infinity : end };
|
|
391
570
|
if (option.name === "--line") return start === 0 ? WHOLE_MODULE : { start, end: start };
|
|
392
571
|
return range;
|
|
@@ -396,7 +575,8 @@ export const runTlapm = async (args: string[]) => {
|
|
|
396
575
|
getLibraryDirectories(parsed),
|
|
397
576
|
);
|
|
398
577
|
const moduleNames = new Set<string>();
|
|
399
|
-
const
|
|
578
|
+
const errorSettings: ObligationWarning[] = [];
|
|
579
|
+
const generation = generateObligations(() => {
|
|
400
580
|
const missingIndex = modulePaths.findIndex((path) => !existsSync(path));
|
|
401
581
|
if (missingIndex !== -1) {
|
|
402
582
|
const missing = files[missingIndex];
|
|
@@ -416,25 +596,40 @@ export const runTlapm = async (args: string[]) => {
|
|
|
416
596
|
lines,
|
|
417
597
|
printing,
|
|
418
598
|
onWarning: (warning) => {
|
|
419
|
-
if (warning.channel === "error")
|
|
420
|
-
|
|
421
|
-
errorSetting.message = `${warning.text}\n\n${errorSetting.message}`;
|
|
422
|
-
return;
|
|
423
|
-
}
|
|
424
|
-
printWarning(warning, isToolbox);
|
|
599
|
+
if (warning.channel === "error") errorSettings.push(warning);
|
|
600
|
+
else printWarning(warning, isToolbox);
|
|
425
601
|
},
|
|
426
602
|
},
|
|
427
603
|
);
|
|
428
|
-
}
|
|
429
|
-
if (
|
|
604
|
+
});
|
|
605
|
+
if (generation.kind === "aborted") {
|
|
606
|
+
const lastLocus = errorSettings.at(-1)?.locus;
|
|
607
|
+
// Errors.set keeps the last location and puts each message before the earlier ones.
|
|
608
|
+
reportAbnormalEnding(
|
|
609
|
+
generation.error,
|
|
610
|
+
{
|
|
611
|
+
location: lastLocus && getLocusText(lastLocus),
|
|
612
|
+
message: errorSettings
|
|
613
|
+
.toReversed()
|
|
614
|
+
.map((setting) => `${setting.text}\n\n`)
|
|
615
|
+
.join(""),
|
|
616
|
+
},
|
|
617
|
+
isToolbox,
|
|
618
|
+
);
|
|
619
|
+
return TLAPM_FAILURE_STATUS;
|
|
620
|
+
}
|
|
621
|
+
const modules = generation.value;
|
|
430
622
|
const cacheDirectory =
|
|
431
623
|
parsed.get("--cache-dir")?.[0] ?? process.env.TLAPM_CACHE_DIR ?? ".tlacache";
|
|
432
|
-
const forgottenLines = parsed.get("--nofpl")?.map(
|
|
624
|
+
const forgottenLines = parsed.get("--nofpl")?.map((value) => parseOcamlInt(value) ?? 0) ?? [0, 0];
|
|
433
625
|
const methods = parsed.get("--method")?.[0];
|
|
434
626
|
const settings: ProvingSettings = {
|
|
435
627
|
isToolbox,
|
|
436
628
|
isProving: !parsed.has("--noproving"),
|
|
437
|
-
workers: Math.max(
|
|
629
|
+
workers: Math.max(
|
|
630
|
+
1,
|
|
631
|
+
parseOcamlInt(parsed.get("--threads")?.[0] ?? "") ?? availableParallelism(),
|
|
632
|
+
),
|
|
438
633
|
isFingerprinted: (obligation) =>
|
|
439
634
|
!parsed.has("--nofp") &&
|
|
440
635
|
!(
|
|
@@ -445,8 +640,10 @@ export const runTlapm = async (args: string[]) => {
|
|
|
445
640
|
fingerprints: new Map(),
|
|
446
641
|
backends: {
|
|
447
642
|
defaultMethods: methods === undefined ? undefined : parseDefaultMethods(methods),
|
|
448
|
-
stretch:
|
|
449
|
-
isFlattened:
|
|
643
|
+
stretch: parseOcamlFloat(parsed.get("--stretch")?.[0] ?? "1") ?? 1,
|
|
644
|
+
isFlattened:
|
|
645
|
+
!parsed.has("--noflatten") &&
|
|
646
|
+
["yes", "true", undefined].includes(process.env.TLAPM_FLATTEN),
|
|
450
647
|
smtLogic: debugFlags.has("disable_arithmetic")
|
|
451
648
|
? "UF"
|
|
452
649
|
: (parsed.get("--smt-logic")?.[0] ?? "UFNIA"),
|
|
@@ -501,26 +698,22 @@ export const runTlapm = async (args: string[]) => {
|
|
|
501
698
|
(name) => `${name}.tla`,
|
|
502
699
|
),
|
|
503
700
|
);
|
|
504
|
-
const
|
|
505
|
-
(
|
|
506
|
-
|
|
507
|
-
return error;
|
|
508
|
-
},
|
|
701
|
+
const proving = await proveModule(module, directory, fingerprintsPath, settings).then(
|
|
702
|
+
(isFailed): Outcome<boolean> => ({ kind: "done", value: isFailed }),
|
|
703
|
+
getAbortedOutcome,
|
|
509
704
|
);
|
|
510
|
-
if (
|
|
511
|
-
|
|
705
|
+
if (proving.kind === "aborted") {
|
|
706
|
+
const error = proving.error;
|
|
707
|
+
console.error(`${getAtPrefix(error.locus)}Error: ${error.message}`);
|
|
512
708
|
reportAbnormalEnding(
|
|
513
|
-
|
|
514
|
-
{
|
|
515
|
-
location: isFailed.locus && getLocusText(isFailed.locus),
|
|
516
|
-
message: isFailed.message,
|
|
517
|
-
},
|
|
709
|
+
error,
|
|
710
|
+
{ location: error.locus && getLocusText(error.locus), message: error.message },
|
|
518
711
|
isToolbox,
|
|
519
712
|
);
|
|
520
713
|
return TLAPM_FAILURE_STATUS;
|
|
521
714
|
}
|
|
522
|
-
if (
|
|
523
|
-
if (
|
|
715
|
+
if (proving.value && parsed.has("--strict")) statuses.push(STRICT_EXIT_STATUS.failed);
|
|
716
|
+
if (proving.value && !parsed.has("--strict") && !isToolbox) {
|
|
524
717
|
console.error(UNPROVED_ENDING);
|
|
525
718
|
return TLAPM_FAILURE_STATUS;
|
|
526
719
|
}
|
package/src/dependencies.ts
CHANGED
|
@@ -28,6 +28,7 @@ const READS_IMPURE = 16;
|
|
|
28
28
|
const VARIABLE_LEVEL_FLAGS = 32;
|
|
29
29
|
const ACTION_LEVEL_FLAGS = VARIABLE_LEVEL_FLAGS | 64;
|
|
30
30
|
const TEMPORAL_LEVEL_FLAGS = ACTION_LEVEL_FLAGS | 128;
|
|
31
|
+
const RANDOM = 256;
|
|
31
32
|
|
|
32
33
|
const ACTION_KINDS = new Set<Expression["kind"]>([
|
|
33
34
|
"Prime",
|
|
@@ -65,6 +66,13 @@ const IMPURE_BUILTINS = new Set([
|
|
|
65
66
|
|
|
66
67
|
const STREAMED_BUILTINS = new Set(["UNION", "\\cup"]);
|
|
67
68
|
|
|
69
|
+
const RANDOM_BUILTINS = new Set([
|
|
70
|
+
"RandomSubset",
|
|
71
|
+
"RandomSetOfSubsets",
|
|
72
|
+
"TestRandomSetOfSubsets",
|
|
73
|
+
"RandomSubsetSet",
|
|
74
|
+
]);
|
|
75
|
+
|
|
68
76
|
const isImpureBuiltin = (name: string, environment: DefinitionNames) =>
|
|
69
77
|
IMPURE_BUILTINS.has(name) || environment.builtins.get(name)?.isStateLevel === true;
|
|
70
78
|
|
|
@@ -133,6 +141,7 @@ const collectLocalFacts = (
|
|
|
133
141
|
row[0] |= IMPURE | (name === "Assert" ? 0 : REPEATED_EFFECT);
|
|
134
142
|
}
|
|
135
143
|
if (STREAMED_BUILTINS.has(name)) row[0] |= STREAMED;
|
|
144
|
+
if (RANDOM_BUILTINS.has(name)) row[0] |= RANDOM;
|
|
136
145
|
if (!isOverridden && isImpureBuiltin(target, environment)) row[0] |= READS_IMPURE;
|
|
137
146
|
const builtin = environment.builtins.get(target);
|
|
138
147
|
if (
|
|
@@ -219,7 +228,7 @@ const closeRows = (local: Uint32Array, words: number, edges: Int32Array[], mask:
|
|
|
219
228
|
return closed;
|
|
220
229
|
};
|
|
221
230
|
|
|
222
|
-
const PURITY_MASK = IMPURE | REPEATED_EFFECT | STREAMED;
|
|
231
|
+
const PURITY_MASK = IMPURE | REPEATED_EFFECT | STREAMED | RANDOM;
|
|
223
232
|
const READ_MASK = NONCONSTANT | READS_IMPURE;
|
|
224
233
|
|
|
225
234
|
const isEvaluatedOnce = (definition: Definition, flags: number) =>
|
|
@@ -293,7 +302,19 @@ const getExpressionsRow = (expressions: Expression[], environment: Environment)
|
|
|
293
302
|
export const isConstantLevel = (definition: Definition, environment: Environment) =>
|
|
294
303
|
(getRow(definition, environment)[0] & NONCONSTANT) === 0;
|
|
295
304
|
|
|
296
|
-
const EFFECT_FLAGS = {
|
|
305
|
+
const EFFECT_FLAGS = {
|
|
306
|
+
any: IMPURE,
|
|
307
|
+
repeated: REPEATED_EFFECT,
|
|
308
|
+
streamed: STREAMED,
|
|
309
|
+
// What a second evaluation shows: output again, or other random draws.
|
|
310
|
+
replayed: REPEATED_EFFECT | RANDOM,
|
|
311
|
+
};
|
|
312
|
+
|
|
313
|
+
export const isExpressionImpure = (
|
|
314
|
+
expressions: Expression[],
|
|
315
|
+
environment: Environment,
|
|
316
|
+
effect: keyof typeof EFFECT_FLAGS,
|
|
317
|
+
) => (getExpressionsRow(expressions, environment)[0] & EFFECT_FLAGS[effect]) !== 0;
|
|
297
318
|
|
|
298
319
|
export const isImpureDefinition = (
|
|
299
320
|
definition: Definition,
|
package/src/errors.ts
CHANGED
|
@@ -28,7 +28,7 @@ export interface SyntaxFailure {
|
|
|
28
28
|
line: number;
|
|
29
29
|
column: number;
|
|
30
30
|
isEnd: boolean;
|
|
31
|
-
proof?: { stop: { line: number; column: number }; exception: string };
|
|
31
|
+
proof?: { stop: { line: number; column: number }; exception: string; printed: string };
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
export interface SanyError {
|
package/src/exit-codes.ts
CHANGED
|
@@ -76,6 +76,7 @@ export const withLivenessExitCode = (
|
|
|
76
76
|
return (
|
|
77
77
|
checker && {
|
|
78
78
|
branches: checker.branches,
|
|
79
|
+
solutions: checker.solutions,
|
|
79
80
|
addInitialState: (index, state, tracing) =>
|
|
80
81
|
withErrorExitCode(() => checker.addInitialState(index, state, tracing)),
|
|
81
82
|
addState: (index, state, successors, tracing) =>
|