tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.63a6693bd
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 +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +40 -40
- package/dist/index.cjs +1 -1
- 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 +54 -54
- package/dist/prove.js +52 -52
- package/dist/run.cjs +42 -42
- package/dist/run.js +44 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +39 -39
- package/dist/transfer.js +41 -41
- package/dist/worker.cjs +4 -4
- package/dist/worker.js +4 -4
- package/package.json +1 -1
- package/src/ast.ts +44 -39
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +152 -518
- package/src/cli/options.ts +6 -31
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +14 -13
- package/src/cli/tlc-arguments.ts +222 -210
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +1 -1
- package/src/cli/tlc.ts +34 -701
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +8 -13
- package/src/dfid.ts +16 -16
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +45 -333
- package/src/errors.ts +3 -2
- package/src/evaluate.ts +5 -4
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/json.ts +4 -7
- package/src/levels.ts +39 -42
- package/src/liveness-checker.ts +24 -37
- package/src/liveness.ts +47 -54
- package/src/obligations/action.ts +4 -11
- package/src/obligations/anonymize.ts +4 -2
- package/src/obligations/expression.ts +18 -2
- package/src/obligations/generate.ts +45 -38
- package/src/obligations/index.ts +2 -2
- package/src/obligations/module.ts +27 -38
- package/src/obligations/normalize.ts +2 -1
- package/src/obligations/simplify.ts +39 -44
- package/src/obligations/source.ts +47 -57
- package/src/obligations/temporal.ts +5 -5
- package/src/parallel-worker.ts +10 -30
- package/src/parallel.ts +22 -45
- package/src/parser.ts +19 -34
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +3 -3
- package/src/prover/isabelle/encode.ts +1 -1
- package/src/prover/isabelle/isar/inner-syntax.ts +9 -4
- package/src/prover/isabelle/isar/method.ts +14 -25
- package/src/prover/isabelle/isar/theory.ts +11 -10
- package/src/prover/isabelle/isar/type-check.ts +6 -6
- package/src/prover/isabelle/provers/blast/blast.ts +7 -63
- package/src/prover/isabelle/provers/hypsubst.ts +17 -26
- package/src/prover/isabelle/pure/bicompose.ts +9 -25
- package/src/prover/isabelle/pure/conv.ts +2 -8
- package/src/prover/isabelle/pure/drule.ts +9 -2
- package/src/prover/isabelle/pure/logic.ts +1 -1
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -13
- package/src/prover/isabelle/pure/rewriter.ts +5 -9
- package/src/prover/isabelle/pure/table.ts +2 -1
- package/src/prover/isabelle/pure/tactical.ts +42 -35
- package/src/prover/isabelle/pure/thm.ts +14 -11
- package/src/prover/isabelle/tla/classical-setup.ts +17 -14
- package/src/prover/isabelle/tla/context.ts +7 -2
- package/src/prover/isabelle/tla/logic.ts +10 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -10
- package/src/prover/prep/action.ts +11 -19
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +24 -3
- package/src/prover/prove.ts +87 -64
- package/src/prover/smt/context.ts +1 -2
- package/src/prover/smt/data.ts +418 -406
- package/src/prover/smt/encode.ts +30 -18
- package/src/prover/smt/rewrite.ts +657 -626
- package/src/prover/smt/solver/ast.ts +0 -22
- package/src/prover/smt/solver/auf-solver.ts +2 -5
- package/src/prover/smt/solver/context.ts +3 -3
- package/src/prover/smt/solver/e-matching.ts +1 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -1
- package/src/prover/smt/solver/internalizer.ts +1 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -8
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -1
- package/src/prover/smt/solver/lp/nla-core.ts +2 -6
- package/src/prover/smt/solver/mam-compiler.ts +4 -2
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-finder.ts +12 -17
- package/src/prover/smt/solver/model-macro-solver.ts +11 -19
- package/src/prover/smt/solver/nlsat/algebraic.ts +9 -9
- package/src/prover/smt/solver/nlsat/atoms.ts +20 -4
- package/src/prover/smt/solver/nlsat/explain.ts +7 -22
- package/src/prover/smt/solver/nlsat/levelwise.ts +1 -6
- package/src/prover/smt/solver/nlsat/polynomial.ts +12 -3
- package/src/prover/smt/solver/nlsat/solver.ts +12 -24
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -1
- package/src/prover/smt/solver/proto-model.ts +0 -4
- package/src/prover/smt/solver/quantifier-analyzer.ts +10 -10
- package/src/prover/smt/solver/quantifier-manager.ts +1 -5
- package/src/prover/smt/solver/smtlib-parser.ts +78 -94
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -2
- package/src/prover/smt/solver/theory-lra-internalize.ts +5 -16
- package/src/prover/tlapm/cache.ts +28 -18
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/verdict.ts +7 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/eqrel.ts +2 -0
- package/src/prover/zenon/expr.ts +7 -0
- package/src/prover/zenon/index-table.ts +9 -19
- package/src/prover/zenon/isar.ts +35 -35
- package/src/prover/zenon/llproof.ts +2 -11
- package/src/prover/zenon/mltoll.ts +12 -28
- package/src/prover/zenon/parse.ts +3 -6
- package/src/prover/zenon/search.ts +4 -14
- package/src/prover/zenon/tla/functions.ts +2 -2
- package/src/prover/zenon/tla/llproof.ts +9 -11
- package/src/prover/zenon/tla/records.ts +1 -6
- package/src/prover/zenon/tla/sets.ts +15 -14
- package/src/prover/zenon/tla/tla.ts +7 -6
- package/src/resolve.ts +55 -72
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/lexer.ts +17 -16
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +65 -27
- package/src/simulate.ts +157 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +2 -7
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +5 -7
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/order.ts +2 -9
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/trace-spec.ts +25 -45
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +63 -158
package/src/prover/smt/encode.ts
CHANGED
|
@@ -11,7 +11,19 @@ import { createPrinter } from "./context";
|
|
|
11
11
|
import { getSymbolSpec, type CollectState, type SymbolSpec } from "./data";
|
|
12
12
|
import type { Entry } from "./flatten";
|
|
13
13
|
import { declare, getTlaName, MEM } from "./format";
|
|
14
|
-
import {
|
|
14
|
+
import {
|
|
15
|
+
createEncoder,
|
|
16
|
+
encodeBool,
|
|
17
|
+
encodeIdv,
|
|
18
|
+
getEntries,
|
|
19
|
+
getUniqueName,
|
|
20
|
+
push,
|
|
21
|
+
type Binding,
|
|
22
|
+
type Encoder,
|
|
23
|
+
type EncodingSession,
|
|
24
|
+
type Env,
|
|
25
|
+
type Mode,
|
|
26
|
+
} from "./rewrite";
|
|
15
27
|
import { compareAxioms, getAxiomKey, type Axiom } from "./table";
|
|
16
28
|
|
|
17
29
|
type RecordExpr = Extract<Expr, { kind: "Record" }>;
|
|
@@ -97,7 +109,7 @@ const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
|
97
109
|
if (pending.at(-1)?.depth === depth) visit(pending.pop()?.text ?? "");
|
|
98
110
|
return depth - 1;
|
|
99
111
|
}
|
|
100
|
-
const flat = encoder.flattened.get(token);
|
|
112
|
+
const flat = encoder.flattener.flattened.get(token);
|
|
101
113
|
if (!flat) {
|
|
102
114
|
const builtin = getTlaName(token);
|
|
103
115
|
if (builtin !== undefined) add(builtin);
|
|
@@ -116,8 +128,6 @@ const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
|
116
128
|
return { symbols, axioms };
|
|
117
129
|
};
|
|
118
130
|
|
|
119
|
-
type Encoder = ReturnType<typeof createEncoder>;
|
|
120
|
-
|
|
121
131
|
const HYPOTHESIS: Mode = { isOmitted: false, polarity: "Negative", at: undefined, depth: 0 };
|
|
122
132
|
|
|
123
133
|
const isExpanded = (hyp: Extract<Hyp, { kind: "Defn" }>) =>
|
|
@@ -137,12 +147,12 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
137
147
|
context.reduce<EncodedContext>(
|
|
138
148
|
(state, hyp) => {
|
|
139
149
|
const extend = (binding: Binding, entries: Entry[] = []) => ({
|
|
140
|
-
env:
|
|
150
|
+
env: push(state.env, binding),
|
|
141
151
|
entries: [...state.entries, ...entries],
|
|
142
152
|
});
|
|
143
153
|
switch (hyp.kind) {
|
|
144
154
|
case "Fresh": {
|
|
145
|
-
const symbol =
|
|
155
|
+
const symbol = getUniqueName(encoder, hyp.name);
|
|
146
156
|
const binding: Binding =
|
|
147
157
|
hyp.shape === 0
|
|
148
158
|
? { kind: "constant", symbol }
|
|
@@ -150,12 +160,12 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
150
160
|
const declaration = declare(symbol, hyp.shape);
|
|
151
161
|
if (!hyp.domain || hyp.domainVisibility === "Hidden")
|
|
152
162
|
return extend(binding, [declaration]);
|
|
153
|
-
const fact = `(assert (${MEM} ${symbol} ${
|
|
154
|
-
return extend(binding, [declaration, ...
|
|
163
|
+
const fact = `(assert (${MEM} ${symbol} ${encodeIdv(encoder, hyp.domain, state.env, HYPOTHESIS)}))`;
|
|
164
|
+
return extend(binding, [declaration, ...getEntries(encoder, fact)]);
|
|
155
165
|
}
|
|
156
166
|
case "Flex": {
|
|
157
|
-
const symbol =
|
|
158
|
-
const primed =
|
|
167
|
+
const symbol = getUniqueName(encoder, hyp.name);
|
|
168
|
+
const primed = getUniqueName(encoder, `${hyp.name}_prime`);
|
|
159
169
|
return extend({ kind: "variable", name: hyp.name, symbol, primed }, [
|
|
160
170
|
declare(symbol, 0),
|
|
161
171
|
declare(primed, 0),
|
|
@@ -168,7 +178,7 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
168
178
|
if (definition.kind === "Instance")
|
|
169
179
|
return extend({ kind: "unsupported", reason: "an instance" });
|
|
170
180
|
if (definition.kind === "Recursive") {
|
|
171
|
-
const symbol =
|
|
181
|
+
const symbol = getUniqueName(encoder, `CONSTANT_${definition.name}_`);
|
|
172
182
|
return extend({ kind: "operator", symbol, arity: definition.shape }, [
|
|
173
183
|
declare(symbol, definition.shape),
|
|
174
184
|
]);
|
|
@@ -183,7 +193,7 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
183
193
|
name: definition.name,
|
|
184
194
|
shapes: params.map((param) => param.shape),
|
|
185
195
|
});
|
|
186
|
-
const symbol =
|
|
196
|
+
const symbol = getUniqueName(encoder, definition.name);
|
|
187
197
|
return extend({ kind: "operator", symbol, arity: params.length }, [
|
|
188
198
|
declare(symbol, params.length),
|
|
189
199
|
]);
|
|
@@ -192,8 +202,9 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
192
202
|
const binding: Binding = { kind: "unsupported", reason: "a reference to a fact" };
|
|
193
203
|
if (hyp.visibility === "Hidden") return extend(binding);
|
|
194
204
|
const isOmitted = isSecondOrder(hyp.expression);
|
|
195
|
-
const entries =
|
|
196
|
-
|
|
205
|
+
const entries = getEntries(
|
|
206
|
+
encoder,
|
|
207
|
+
`(assert ${encodeBool(encoder, hyp.expression, state.env, { ...HYPOTHESIS, isOmitted })})`,
|
|
197
208
|
);
|
|
198
209
|
return extend(
|
|
199
210
|
binding,
|
|
@@ -216,11 +227,12 @@ export const encodeSmt = (prepared: Sequent, session: EncodingSession) => {
|
|
|
216
227
|
const context = encodeContext(sequent.context, encoder);
|
|
217
228
|
const goal = isSecondOrder(sequent.active)
|
|
218
229
|
? []
|
|
219
|
-
:
|
|
220
|
-
|
|
230
|
+
: getEntries(
|
|
231
|
+
encoder,
|
|
232
|
+
`(assert (! (not ${encodeBool(encoder, sequent.active, context.env, { ...HYPOTHESIS, polarity: "Positive" })}) :named |Goal|))`,
|
|
221
233
|
);
|
|
222
234
|
const entries = [...context.entries, ...goal];
|
|
223
|
-
const
|
|
235
|
+
const resolve = createPrinter(encoder.declared);
|
|
224
236
|
const collected = collectSymbols(entries, encoder);
|
|
225
237
|
const declarations = [...collected.symbols]
|
|
226
238
|
.toSorted((left, right) => compareStrings(left[0], right[0]))
|
|
@@ -248,7 +260,7 @@ export const encodeSmt = (prepared: Sequent, session: EncodingSession) => {
|
|
|
248
260
|
!isExpanded(hyp),
|
|
249
261
|
);
|
|
250
262
|
return ["(set-logic UFNIA)", ...(isIdvUsed ? ["(declare-sort Idv 0)"] : []), ...lines]
|
|
251
|
-
.map(
|
|
263
|
+
.map(resolve)
|
|
252
264
|
.concat("(check-sat)", "(exit)")
|
|
253
265
|
.join("\n");
|
|
254
266
|
};
|