tla-ts 0.0.4-dev.a297123 → 0.0.4-dev.c4929d7
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/README.md +27 -141
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +35 -1
- package/dist/index.d.ts +35 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -4
- package/dist/parallel-worker.js +1 -4
- package/dist/prove-worker.cjs +9 -0
- package/dist/prove-worker.d.cts +9 -0
- package/dist/prove-worker.d.ts +9 -0
- package/dist/prove-worker.js +9 -0
- package/dist/prove.cjs +996 -0
- package/dist/prove.js +996 -0
- package/dist/run-cli.cjs +37 -47
- package/dist/run-cli.js +37 -47
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +38 -44
- package/dist/transfer.js +38 -44
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +21 -12
- package/src/check.ts +1 -0
- package/src/codegen.ts +5 -3
- package/src/errors.ts +86 -0
- package/src/evaluate.ts +54 -19
- package/src/index.ts +10 -0
- package/src/{obligation-action.ts → obligations/action.ts} +265 -55
- package/src/{obligation-anon.ts → obligations/anon.ts} +47 -37
- package/src/obligations/ctx.ts +64 -0
- package/src/{obligation-deref.ts → obligations/deref.ts} +38 -61
- package/src/{obligation-expression.ts → obligations/expression.ts} +78 -45
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/{obligation-generate.ts → obligations/generate.ts} +147 -74
- package/src/{obligations.ts → obligations/index.ts} +29 -13
- package/src/{obligation-levels.ts → obligations/levels.ts} +14 -5
- package/src/{obligation-module.ts → obligations/module.ts} +56 -33
- package/src/obligations/pickle.ts +98 -0
- package/src/obligations/pragma.ts +189 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +22 -80
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -1
- package/src/{obligation-source.ts → obligations/source.ts} +159 -97
- package/src/obligations/temporal.ts +319 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +1 -1
- package/src/ocaml-marshal.ts +166 -0
- package/src/parallel-worker.ts +2 -18
- package/src/parallel.ts +10 -43
- package/src/prove/decide-pool.ts +100 -0
- package/src/prove/deciders.ts +33 -0
- package/src/prove/isabelle/LICENSE +36 -0
- package/src/prove/isabelle/LICENSE-tlapm +26 -0
- package/src/prove/isabelle/decide.ts +47 -0
- package/src/prove/isabelle/encode.ts +503 -0
- package/src/prove/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prove/isabelle/isar/method.ts +367 -0
- package/src/prove/isabelle/isar/proof.ts +28 -0
- package/src/prove/isabelle/isar/statement.ts +57 -0
- package/src/prove/isabelle/isar/theory.ts +192 -0
- package/src/prove/isabelle/isar/type-check.ts +278 -0
- package/src/prove/isabelle/provers/blast/blast.ts +258 -0
- package/src/prove/isabelle/provers/blast/branch.ts +322 -0
- package/src/prove/isabelle/provers/blast/prove.ts +347 -0
- package/src/prove/isabelle/provers/blast/rules.ts +330 -0
- package/src/prove/isabelle/provers/blast/state.ts +180 -0
- package/src/prove/isabelle/provers/blast/term.ts +547 -0
- package/src/prove/isabelle/provers/clasimp.ts +150 -0
- package/src/prove/isabelle/provers/classical.ts +389 -0
- package/src/prove/isabelle/provers/hypsubst.ts +441 -0
- package/src/prove/isabelle/pure/bicompose.ts +174 -0
- package/src/prove/isabelle/pure/consts.ts +32 -0
- package/src/prove/isabelle/pure/conv.ts +79 -0
- package/src/prove/isabelle/pure/drule.ts +264 -0
- package/src/prove/isabelle/pure/envir.ts +363 -0
- package/src/prove/isabelle/pure/goal.ts +53 -0
- package/src/prove/isabelle/pure/interrupt.ts +16 -0
- package/src/prove/isabelle/pure/list.ts +12 -0
- package/src/prove/isabelle/pure/logic.ts +402 -0
- package/src/prove/isabelle/pure/name.ts +110 -0
- package/src/prove/isabelle/pure/net.ts +262 -0
- package/src/prove/isabelle/pure/object-logic.ts +41 -0
- package/src/prove/isabelle/pure/pattern.ts +650 -0
- package/src/prove/isabelle/pure/raw-simplifier.ts +353 -0
- package/src/prove/isabelle/pure/rewriter.ts +602 -0
- package/src/prove/isabelle/pure/search.ts +68 -0
- package/src/prove/isabelle/pure/seq.ts +156 -0
- package/src/prove/isabelle/pure/simplifier.ts +112 -0
- package/src/prove/isabelle/pure/table.ts +208 -0
- package/src/prove/isabelle/pure/tactic.ts +276 -0
- package/src/prove/isabelle/pure/tactical.ts +347 -0
- package/src/prove/isabelle/pure/term-ord.ts +159 -0
- package/src/prove/isabelle/pure/term.ts +808 -0
- package/src/prove/isabelle/pure/thm.ts +806 -0
- package/src/prove/isabelle/pure/type.ts +133 -0
- package/src/prove/isabelle/pure/unify.ts +753 -0
- package/src/prove/isabelle/pure/variable.ts +25 -0
- package/src/prove/isabelle/tla/classical-setup.ts +101 -0
- package/src/prove/isabelle/tla/context.ts +74 -0
- package/src/prove/isabelle/tla/logic-data.ts +5 -0
- package/src/prove/isabelle/tla/logic.ts +215 -0
- package/src/prove/isabelle/tla/simpdata.ts +241 -0
- package/src/prove/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prove/ocaml.ts +22 -0
- package/src/prove/prep/action.ts +521 -0
- package/src/prove/prep/defs.ts +33 -0
- package/src/prove/prep/elab.ts +156 -0
- package/src/prove/prep/enabled-axioms.ts +189 -0
- package/src/prove/prep/enabled.ts +43 -0
- package/src/prove/prep/fingerprint.ts +388 -0
- package/src/prove/prep/flatten.ts +70 -0
- package/src/prove/prep/level-comparison.ts +557 -0
- package/src/prove/prep/md5.ts +67 -0
- package/src/prove/prep/pragma.ts +221 -0
- package/src/prove/prep/trivial.ts +22 -0
- package/src/prove/prove-worker.ts +25 -0
- package/src/prove/prove.ts +505 -0
- package/src/prove/ptl/decide.ts +68 -0
- package/src/prove/ptl/encode.ts +256 -0
- package/src/prove/ptl/sat.ts +151 -0
- package/src/prove/ptl/tableau.ts +276 -0
- package/src/prove/smt/axiomatize.ts +69 -0
- package/src/prove/smt/axioms.ts +222 -0
- package/src/prove/smt/context.ts +108 -0
- package/src/prove/smt/data.ts +636 -0
- package/src/prove/smt/encode.ts +166 -0
- package/src/prove/smt/extensionality.ts +65 -0
- package/src/prove/smt/flatten.ts +112 -0
- package/src/prove/smt/format.ts +154 -0
- package/src/prove/smt/instances.ts +182 -0
- package/src/prove/smt/rewrite.ts +773 -0
- package/src/prove/smt/simplify.ts +57 -0
- package/src/prove/smt/solver/act-cache.ts +265 -0
- package/src/prove/smt/solver/arith-rewriter.ts +962 -0
- package/src/prove/smt/solver/array.ts +22 -0
- package/src/prove/smt/solver/asserted-formulas.ts +469 -0
- package/src/prove/smt/solver/ast-lt.ts +157 -0
- package/src/prove/smt/solver/ast-util.ts +147 -0
- package/src/prove/smt/solver/ast.ts +1315 -0
- package/src/prove/smt/solver/auf-solver.ts +572 -0
- package/src/prove/smt/solver/case-split-queue.ts +178 -0
- package/src/prove/smt/solver/cg-table.ts +175 -0
- package/src/prove/smt/solver/clause.ts +276 -0
- package/src/prove/smt/solver/conflict-resolution.ts +343 -0
- package/src/prove/smt/solver/context.ts +1292 -0
- package/src/prove/smt/solver/ctx-simplify.ts +334 -0
- package/src/prove/smt/solver/der.ts +224 -0
- package/src/prove/smt/solver/dyn-ack.ts +141 -0
- package/src/prove/smt/solver/e-matching.ts +659 -0
- package/src/prove/smt/solver/enode.ts +259 -0
- package/src/prove/smt/solver/expr-ref.ts +21 -0
- package/src/prove/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prove/smt/solver/fingerprints.ts +92 -0
- package/src/prove/smt/solver/flat-literals.ts +51 -0
- package/src/prove/smt/solver/goal.ts +138 -0
- package/src/prove/smt/solver/hash.ts +173 -0
- package/src/prove/smt/solver/hashtable.ts +166 -0
- package/src/prove/smt/solver/internalizer.ts +1381 -0
- package/src/prove/smt/solver/lbool.ts +5 -0
- package/src/prove/smt/solver/literal.ts +24 -0
- package/src/prove/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prove/smt/solver/lp/constraints.ts +78 -0
- package/src/prove/smt/solver/lp/containers.ts +296 -0
- package/src/prove/smt/solver/lp/core-solver.ts +504 -0
- package/src/prove/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prove/smt/solver/lp/dep-intervals.ts +656 -0
- package/src/prove/smt/solver/lp/dependency.ts +51 -0
- package/src/prove/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prove/smt/solver/lp/explanation.ts +46 -0
- package/src/prove/smt/solver/lp/gomory.ts +255 -0
- package/src/prove/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prove/smt/solver/lp/hnf.ts +281 -0
- package/src/prove/smt/solver/lp/int-cube.ts +295 -0
- package/src/prove/smt/solver/lp/int-solver.ts +514 -0
- package/src/prove/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prove/smt/solver/lp/lar-term.ts +62 -0
- package/src/prove/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prove/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prove/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prove/smt/solver/lp/nex.ts +120 -0
- package/src/prove/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prove/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prove/smt/solver/lp/nla-core.ts +968 -0
- package/src/prove/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prove/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prove/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prove/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prove/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prove/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prove/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prove/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prove/smt/solver/lp/nla-order.ts +307 -0
- package/src/prove/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prove/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prove/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prove/smt/solver/lp/nla-types.ts +124 -0
- package/src/prove/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prove/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prove/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prove/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prove/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prove/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prove/smt/solver/lp/pdd.ts +971 -0
- package/src/prove/smt/solver/lp/random-updater.ts +138 -0
- package/src/prove/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prove/smt/solver/lp/union-find.ts +96 -0
- package/src/prove/smt/solver/mam-compiler.ts +847 -0
- package/src/prove/smt/solver/mam-interpreter.ts +400 -0
- package/src/prove/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prove/smt/solver/model-checker.ts +347 -0
- package/src/prove/smt/solver/model-evaluator.ts +262 -0
- package/src/prove/smt/solver/model-finder.ts +155 -0
- package/src/prove/smt/solver/model-generator.ts +97 -0
- package/src/prove/smt/solver/model-macro-solver.ts +728 -0
- package/src/prove/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prove/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prove/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prove/smt/solver/nlsat/explain.ts +607 -0
- package/src/prove/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prove/smt/solver/nlsat/levelwise.ts +740 -0
- package/src/prove/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prove/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prove/smt/solver/nlsat/solver.ts +911 -0
- package/src/prove/smt/solver/nlsat/types.ts +43 -0
- package/src/prove/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prove/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prove/smt/solver/nnf.ts +469 -0
- package/src/prove/smt/solver/pattern-inference.ts +351 -0
- package/src/prove/smt/solver/poly-rewriter.ts +477 -0
- package/src/prove/smt/solver/propagate-values.ts +83 -0
- package/src/prove/smt/solver/proto-model.ts +551 -0
- package/src/prove/smt/solver/pull-quant.ts +139 -0
- package/src/prove/smt/solver/qe-lite-der.ts +526 -0
- package/src/prove/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prove/smt/solver/qe-lite.ts +381 -0
- package/src/prove/smt/solver/qi-queue.ts +362 -0
- package/src/prove/smt/solver/quant-tactics.ts +117 -0
- package/src/prove/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prove/smt/solver/quantifier-manager.ts +186 -0
- package/src/prove/smt/solver/random-gen.ts +10 -0
- package/src/prove/smt/solver/rational.ts +165 -0
- package/src/prove/smt/solver/ref-vector.ts +62 -0
- package/src/prove/smt/solver/relevancy.ts +247 -0
- package/src/prove/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prove/smt/solver/rewriter.ts +843 -0
- package/src/prove/smt/solver/rlimit.ts +79 -0
- package/src/prove/smt/solver/smtlib-parser.ts +526 -0
- package/src/prove/smt/solver/solver.ts +71 -0
- package/src/prove/smt/solver/sort.ts +35 -0
- package/src/prove/smt/solver/sticky-generations.ts +69 -0
- package/src/prove/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prove/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prove/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prove/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prove/smt/solver/theory-lra-model.ts +243 -0
- package/src/prove/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prove/smt/solver/theory-lra-state.ts +43 -0
- package/src/prove/smt/solver/theory-lra.ts +56 -0
- package/src/prove/smt/solver/var-subst.ts +258 -0
- package/src/prove/smt/solver/z3-license.txt +10 -0
- package/src/prove/smt/table.ts +170 -0
- package/src/prove/tlapm/tlapm.ts +96 -0
- package/src/prove/tlaps-module.ts +510 -0
- package/src/prove/verdict.ts +18 -0
- package/src/prove/zenon/LICENSE +32 -0
- package/src/prove/zenon/check/check.ts +105 -0
- package/src/prove/zenon/check/definitions.ts +144 -0
- package/src/prove/zenon/check/equality.ts +182 -0
- package/src/prove/zenon/check/functions.ts +62 -0
- package/src/prove/zenon/check/keys.ts +125 -0
- package/src/prove/zenon/check/propositional.ts +104 -0
- package/src/prove/zenon/check/records.ts +188 -0
- package/src/prove/zenon/check/relations.ts +121 -0
- package/src/prove/zenon/check/rewrites.ts +224 -0
- package/src/prove/zenon/check/sets.ts +302 -0
- package/src/prove/zenon/check/terms.ts +127 -0
- package/src/prove/zenon/check/tla.ts +126 -0
- package/src/prove/zenon/decide.ts +113 -0
- package/src/prove/zenon/encode.ts +437 -0
- package/src/prove/zenon/eqrel.ts +300 -0
- package/src/prove/zenon/equality-rules.ts +435 -0
- package/src/prove/zenon/expr.ts +551 -0
- package/src/prove/zenon/index-table.ts +350 -0
- package/src/prove/zenon/isar-case.ts +513 -0
- package/src/prove/zenon/isar.ts +1249 -0
- package/src/prove/zenon/limits.ts +15 -0
- package/src/prove/zenon/llproof.ts +173 -0
- package/src/prove/zenon/mltoll.ts +1566 -0
- package/src/prove/zenon/node.ts +297 -0
- package/src/prove/zenon/ocaml.ts +169 -0
- package/src/prove/zenon/parse.ts +247 -0
- package/src/prove/zenon/phrase.ts +191 -0
- package/src/prove/zenon/proof.ts +198 -0
- package/src/prove/zenon/propositional-rules.ts +387 -0
- package/src/prove/zenon/rules.ts +94 -0
- package/src/prove/zenon/search.ts +288 -0
- package/src/prove/zenon/tla/functions.ts +151 -0
- package/src/prove/zenon/tla/llproof.ts +480 -0
- package/src/prove/zenon/tla/records.ts +225 -0
- package/src/prove/zenon/tla/rewrites.ts +447 -0
- package/src/prove/zenon/tla/sets.ts +304 -0
- package/src/prove/zenon/tla/terms.ts +181 -0
- package/src/prove/zenon/tla/tla.ts +506 -0
- package/src/run-cli.ts +334 -75
- package/src/standard-modules.ts +5 -2
- package/src/successors.ts +24 -5
- package/src/tlapm-cache.ts +236 -0
- package/src/tlc-random.ts +55 -32
- package/src/tlc-version.ts +8 -7
- package/src/values.ts +80 -35
- package/src/worker.ts +65 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
// tlapm's Expr.Action.
|
|
2
|
-
//
|
|
3
|
-
//
|
|
1
|
+
// A port of tlapm's Expr.Action. Lambdifying gives each ENABLED and \cdot a LAMBDA over the
|
|
2
|
+
// variables it binds, after expanding the definitions soundness needs expanded. The ExpandENABLED
|
|
3
|
+
// and ExpandCdot frontends then replace each LAMBDA with an existential quantifier.
|
|
4
4
|
|
|
5
|
-
import { TlaProofError, TlapmBugError } from "
|
|
6
|
-
import type { Anonymizer } from "./
|
|
5
|
+
import { TlaProofError, TlapmBugError, TlaProverError } from "../errors";
|
|
6
|
+
import type { Anonymizer } from "./anon";
|
|
7
7
|
import {
|
|
8
8
|
adjoin,
|
|
9
|
+
adjoinAll,
|
|
9
10
|
applyBuiltin,
|
|
10
11
|
at,
|
|
11
12
|
bumpBy,
|
|
12
13
|
getAtPrefix,
|
|
13
14
|
getErrorNote,
|
|
15
|
+
getFresh,
|
|
14
16
|
getLocusText,
|
|
15
17
|
getScopeAt,
|
|
16
18
|
mapScoped,
|
|
@@ -19,17 +21,53 @@ import {
|
|
|
19
21
|
stripProps,
|
|
20
22
|
substituteExpr,
|
|
21
23
|
type Expr,
|
|
24
|
+
type Locus,
|
|
22
25
|
type ObligationWarning,
|
|
26
|
+
type Param,
|
|
23
27
|
type Scope,
|
|
24
28
|
type Substitution,
|
|
25
|
-
} from "./
|
|
26
|
-
import { getLevelInfo, LEVEL_NUMBERS } from "./
|
|
29
|
+
} from "./expression";
|
|
30
|
+
import { getLevelInfo, LEVEL_NUMBERS } from "./levels";
|
|
31
|
+
|
|
32
|
+
// Which of ENABLED and \cdot a pass handles, and whether it may expand the definitions that
|
|
33
|
+
// soundness needs expanded, as the AutoUSE directive allows.
|
|
34
|
+
interface ActionOptions {
|
|
35
|
+
isEnabled: boolean;
|
|
36
|
+
isCdot: boolean;
|
|
37
|
+
isAutoUse: boolean;
|
|
38
|
+
}
|
|
27
39
|
|
|
28
40
|
interface FreshNames {
|
|
29
41
|
names: string[];
|
|
30
42
|
depth: number;
|
|
31
43
|
}
|
|
32
44
|
|
|
45
|
+
type Warn = (warning: ObligationWarning) => void;
|
|
46
|
+
|
|
47
|
+
const ENABLED_WRAPPER = "EnabledWrapper";
|
|
48
|
+
const CDOT_WRAPPER = "CdotWrapper";
|
|
49
|
+
|
|
50
|
+
const NESTED_ENABLED =
|
|
51
|
+
"Nested occurrence of the operator `ENABLED` found in scope of `\\cdot` when expanding `\\cdot`. Using the proof directive `ExpandENABLED` from the module `TLAPS` is expected to avoid this error.For example, writing `BY ExpandENABLED`.";
|
|
52
|
+
|
|
53
|
+
const NESTED_CDOT =
|
|
54
|
+
"Nested occurrence of the operator `\\cdot` found in scope of `ENABLED` when expanding `ENABLED`. Using the proof directive `ExpandCdot` from the module `TLAPS` is expected to avoid this error.";
|
|
55
|
+
|
|
56
|
+
// Unlike auto_expansion_of_defs, tlapm puts a space before "For example" here.
|
|
57
|
+
const NESTED_CDOT_SPACED = `${NESTED_CDOT} For example, writing \`BY ExpandCdot\`.`;
|
|
58
|
+
|
|
59
|
+
const getLocationText = (locus: Locus | undefined) =>
|
|
60
|
+
locus ? getLocusText(locus) : "<unknown location>";
|
|
61
|
+
|
|
62
|
+
// Visit.map_visible_hyp with no state.
|
|
63
|
+
const mapVisibleChildren = (expression: Expr, map: (child: Expr) => Expr) =>
|
|
64
|
+
mapScoped(
|
|
65
|
+
undefined,
|
|
66
|
+
expression,
|
|
67
|
+
(_state, child) => map(child),
|
|
68
|
+
() => undefined,
|
|
69
|
+
);
|
|
70
|
+
|
|
33
71
|
const getHyp = (scope: Scope | undefined, index: number) => {
|
|
34
72
|
const hyp = getScopeAt(scope, index - 1)?.hyp;
|
|
35
73
|
if (!hyp) throw new TlapmBugError();
|
|
@@ -42,14 +80,23 @@ const isActionOperator = (
|
|
|
42
80
|
expression.kind === "Internal" &&
|
|
43
81
|
(expression.builtin === "ENABLED" || expression.builtin === "Cdot");
|
|
44
82
|
|
|
83
|
+
const isWrapper = (expression: Expr) =>
|
|
84
|
+
expression.kind === "Opaque" &&
|
|
85
|
+
(expression.name === ENABLED_WRAPPER || expression.name === CDOT_WRAPPER);
|
|
86
|
+
|
|
45
87
|
const isLambdified = (expression: Expr) =>
|
|
46
88
|
expression.kind === "Apply" &&
|
|
47
89
|
expression.args.length === 1 &&
|
|
48
90
|
expression.args[0].kind === "Lambda" &&
|
|
49
|
-
(isActionOperator(expression.operator) ||
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
91
|
+
(isActionOperator(expression.operator) || isWrapper(expression.operator));
|
|
92
|
+
|
|
93
|
+
const isBuiltinApply = (
|
|
94
|
+
expression: Expr,
|
|
95
|
+
builtin: "ENABLED" | "Cdot",
|
|
96
|
+
): expression is Expr & { kind: "Apply" } =>
|
|
97
|
+
expression.kind === "Apply" &&
|
|
98
|
+
expression.operator.kind === "Internal" &&
|
|
99
|
+
expression.operator.builtin === builtin;
|
|
53
100
|
|
|
54
101
|
const getInitialLevel = (level: number | undefined) =>
|
|
55
102
|
level === undefined ? 2 : Math.min(2, level);
|
|
@@ -60,13 +107,14 @@ const getDecrementedLevel = (level: number | undefined) =>
|
|
|
60
107
|
// auto_expansion_of_defs. ENABLED and the first argument of \cdot need every definition of action
|
|
61
108
|
// level expanded, a prime lowers that bound to 1, and so does the second argument of \cdot.
|
|
62
109
|
const expandDefinitions = (
|
|
63
|
-
|
|
110
|
+
options: ActionOptions,
|
|
111
|
+
onWarning: Warn,
|
|
64
112
|
scope: Scope | undefined,
|
|
65
113
|
expression: Expr,
|
|
66
114
|
level: number | undefined,
|
|
67
115
|
): Expr => {
|
|
68
116
|
const recurse = (inner: Expr, innerLevel = level) =>
|
|
69
|
-
expandDefinitions(onWarning, scope, inner, innerLevel);
|
|
117
|
+
expandDefinitions(options, onWarning, scope, inner, innerLevel);
|
|
70
118
|
if (isLambdified(expression)) return expression;
|
|
71
119
|
if (expression.kind === "Sub") {
|
|
72
120
|
return {
|
|
@@ -79,10 +127,31 @@ const expandDefinitions = (
|
|
|
79
127
|
const builtin = expression.operator.builtin;
|
|
80
128
|
const [first, second] = expression.args;
|
|
81
129
|
if (builtin === "Cdot" && expression.args.length === 2) {
|
|
82
|
-
|
|
130
|
+
if (level !== undefined && !options.isCdot) {
|
|
131
|
+
onWarning(
|
|
132
|
+
getErrorNote(
|
|
133
|
+
expression.location,
|
|
134
|
+
`${NESTED_CDOT}For example, writing \`BY ExpandCdot\`.`,
|
|
135
|
+
),
|
|
136
|
+
);
|
|
137
|
+
throw new TlaProverError("Expr.Action");
|
|
138
|
+
}
|
|
139
|
+
return {
|
|
140
|
+
...expression,
|
|
141
|
+
args: options.isCdot
|
|
142
|
+
? [recurse(first, getInitialLevel(level)), recurse(second, 1)]
|
|
143
|
+
: [recurse(first), recurse(second)],
|
|
144
|
+
};
|
|
83
145
|
}
|
|
84
146
|
if (builtin === "ENABLED" && expression.args.length === 1) {
|
|
85
|
-
|
|
147
|
+
if (level !== undefined && !options.isEnabled) {
|
|
148
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
149
|
+
throw new TlaProverError("Expr.Action");
|
|
150
|
+
}
|
|
151
|
+
return {
|
|
152
|
+
...expression,
|
|
153
|
+
args: [options.isEnabled ? recurse(first, getInitialLevel(level)) : recurse(first)],
|
|
154
|
+
};
|
|
86
155
|
}
|
|
87
156
|
if ((builtin === "Prime" || builtin === "UNCHANGED") && expression.args.length === 1) {
|
|
88
157
|
return { ...expression, args: [recurse(first, getDecrementedLevel(level))] };
|
|
@@ -96,7 +165,7 @@ const expandDefinitions = (
|
|
|
96
165
|
return mapScoped(
|
|
97
166
|
scope,
|
|
98
167
|
expression,
|
|
99
|
-
(inner, child) => expandDefinitions(onWarning, inner, child, level),
|
|
168
|
+
(inner, child) => expandDefinitions(options, onWarning, inner, child, level),
|
|
100
169
|
adjoin,
|
|
101
170
|
);
|
|
102
171
|
}
|
|
@@ -104,7 +173,7 @@ const expandDefinitions = (
|
|
|
104
173
|
const expressionLevel = getLevelInfo(scope, expression).level;
|
|
105
174
|
const hyp = getHyp(scope, head.index);
|
|
106
175
|
const getDeclaration = (name: string) =>
|
|
107
|
-
`The operator \`${name}\` is declared at:\n${
|
|
176
|
+
`The operator \`${name}\` is declared at:\n${getLocationText(hyp.location)}`;
|
|
108
177
|
if (hyp.kind === "Fresh" && hyp.level === "Unknown") {
|
|
109
178
|
onWarning(
|
|
110
179
|
getErrorNote(
|
|
@@ -131,6 +200,21 @@ const expandDefinitions = (
|
|
|
131
200
|
if (definition.kind !== "Operator" && definition.kind !== "Bpragma") {
|
|
132
201
|
throw new TlapmBugError();
|
|
133
202
|
}
|
|
203
|
+
if (!options.isAutoUse) {
|
|
204
|
+
const names =
|
|
205
|
+
options.isEnabled && options.isCdot
|
|
206
|
+
? [
|
|
207
|
+
"the operators `ENABLED` and `\\cdot`",
|
|
208
|
+
"the proof directives `ExpandENABLED` and `ExpandCdot`",
|
|
209
|
+
]
|
|
210
|
+
: options.isEnabled
|
|
211
|
+
? ["the operator `ENABLED`", "`ExpandENABLED` proof directive"]
|
|
212
|
+
: ["the operator `\\cdot`", "`ExpandCdot` proof directive"];
|
|
213
|
+
const body = definition.body.kind === "Lambda" ? definition.body.body : definition.body;
|
|
214
|
+
const message = `Hidden definition of operator \`${definition.name}\` needs expansion for soundly expanding ${names[0]} (using rigid quantification).\nThe expansion of ${names[0]} has been activated with the ${names[1]} from the module \`TLAPS\`.\nThe operator \`${definition.name}\` is defined at: \n\t${getLocationText(body.location)}\nand the operator \`${definition.name}\` occurs at: \n\t${getLocationText(expression.location)}\nUsing the proof directive \`AutoUSE\` from the module \`TLAPS\`, or \`BY DEF ${definition.name}\` is expected to avoid this error.\n`;
|
|
215
|
+
onWarning(getErrorNote(expression.location, message));
|
|
216
|
+
throw new TlaProverError(message);
|
|
217
|
+
}
|
|
134
218
|
onWarning({
|
|
135
219
|
text: `${getAtPrefix(expression.location)}[INFO]: Auto-expanding the definition of operator: ${definition.name}\n`,
|
|
136
220
|
channel: "stdout",
|
|
@@ -145,7 +229,7 @@ const getEquality = (expression: Expr): Expr =>
|
|
|
145
229
|
applyBuiltin("Eq", [applyBuiltin("Prime", [expression], expression), expression], expression);
|
|
146
230
|
|
|
147
231
|
// E_tla_norm.rewrite_unch: UNCHANGED <<x, <<y>>>> as x' = x /\ y' = y.
|
|
148
|
-
const rewriteUnchanged = (expression: Expr): Expr => {
|
|
232
|
+
export const rewriteUnchanged = (expression: Expr): Expr => {
|
|
149
233
|
const flatten = (inner: Expr): Expr[] =>
|
|
150
234
|
inner.kind === "Tuple" ? inner.elements.flatMap(flatten) : [inner];
|
|
151
235
|
const items = flatten(expression);
|
|
@@ -212,13 +296,14 @@ const getHashtblKeys = (names: string[]) => {
|
|
|
212
296
|
// into primed. ENABLED A binds the primes of A, and A \cdot B binds those of A and the unprimed
|
|
213
297
|
// variables of B, each as an opaque name such as x#enabled#prime1.
|
|
214
298
|
const bindVariables = (
|
|
215
|
-
|
|
299
|
+
options: ActionOptions,
|
|
300
|
+
onWarning: Warn,
|
|
216
301
|
current: FreshNames | undefined,
|
|
217
302
|
primed: FreshNames | undefined,
|
|
218
303
|
scope: Scope | undefined,
|
|
219
304
|
expression: Expr,
|
|
220
305
|
): Expr => {
|
|
221
|
-
const recurse = (inner: Expr) => bindVariables(onWarning, current, primed, scope, inner);
|
|
306
|
+
const recurse = (inner: Expr) => bindVariables(options, onWarning, current, primed, scope, inner);
|
|
222
307
|
const isInScope = current !== undefined || primed !== undefined;
|
|
223
308
|
const lambdifyOperator = (operator: Expr, args: Expr[]) => {
|
|
224
309
|
const fresh: FreshNames = {
|
|
@@ -227,8 +312,8 @@ const bindVariables = (
|
|
|
227
312
|
};
|
|
228
313
|
const [first, second] = args;
|
|
229
314
|
const bound = [
|
|
230
|
-
bindVariables(onWarning, current, fresh, scope, first),
|
|
231
|
-
...(second ? [bindVariables(onWarning, fresh, primed, scope, second)] : []),
|
|
315
|
+
bindVariables(options, onWarning, current, fresh, scope, first),
|
|
316
|
+
...(second ? [bindVariables(options, onWarning, fresh, primed, scope, second)] : []),
|
|
232
317
|
];
|
|
233
318
|
const params = fresh.names.length === 0 ? ["r#0"] : getHashtblKeys(fresh.names);
|
|
234
319
|
return at(
|
|
@@ -250,13 +335,21 @@ const bindVariables = (
|
|
|
250
335
|
if (expression.kind === "Apply" && expression.operator.kind === "Internal") {
|
|
251
336
|
const builtin = expression.operator.builtin;
|
|
252
337
|
if (
|
|
253
|
-
(builtin === "ENABLED" && expression.args.length === 1) ||
|
|
254
|
-
(builtin === "Cdot" && expression.args.length === 2)
|
|
338
|
+
(options.isEnabled && builtin === "ENABLED" && expression.args.length === 1) ||
|
|
339
|
+
(options.isCdot && builtin === "Cdot" && expression.args.length === 2)
|
|
255
340
|
) {
|
|
256
341
|
return lambdifyOperator(expression.operator, expression.args);
|
|
257
342
|
}
|
|
343
|
+
if (builtin === "ENABLED" && isInScope) {
|
|
344
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
345
|
+
throw new TlaProverError("Expr.Action");
|
|
346
|
+
}
|
|
347
|
+
if (builtin === "Cdot" && isInScope) {
|
|
348
|
+
onWarning(getErrorNote(expression.location, NESTED_CDOT_SPACED));
|
|
349
|
+
throw new TlaProverError("Expr.Action");
|
|
350
|
+
}
|
|
258
351
|
if (builtin === "Prime" && expression.args.length === 1) {
|
|
259
|
-
const arg = bindVariables(onWarning, primed, undefined, scope, expression.args[0]);
|
|
352
|
+
const arg = bindVariables(options, onWarning, primed, undefined, scope, expression.args[0]);
|
|
260
353
|
return primed ? arg : { ...expression, args: [arg] };
|
|
261
354
|
}
|
|
262
355
|
if (builtin === "UNCHANGED" && isInScope) return recurse(expandPropositional(expression));
|
|
@@ -285,7 +378,7 @@ const bindVariables = (
|
|
|
285
378
|
return mapScoped(
|
|
286
379
|
scope,
|
|
287
380
|
expression,
|
|
288
|
-
(inner, child) => bindVariables(onWarning, current, primed, inner, child),
|
|
381
|
+
(inner, child) => bindVariables(options, onWarning, current, primed, inner, child),
|
|
289
382
|
adjoin,
|
|
290
383
|
);
|
|
291
384
|
};
|
|
@@ -323,62 +416,179 @@ const shiftIndices = (substitution: Substitution, expression: Expr): Expr => {
|
|
|
323
416
|
return mapScoped(substitution, expression, shiftIndices, (current) => bumpBy(1, current));
|
|
324
417
|
};
|
|
325
418
|
|
|
326
|
-
// normalize_lambda_param_names
|
|
327
|
-
|
|
328
|
-
const renameParams = (expression: Expr): Expr => {
|
|
419
|
+
// normalize_lambda_param_names.
|
|
420
|
+
const renameParams = (isKeepingNames: boolean, expression: Expr): Expr => {
|
|
329
421
|
if (expression.kind === "Apply" && isActionOperator(expression.operator)) {
|
|
330
422
|
const [lambda] = expression.args;
|
|
331
423
|
if (expression.args.length !== 1 || lambda.kind !== "Lambda" || lambda.params[0].name === "_") {
|
|
332
424
|
throw new TlapmBugError();
|
|
333
425
|
}
|
|
334
|
-
const name = expression.operator.builtin === "Cdot" ?
|
|
426
|
+
const name = expression.operator.builtin === "Cdot" ? CDOT_WRAPPER : ENABLED_WRAPPER;
|
|
335
427
|
return {
|
|
336
428
|
kind: "Apply",
|
|
337
429
|
operator: at({ kind: "Opaque", name }, expression.operator),
|
|
338
430
|
args: [
|
|
339
431
|
{
|
|
340
432
|
kind: "Lambda",
|
|
341
|
-
params: lambda.params.map((
|
|
342
|
-
|
|
433
|
+
params: lambda.params.map((param, index) => ({
|
|
434
|
+
name: isKeepingNames ? param.name : `r#${index}`,
|
|
435
|
+
shape: 0,
|
|
436
|
+
})),
|
|
437
|
+
body: renameParams(isKeepingNames, lambda.body),
|
|
343
438
|
},
|
|
344
439
|
],
|
|
345
440
|
};
|
|
346
441
|
}
|
|
347
|
-
return
|
|
348
|
-
undefined,
|
|
349
|
-
expression,
|
|
350
|
-
(_state, child) => renameParams(child),
|
|
351
|
-
() => undefined,
|
|
352
|
-
);
|
|
442
|
+
return mapVisibleChildren(expression, (child) => renameParams(isKeepingNames, child));
|
|
353
443
|
};
|
|
354
444
|
|
|
355
|
-
// check_arity
|
|
445
|
+
// check_arity.
|
|
356
446
|
const checkArity = (expression: Expr): Expr => {
|
|
357
|
-
|
|
358
|
-
expression
|
|
359
|
-
expression.operator.kind === "Internal" &&
|
|
360
|
-
expression.operator.builtin === "Cdot" &&
|
|
447
|
+
if (
|
|
448
|
+
isBuiltinApply(expression, "Cdot") &&
|
|
361
449
|
expression.args.length === 1 &&
|
|
362
|
-
expression.args[0].kind !== "Lambda"
|
|
363
|
-
|
|
450
|
+
expression.args[0].kind !== "Lambda"
|
|
451
|
+
) {
|
|
452
|
+
throw new TlapmBugError();
|
|
453
|
+
}
|
|
454
|
+
return mapVisibleChildren(expression, checkArity);
|
|
455
|
+
};
|
|
456
|
+
|
|
457
|
+
// lambdify_action_operators#expand.
|
|
458
|
+
const lambdifyOperators = (
|
|
459
|
+
anonymizer: Anonymizer,
|
|
460
|
+
onWarning: Warn,
|
|
461
|
+
scope: Scope | undefined,
|
|
462
|
+
expression: Expr,
|
|
463
|
+
options: ActionOptions,
|
|
464
|
+
isKeepingNames: boolean,
|
|
465
|
+
) => {
|
|
466
|
+
const bound = bindVariables(options, onWarning, undefined, undefined, scope, expression);
|
|
467
|
+
return renameParams(isKeepingNames, anonymizer.expr(scope, shiftIndices(shift(0), bound)));
|
|
468
|
+
};
|
|
469
|
+
|
|
470
|
+
const LAMBDIFY_ALL: ActionOptions = { isEnabled: true, isCdot: true, isAutoUse: true };
|
|
471
|
+
|
|
472
|
+
export const lambdify = (
|
|
473
|
+
anonymizer: Anonymizer,
|
|
474
|
+
onWarning: Warn,
|
|
475
|
+
scope: Scope | undefined,
|
|
476
|
+
expression: Expr,
|
|
477
|
+
options = LAMBDIFY_ALL,
|
|
478
|
+
) => {
|
|
479
|
+
const expanded = expandDefinitions(options, onWarning, scope, expression, undefined);
|
|
480
|
+
return checkArity(lambdifyOperators(anonymizer, onWarning, scope, expanded, options, false));
|
|
481
|
+
};
|
|
482
|
+
|
|
483
|
+
// replace_action_operators_with_quantifiers: each lambdified ENABLED or \cdot that the frontend
|
|
484
|
+
// expands becomes \E over the parameters of its LAMBDA.
|
|
485
|
+
const replaceWithQuantifiers = (
|
|
486
|
+
options: ActionOptions,
|
|
487
|
+
onWarning: Warn,
|
|
488
|
+
scope: Scope | undefined,
|
|
489
|
+
expression: Expr,
|
|
490
|
+
isInScope: boolean,
|
|
491
|
+
): Expr => {
|
|
492
|
+
const quantify = (params: Param[], body: Expr): Expr => ({
|
|
493
|
+
kind: "Quant",
|
|
494
|
+
quantifier: "Exists",
|
|
495
|
+
bounds: params.map((param) => ({
|
|
496
|
+
name: param.name,
|
|
497
|
+
level: "Constant",
|
|
498
|
+
domain: { kind: "NoDomain" },
|
|
499
|
+
})),
|
|
500
|
+
body: replaceWithQuantifiers(
|
|
501
|
+
options,
|
|
502
|
+
onWarning,
|
|
503
|
+
adjoinAll(
|
|
504
|
+
scope,
|
|
505
|
+
params.map((param) => getFresh(param.name, "Unknown", param.shape)),
|
|
506
|
+
),
|
|
507
|
+
body,
|
|
508
|
+
true,
|
|
509
|
+
),
|
|
510
|
+
});
|
|
511
|
+
const isExpanded = (builtin: "ENABLED" | "Cdot") =>
|
|
512
|
+
builtin === "ENABLED" ? options.isEnabled : options.isCdot;
|
|
513
|
+
if (expression.kind === "Apply" && expression.args.length === 1) {
|
|
514
|
+
const operator = expression.operator;
|
|
515
|
+
const [lambda] = expression.args;
|
|
516
|
+
if (lambda.kind === "Lambda") {
|
|
517
|
+
if (
|
|
518
|
+
operator.kind === "Opaque" &&
|
|
519
|
+
((options.isEnabled && operator.name === ENABLED_WRAPPER) ||
|
|
520
|
+
(options.isCdot && operator.name === CDOT_WRAPPER))
|
|
521
|
+
) {
|
|
522
|
+
return quantify(lambda.params, lambda.body);
|
|
523
|
+
}
|
|
524
|
+
if (operator.kind === "Ix" && (options.isEnabled || options.isCdot)) {
|
|
525
|
+
const hyp = getHyp(scope, operator.index);
|
|
526
|
+
const isWrapperDefinition =
|
|
527
|
+
hyp.kind === "Defn" &&
|
|
528
|
+
hyp.definition.kind === "Operator" &&
|
|
529
|
+
(hyp.definition.name === ENABLED_WRAPPER || hyp.definition.name === CDOT_WRAPPER);
|
|
530
|
+
if (isWrapperDefinition) return quantify(lambda.params, lambda.body);
|
|
531
|
+
}
|
|
532
|
+
if (isActionOperator(operator) && isExpanded(operator.builtin)) {
|
|
533
|
+
return quantify(lambda.params, lambda.body);
|
|
534
|
+
}
|
|
535
|
+
}
|
|
536
|
+
if (isActionOperator(operator) && isExpanded(operator.builtin)) {
|
|
537
|
+
return replaceWithQuantifiers(options, onWarning, scope, lambda, true);
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
if (isBuiltinApply(expression, "ENABLED") && isInScope) {
|
|
541
|
+
onWarning(getErrorNote(expression.location, NESTED_ENABLED));
|
|
542
|
+
throw new TlaProverError("Expr.Action");
|
|
543
|
+
}
|
|
544
|
+
if (isBuiltinApply(expression, "Cdot") && isInScope) {
|
|
545
|
+
onWarning(getErrorNote(expression.location, NESTED_CDOT_SPACED));
|
|
546
|
+
throw new TlaProverError("Expr.Action");
|
|
547
|
+
}
|
|
364
548
|
return mapScoped(
|
|
365
|
-
|
|
549
|
+
scope,
|
|
366
550
|
expression,
|
|
367
|
-
(
|
|
368
|
-
|
|
551
|
+
(inner, child) => replaceWithQuantifiers(options, onWarning, inner, child, isInScope),
|
|
552
|
+
adjoin,
|
|
369
553
|
);
|
|
370
554
|
};
|
|
371
555
|
|
|
372
|
-
|
|
556
|
+
// commute_exists_disjunction: \E x : A \/ B as (\E x : A) \/ (\E x : B), everywhere.
|
|
557
|
+
const commuteExistsDisjunction = (expression: Expr): Expr => {
|
|
558
|
+
if (expression.kind === "Quant" && expression.quantifier === "Exists") {
|
|
559
|
+
const body = expression.body;
|
|
560
|
+
if (body.kind === "List" && body.bullet === "Or") {
|
|
561
|
+
return commuteExistsDisjunction({
|
|
562
|
+
...body,
|
|
563
|
+
items: body.items.map((item) => ({ ...expression, body: item })),
|
|
564
|
+
});
|
|
565
|
+
}
|
|
566
|
+
if (
|
|
567
|
+
body.kind === "Apply" &&
|
|
568
|
+
body.operator.kind === "Internal" &&
|
|
569
|
+
body.operator.builtin === "Disj"
|
|
570
|
+
) {
|
|
571
|
+
if (body.args.length !== 2) throw new TlapmBugError();
|
|
572
|
+
return commuteExistsDisjunction({
|
|
573
|
+
...body,
|
|
574
|
+
args: body.args.map((arg) => ({ ...expression, body: arg })),
|
|
575
|
+
});
|
|
576
|
+
}
|
|
577
|
+
}
|
|
578
|
+
return mapVisibleChildren(expression, commuteExistsDisjunction);
|
|
579
|
+
};
|
|
580
|
+
|
|
581
|
+
// expand_action_operators, the ExpandENABLED and ExpandCdot frontends.
|
|
582
|
+
export const expandActionOperators = (
|
|
373
583
|
anonymizer: Anonymizer,
|
|
374
|
-
onWarning:
|
|
584
|
+
onWarning: Warn,
|
|
375
585
|
scope: Scope | undefined,
|
|
376
586
|
expression: Expr,
|
|
587
|
+
options: ActionOptions,
|
|
377
588
|
) => {
|
|
378
|
-
const expanded = expandDefinitions(onWarning, scope, expression, undefined);
|
|
379
|
-
const
|
|
380
|
-
|
|
381
|
-
|
|
589
|
+
const expanded = expandDefinitions(options, onWarning, scope, expression, undefined);
|
|
590
|
+
const lambdified = lambdifyOperators(anonymizer, onWarning, scope, expanded, options, true);
|
|
591
|
+
return commuteExistsDisjunction(
|
|
592
|
+
replaceWithQuantifiers(options, onWarning, scope, lambdified, false),
|
|
382
593
|
);
|
|
383
|
-
return checkArity(renameParams(anonymizer.expr(scope, bound)));
|
|
384
594
|
};
|