tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.28c823e4b
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 +7 -0
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +3 -3
- package/dist/deciders.cjs +28 -28
- package/dist/deciders.js +52 -52
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +105 -10
- package/dist/index.d.ts +105 -10
- 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 +116 -36
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -23
- package/src/bags.ts +99 -102
- package/src/builtins.ts +40 -78
- package/src/bundled-modules.ts +1 -8
- package/src/check.ts +564 -366
- package/src/cli/options.ts +10 -5
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +18 -11
- package/src/cli/tlapm.ts +0 -12
- package/src/cli/tlc-arguments.ts +640 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +525 -216
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +4 -16
- package/src/cli.ts +0 -1
- package/src/codegen.ts +191 -64
- package/src/config.ts +140 -109
- package/src/coverage.ts +837 -0
- package/src/dependencies.ts +6 -40
- package/src/dfid.ts +618 -0
- package/src/environment.ts +237 -119
- package/src/errors.ts +56 -56
- package/src/evaluate.ts +543 -341
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +10 -10
- package/src/index.ts +3 -0
- package/src/instances.ts +38 -31
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +255 -139
- package/src/levels.ts +8 -17
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +77 -117
- package/src/liveness.ts +106 -62
- package/src/obligations/action.ts +4 -28
- package/src/obligations/anonymize.ts +84 -80
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +2 -19
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +1 -11
- package/src/obligations/index.ts +0 -11
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +1 -15
- package/src/obligations/normalize.ts +5 -24
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +3 -14
- package/src/obligations/source.ts +1 -21
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +8 -14
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +24 -33
- package/src/parallel.ts +48 -40
- package/src/parser.ts +565 -282
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +5 -10
- package/src/prover/deciders.ts +0 -4
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
- package/src/prover/isabelle/isar/method.ts +25 -38
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +15 -26
- package/src/prover/isabelle/isar/type-check.ts +11 -25
- package/src/prover/isabelle/provers/blast/blast.ts +10 -41
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +11 -25
- package/src/prover/isabelle/pure/bicompose.ts +16 -13
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +1 -9
- package/src/prover/isabelle/pure/drule.ts +24 -40
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -14
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
- package/src/prover/isabelle/pure/rewriter.ts +26 -58
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +1 -31
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +6 -12
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +13 -36
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +9 -19
- package/src/prover/isabelle/tla/context.ts +8 -16
- package/src/prover/isabelle/tla/logic.ts +4 -11
- package/src/prover/isabelle/tla/simpdata.ts +46 -34
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +4 -36
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +0 -16
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +9 -36
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +0 -36
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +19 -26
- package/src/prover/smt/data.ts +51 -54
- package/src/prover/smt/encode.ts +14 -35
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +66 -101
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -143
- package/src/prover/smt/solver/auf-solver.ts +6 -39
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +4 -61
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +3 -34
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +6 -98
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +35 -130
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +14 -56
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +2 -36
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +3 -15
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +12 -69
- package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
- package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +3 -47
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
- package/src/prover/smt/solver/nlsat/solver.ts +7 -67
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -48
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
- package/src/prover/smt/solver/quantifier-manager.ts +1 -8
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +2 -37
- package/src/prover/smt/solver/solver.ts +1 -16
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +20 -25
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +12 -17
- package/src/prover/verdict.ts +0 -2
- package/src/prover/zenon/check/check.ts +0 -9
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +0 -5
- package/src/prover/zenon/check/relations.ts +0 -13
- package/src/prover/zenon/check/rewrites.ts +0 -6
- package/src/prover/zenon/check/sets.ts +0 -3
- package/src/prover/zenon/check/terms.ts +0 -17
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +0 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +1 -26
- package/src/prover/zenon/index-table.ts +17 -38
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +1 -29
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +0 -9
- package/src/prover/zenon/mltoll.ts +54 -76
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +2 -7
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +1 -17
- package/src/prover/zenon/tla/functions.ts +57 -29
- package/src/prover/zenon/tla/llproof.ts +63 -70
- package/src/prover/zenon/tla/records.ts +56 -27
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +68 -39
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +59 -58
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +12 -112
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generator.ts +149 -252
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +41 -61
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +0 -31
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +29 -63
- package/src/sany/selectors.ts +15 -39
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +13 -63
- package/src/search.ts +495 -155
- package/src/simulate.ts +685 -0
- package/src/spec-description.ts +176 -69
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +254 -69
- package/src/state-graph.ts +50 -24
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +2 -3
- package/src/successors.ts +260 -91
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +110 -44
- package/src/tlc/order.ts +37 -60
- package/src/tlc/random.ts +33 -45
- package/src/tlc/replay.ts +549 -217
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +76 -41
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +269 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +8 -21
- package/src/typescript/collections.ts +0 -15
- package/src/typescript/compile.ts +0 -5
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +4 -12
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +10 -11
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +0 -10
- package/src/typescript/types.ts +1 -8
- package/src/values.ts +749 -330
- package/src/worker.ts +7 -8
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
// ctx.ml and backend/smtlib.ml's naming: each name is salted past the names in scope.
|
|
2
|
-
|
|
3
1
|
import { formatName } from "./format";
|
|
4
2
|
|
|
5
|
-
// A quantifier's variables, in scope until the quantifier's closing parenthesis.
|
|
6
3
|
interface QuantifierScope {
|
|
7
4
|
depth: number;
|
|
8
5
|
exits: (() => void)[];
|
|
@@ -16,8 +13,6 @@ export interface Identifier {
|
|
|
16
13
|
|
|
17
14
|
const getSaltedName = (base: string, salt: number) => (salt === 0 ? base : `${base}_${salt}`);
|
|
18
15
|
|
|
19
|
-
// Ctx.maybe_adj: a name is its formatted base, salted past the last one with that base and past
|
|
20
|
-
// every name in scope.
|
|
21
16
|
export const createContext = () => {
|
|
22
17
|
const salts = new Map<string, number>();
|
|
23
18
|
const names = new Set<string>();
|
|
@@ -30,7 +25,6 @@ export const createContext = () => {
|
|
|
30
25
|
) ?? start;
|
|
31
26
|
return { base, salt, name: getSaltedName(base, salt) };
|
|
32
27
|
};
|
|
33
|
-
// Brings an identifier into scope and returns how to take it out again.
|
|
34
28
|
const enter = (identifier: Identifier) => {
|
|
35
29
|
const previous = salts.get(identifier.base);
|
|
36
30
|
salts.set(identifier.base, identifier.salt);
|
|
@@ -44,8 +38,6 @@ export const createContext = () => {
|
|
|
44
38
|
return { names, adjoin, enter };
|
|
45
39
|
};
|
|
46
40
|
|
|
47
|
-
// Smtlib.pp_print_obligation names each declaration for the rest of the obligation, and each
|
|
48
|
-
// quantifier's variables within it, so a variable's name depends on the names in scope.
|
|
49
41
|
export const createPrinter = (declared: Map<string, Identifier>) => {
|
|
50
42
|
const context = createContext();
|
|
51
43
|
const resolve = (line: string) => {
|
|
@@ -60,42 +52,43 @@ export const createPrinter = (declared: Map<string, Identifier>) => {
|
|
|
60
52
|
const replacements = new Map<number, string>();
|
|
61
53
|
const renames = new Map<string, string[]>();
|
|
62
54
|
const scopes: QuantifierScope[] = [];
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
55
|
+
let position = 0;
|
|
56
|
+
let depth = 0;
|
|
57
|
+
while (position < tokens.length) {
|
|
58
|
+
const token = tokens[position][0];
|
|
66
59
|
const isQuantifier =
|
|
67
60
|
token === "(" &&
|
|
68
|
-
(tokens[
|
|
69
|
-
tokens[
|
|
61
|
+
(tokens[position + 1]?.[0] === "forall" || tokens[position + 1]?.[0] === "exists") &&
|
|
62
|
+
tokens[position + 2]?.[0] === "(";
|
|
70
63
|
if (isQuantifier) {
|
|
71
|
-
|
|
72
|
-
const scope: QuantifierScope = { depth
|
|
64
|
+
depth++;
|
|
65
|
+
const scope: QuantifierScope = { depth, exits: [] };
|
|
73
66
|
scopes.push(scope);
|
|
74
|
-
|
|
75
|
-
while (tokens[
|
|
76
|
-
const raw = tokens[
|
|
67
|
+
position += 3;
|
|
68
|
+
while (tokens[position]?.[0] === "(") {
|
|
69
|
+
const raw = tokens[position + 1][0];
|
|
77
70
|
const identifier = context.adjoin(raw.replace(/#\d+$/, ""));
|
|
78
71
|
const stack = renames.get(raw) ?? [];
|
|
79
72
|
renames.set(raw, [...stack, identifier.name]);
|
|
80
73
|
scope.exits.push(context.enter(identifier), () => renames.set(raw, stack));
|
|
81
|
-
replacements.set(
|
|
82
|
-
|
|
74
|
+
replacements.set(position + 1, identifier.name);
|
|
75
|
+
position += 4;
|
|
83
76
|
}
|
|
84
|
-
|
|
77
|
+
position++;
|
|
85
78
|
continue;
|
|
86
79
|
}
|
|
87
|
-
if (token === "(")
|
|
80
|
+
if (token === "(") depth++;
|
|
88
81
|
if (token === ")") {
|
|
89
|
-
if (scopes.at(-1)?.depth ===
|
|
82
|
+
if (scopes.at(-1)?.depth === depth)
|
|
90
83
|
scopes
|
|
91
84
|
.pop()
|
|
92
85
|
?.exits.toReversed()
|
|
93
86
|
.forEach((exit) => exit());
|
|
94
|
-
|
|
87
|
+
depth--;
|
|
95
88
|
}
|
|
96
89
|
const name = renames.get(token)?.at(-1);
|
|
97
|
-
if (name !== undefined) replacements.set(
|
|
98
|
-
|
|
90
|
+
if (name !== undefined) replacements.set(position, name);
|
|
91
|
+
position++;
|
|
99
92
|
}
|
|
100
93
|
return tokens
|
|
101
94
|
.map((match, index) => {
|
package/src/prover/smt/data.ts
CHANGED
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// encode/n_data.ml: the declaration, dependencies, and axioms of each symbol tlapm's SMT encoding
|
|
2
|
-
// uses.
|
|
3
|
-
|
|
4
1
|
import { TlaUnsupportedError } from "../../errors";
|
|
5
2
|
import {
|
|
6
3
|
getComponentSet,
|
|
@@ -57,9 +54,7 @@ export interface SymbolSpec {
|
|
|
57
54
|
axioms: Axiom[];
|
|
58
55
|
}
|
|
59
56
|
|
|
60
|
-
// N_data.s: what the symbols collected so far change about the axioms of the next ones.
|
|
61
57
|
export interface CollectState {
|
|
62
|
-
// The fields of each record symbol the obligation uses.
|
|
63
58
|
recordFields: Map<string, string[]>;
|
|
64
59
|
strings: string[];
|
|
65
60
|
isFunConstr: boolean;
|
|
@@ -72,23 +67,22 @@ export interface CollectState {
|
|
|
72
67
|
|
|
73
68
|
const SEQUENCE_DEPS = ["Mem", "Seq", "Len", "FunApp", "NatSet", "Cast_Int", "Proj_Int"];
|
|
74
69
|
|
|
75
|
-
// N_data.get_deps, with arithmetic and set extensionality as tlapm's SMT backend sets them.
|
|
76
70
|
export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec => {
|
|
77
|
-
const
|
|
71
|
+
const createSpec = (declaration: string | undefined, deps: string[], axioms: Axiom[]) => ({
|
|
78
72
|
declaration,
|
|
79
73
|
deps,
|
|
80
74
|
axioms,
|
|
81
75
|
});
|
|
82
76
|
const symbol = tla(name);
|
|
83
|
-
const
|
|
84
|
-
|
|
77
|
+
const declareSpec = (arity: number, deps: string[], axioms: Axiom[], sort = "Idv") =>
|
|
78
|
+
createSpec(declare(symbol, arity, sort), deps, axioms);
|
|
85
79
|
const enumeration = /^SetEnum_(\d+)$/.exec(name);
|
|
86
80
|
if (enumeration)
|
|
87
|
-
return
|
|
81
|
+
return declareSpec(Number(enumeration[1]), ["Mem"], getEnumeration(Number(enumeration[1])));
|
|
88
82
|
const setOf = /^SetOf_(\d+)$/.exec(name);
|
|
89
83
|
if (setOf) {
|
|
90
84
|
const count = Number(setOf[1]);
|
|
91
|
-
return
|
|
85
|
+
return createSpec(
|
|
92
86
|
undefined,
|
|
93
87
|
["Mem", "IsSetOf"],
|
|
94
88
|
[
|
|
@@ -111,7 +105,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
111
105
|
axiom("StrLitDistinct", [value, other], `(distinct ${symbol} ${tla(`StrLit_${other}`)})`),
|
|
112
106
|
);
|
|
113
107
|
state.strings.push(value);
|
|
114
|
-
return
|
|
108
|
+
return declareSpec(
|
|
115
109
|
0,
|
|
116
110
|
["Mem", "StrSet"],
|
|
117
111
|
[axiom("StrLitIsstr", [value], `(${MEM} ${symbol} ${STR_SET})`), ...distinct],
|
|
@@ -125,12 +119,12 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
125
119
|
count === 0
|
|
126
120
|
? ["FunIsafcn", "Cast_Int", "Seq", "Len"]
|
|
127
121
|
: ["FunIsafcn", "FunDom", "FunApp", `SetEnum_${count}`, "Cast_Int", "Mem", "Seq", "Len"];
|
|
128
|
-
return
|
|
122
|
+
return declareSpec(count, deps, getTupleAxioms(count, state.isExcept));
|
|
129
123
|
}
|
|
130
124
|
const product = /^Product_(\d+)$/.exec(name);
|
|
131
125
|
if (product) {
|
|
132
126
|
const count = Number(product[1]);
|
|
133
|
-
return
|
|
127
|
+
return declareSpec(
|
|
134
128
|
count,
|
|
135
129
|
["Mem", `Tuple_${count}`, "FunApp", "Cast_Int", "Proj_Int"],
|
|
136
130
|
getComponentSet("Product", [count], symbol, tla(`Tuple_${count}`), getIntegers(count), "t"),
|
|
@@ -139,7 +133,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
139
133
|
const fields = state.recordFields.get(name);
|
|
140
134
|
if (fields && name.startsWith("Record_")) {
|
|
141
135
|
state.records.push(fields);
|
|
142
|
-
return
|
|
136
|
+
return declareSpec(
|
|
143
137
|
fields.length,
|
|
144
138
|
[
|
|
145
139
|
"FunIsafcn",
|
|
@@ -153,21 +147,25 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
153
147
|
}
|
|
154
148
|
if (fields && name.startsWith("RecordSet_")) {
|
|
155
149
|
const record = `Record_${fields.join("_")}`;
|
|
156
|
-
return
|
|
150
|
+
return declareSpec(
|
|
157
151
|
fields.length,
|
|
158
152
|
["Mem", record, "FunApp", ...fields.map((field) => `StrLit_${field}`)],
|
|
159
153
|
getComponentSet("RecSet", [fields], symbol, tla(record), getFieldKeys(fields), "r"),
|
|
160
154
|
);
|
|
161
155
|
}
|
|
162
156
|
const anonymous = state.anonymous.get(name);
|
|
163
|
-
if (anonymous !== undefined) return
|
|
157
|
+
if (anonymous !== undefined) return declareSpec(anonymous, [], []);
|
|
164
158
|
const typed = TYPED_OPERATORS[name];
|
|
165
159
|
if (typed)
|
|
166
|
-
return
|
|
160
|
+
return declareSpec(
|
|
161
|
+
typed[1],
|
|
162
|
+
["Cast_Int"],
|
|
163
|
+
[getTyping(name)],
|
|
164
|
+
name === "IntLteq" ? "Bool" : "Idv",
|
|
165
|
+
);
|
|
167
166
|
switch (name) {
|
|
168
|
-
// SMT-LIB has no exponentiation, so IntExp keeps only its typing.
|
|
169
167
|
case "IntExp":
|
|
170
|
-
return
|
|
168
|
+
return declareSpec(
|
|
171
169
|
2,
|
|
172
170
|
["Mem", "IntSet", "Cast_Int", "TIntLteq", "TIntLit_0", "TIntLit_1"],
|
|
173
171
|
[
|
|
@@ -179,7 +177,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
179
177
|
],
|
|
180
178
|
);
|
|
181
179
|
case "SelectSeq":
|
|
182
|
-
return
|
|
180
|
+
return createSpec(
|
|
183
181
|
undefined,
|
|
184
182
|
[
|
|
185
183
|
"Mem",
|
|
@@ -202,9 +200,9 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
202
200
|
],
|
|
203
201
|
);
|
|
204
202
|
case "Choose":
|
|
205
|
-
return
|
|
203
|
+
return createSpec(undefined, [], [axiom("ChooseDef", [], undefined)]);
|
|
206
204
|
case "Mem":
|
|
207
|
-
return
|
|
205
|
+
return declareSpec(
|
|
208
206
|
2,
|
|
209
207
|
["SetExtTrigger"],
|
|
210
208
|
[
|
|
@@ -217,7 +215,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
217
215
|
"Bool",
|
|
218
216
|
);
|
|
219
217
|
case "SubsetEq":
|
|
220
|
-
return
|
|
218
|
+
return declareSpec(
|
|
221
219
|
2,
|
|
222
220
|
["Mem"],
|
|
223
221
|
[
|
|
@@ -235,7 +233,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
235
233
|
"Bool",
|
|
236
234
|
);
|
|
237
235
|
case "Union":
|
|
238
|
-
return
|
|
236
|
+
return declareSpec(
|
|
239
237
|
1,
|
|
240
238
|
["Mem"],
|
|
241
239
|
[
|
|
@@ -252,7 +250,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
252
250
|
],
|
|
253
251
|
);
|
|
254
252
|
case "Subset":
|
|
255
|
-
return
|
|
253
|
+
return declareSpec(
|
|
256
254
|
1,
|
|
257
255
|
["Mem", "SubsetEq"],
|
|
258
256
|
[
|
|
@@ -277,8 +275,8 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
277
275
|
[],
|
|
278
276
|
`(forall ((a Idv) (b Idv) (x Idv)) (! (= (${MEM} x (${symbol} a b)) ${condition.replaceAll("MEM", MEM)}) :pattern ((${MEM} x (${symbol} a b))) :pattern ((${MEM} x a) (${symbol} a b)) :pattern ((${MEM} x b) (${symbol} a b))))`,
|
|
279
277
|
);
|
|
280
|
-
if (name !== "Cap") return
|
|
281
|
-
return
|
|
278
|
+
if (name !== "Cap") return declareSpec(2, ["Mem"], [definition]);
|
|
279
|
+
return declareSpec(
|
|
282
280
|
2,
|
|
283
281
|
["Mem", "SetEnum_0", "SetExtTrigger"],
|
|
284
282
|
[
|
|
@@ -292,13 +290,13 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
292
290
|
);
|
|
293
291
|
}
|
|
294
292
|
case "SetSt":
|
|
295
|
-
return
|
|
293
|
+
return createSpec(
|
|
296
294
|
undefined,
|
|
297
295
|
["Mem", "SetEnum_0", "SetExtTrigger"],
|
|
298
296
|
[axiom("SetStDef", [], undefined), axiom("EmptyComprehensionTrigger", [], undefined)],
|
|
299
297
|
);
|
|
300
298
|
case "NatSet":
|
|
301
|
-
return
|
|
299
|
+
return declareSpec(
|
|
302
300
|
0,
|
|
303
301
|
["IntSet", "TIntLit_0", "Cast_Int", "IntLteq"],
|
|
304
302
|
[
|
|
@@ -310,7 +308,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
310
308
|
],
|
|
311
309
|
);
|
|
312
310
|
case "IntRange":
|
|
313
|
-
return
|
|
311
|
+
return declareSpec(
|
|
314
312
|
2,
|
|
315
313
|
["Mem", "IntSet", "IntLteq"],
|
|
316
314
|
[
|
|
@@ -322,7 +320,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
322
320
|
],
|
|
323
321
|
);
|
|
324
322
|
case "FunIsafcn":
|
|
325
|
-
return
|
|
323
|
+
return declareSpec(
|
|
326
324
|
1,
|
|
327
325
|
["Mem", "FunDom", "FunFcn", "FunApp"],
|
|
328
326
|
[
|
|
@@ -336,7 +334,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
336
334
|
);
|
|
337
335
|
case "FunSet":
|
|
338
336
|
state.isFunSet = true;
|
|
339
|
-
return
|
|
337
|
+
return declareSpec(
|
|
340
338
|
2,
|
|
341
339
|
["Mem", "FunIsafcn", "FunDom", "FunApp"],
|
|
342
340
|
[
|
|
@@ -360,7 +358,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
360
358
|
);
|
|
361
359
|
case "FunFcn":
|
|
362
360
|
state.isFunConstr = true;
|
|
363
|
-
return
|
|
361
|
+
return createSpec(
|
|
364
362
|
undefined,
|
|
365
363
|
["FunIsafcn"],
|
|
366
364
|
[
|
|
@@ -369,13 +367,13 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
369
367
|
],
|
|
370
368
|
);
|
|
371
369
|
case "FunDom":
|
|
372
|
-
return
|
|
370
|
+
return declareSpec(1, ["FunFcn"], [axiom("FunDomDef", [], undefined)]);
|
|
373
371
|
case "FunApp":
|
|
374
|
-
return
|
|
372
|
+
return declareSpec(2, ["Mem", "FunFcn"], [axiom("FunAppDef", [], undefined)]);
|
|
375
373
|
case "FunExcept": {
|
|
376
374
|
state.isExcept = true;
|
|
377
375
|
const updated = `(${FUN_EXCEPT} f x y)`;
|
|
378
|
-
return
|
|
376
|
+
return declareSpec(
|
|
379
377
|
3,
|
|
380
378
|
["Mem", "FunIsafcn", "FunDom", "FunApp"],
|
|
381
379
|
[
|
|
@@ -406,7 +404,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
406
404
|
}
|
|
407
405
|
// tlapm labels SeqSetElim1 and SeqSetElim2 SetSetElim1 and SetSetElim2.
|
|
408
406
|
case "Seq":
|
|
409
|
-
return
|
|
407
|
+
return declareSpec(
|
|
410
408
|
1,
|
|
411
409
|
[
|
|
412
410
|
"Mem",
|
|
@@ -441,7 +439,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
441
439
|
],
|
|
442
440
|
);
|
|
443
441
|
case "Len":
|
|
444
|
-
return
|
|
442
|
+
return declareSpec(
|
|
445
443
|
1,
|
|
446
444
|
["FunDom", "IntRange", "Cast_Int"],
|
|
447
445
|
[
|
|
@@ -453,9 +451,9 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
453
451
|
],
|
|
454
452
|
);
|
|
455
453
|
case "BSeq":
|
|
456
|
-
return
|
|
454
|
+
return declareSpec(1, [], []);
|
|
457
455
|
case "Cat":
|
|
458
|
-
return
|
|
456
|
+
return declareSpec(2, SEQUENCE_DEPS, [
|
|
459
457
|
axiom(
|
|
460
458
|
"SeqCatTyping",
|
|
461
459
|
[],
|
|
@@ -478,7 +476,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
478
476
|
),
|
|
479
477
|
]);
|
|
480
478
|
case "Append":
|
|
481
|
-
return
|
|
479
|
+
return declareSpec(2, SEQUENCE_DEPS, [
|
|
482
480
|
axiom(
|
|
483
481
|
"SeqAppendTyping",
|
|
484
482
|
[],
|
|
@@ -501,7 +499,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
501
499
|
),
|
|
502
500
|
]);
|
|
503
501
|
case "Head":
|
|
504
|
-
return
|
|
502
|
+
return declareSpec(
|
|
505
503
|
1,
|
|
506
504
|
["FunApp", "Cast_Int"],
|
|
507
505
|
[
|
|
@@ -513,7 +511,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
513
511
|
],
|
|
514
512
|
);
|
|
515
513
|
case "Tail":
|
|
516
|
-
return
|
|
514
|
+
return declareSpec(1, SEQUENCE_DEPS, [
|
|
517
515
|
axiom(
|
|
518
516
|
"SeqTailTyping",
|
|
519
517
|
[],
|
|
@@ -532,7 +530,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
532
530
|
]);
|
|
533
531
|
case "SubSeq": {
|
|
534
532
|
const range = `(${SUB_SEQ} s (${CAST_INT} x) (${CAST_INT} y))`;
|
|
535
|
-
return
|
|
533
|
+
return declareSpec(
|
|
536
534
|
3,
|
|
537
535
|
["Mem", "Seq", "Len", "FunApp", "IntSet", "Cast_Int", "Proj_Int"],
|
|
538
536
|
[
|
|
@@ -555,7 +553,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
555
553
|
);
|
|
556
554
|
}
|
|
557
555
|
case "Cast_Int":
|
|
558
|
-
return
|
|
556
|
+
return createSpec(
|
|
559
557
|
declare(symbol, 1, "Idv", "Int"),
|
|
560
558
|
["Mem", "IntSet", "Proj_Int"],
|
|
561
559
|
[
|
|
@@ -577,7 +575,7 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
577
575
|
],
|
|
578
576
|
);
|
|
579
577
|
case "Cast_Bool":
|
|
580
|
-
return
|
|
578
|
+
return createSpec(
|
|
581
579
|
declare(symbol, 1, "Idv", "Bool"),
|
|
582
580
|
["Mem", "BoolSet", "Tt_Idv"],
|
|
583
581
|
[
|
|
@@ -599,9 +597,9 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
599
597
|
],
|
|
600
598
|
);
|
|
601
599
|
case "Proj_Int":
|
|
602
|
-
return
|
|
600
|
+
return createSpec(declare(symbol, 1, "Int"), [], []);
|
|
603
601
|
case "TrigEq_Set$Idv$":
|
|
604
|
-
return
|
|
602
|
+
return declareSpec(
|
|
605
603
|
2,
|
|
606
604
|
["SetExtTrigger"],
|
|
607
605
|
[
|
|
@@ -620,17 +618,16 @@ export const getSymbolSpec = (name: string, state: CollectState): SymbolSpec =>
|
|
|
620
618
|
);
|
|
621
619
|
case "SetExtTrigger":
|
|
622
620
|
case "IsSetOf":
|
|
623
|
-
return
|
|
621
|
+
return declareSpec(name === "IsSetOf" ? 1 : 2, [], [], "Bool");
|
|
624
622
|
case "BoolSet":
|
|
625
623
|
case "StrSet":
|
|
626
624
|
case "IntSet":
|
|
627
625
|
case "Tt_Idv":
|
|
628
|
-
return
|
|
626
|
+
return declareSpec(0, [], []);
|
|
629
627
|
case "TIntLteq":
|
|
630
|
-
return
|
|
628
|
+
return createSpec(undefined, ["IntLteq"], [getTyping("IntLteq")]);
|
|
631
629
|
default:
|
|
632
|
-
|
|
633
|
-
if (name.startsWith("TIntLit_")) return spec(undefined, [], []);
|
|
630
|
+
if (name.startsWith("TIntLit_")) return createSpec(undefined, [], []);
|
|
634
631
|
throw new TlaUnsupportedError(`the symbol ${name}`);
|
|
635
632
|
}
|
|
636
633
|
};
|
package/src/prover/smt/encode.ts
CHANGED
|
@@ -1,7 +1,3 @@
|
|
|
1
|
-
// Encodes a prepared proof obligation in SMT-LIB as tlapm's SMT backend does (encode/ and
|
|
2
|
-
// backend/smtlib.ml): TLA+ values share one sort Idv, set membership is the predicate TLA__Mem,
|
|
3
|
-
// and each symbol the obligation uses brings the symbols and axioms encode/n_data.ml lists for it.
|
|
4
|
-
|
|
5
1
|
import {
|
|
6
2
|
applyBuiltin,
|
|
7
3
|
at,
|
|
@@ -25,7 +21,6 @@ const isSameFieldSet = (left: RecordExpr, right: RecordExpr) =>
|
|
|
25
21
|
left.fields.every((field) => right.fields.some((other) => other.name === field.name)) &&
|
|
26
22
|
right.fields.every((field) => left.fields.some((other) => other.name === field.name));
|
|
27
23
|
|
|
28
|
-
// mk_conj: e1 /\ (e2 /\ ...).
|
|
29
24
|
const conjoinRight = (items: Expr[]): Expr =>
|
|
30
25
|
items.length === 1
|
|
31
26
|
? items[0]
|
|
@@ -45,8 +40,6 @@ const decompose = (left: Expr, right: Expr, from: Expr): Expr => {
|
|
|
45
40
|
);
|
|
46
41
|
};
|
|
47
42
|
|
|
48
|
-
// N_rewrite.simpl_receq, before Type.Synthesize: an equality of two record constructors with the same fields is the conjunction of
|
|
49
|
-
// the equalities of their fields, paired by name.
|
|
50
43
|
const simplifyRecordEqualities = (expression: Expr): Expr => {
|
|
51
44
|
const inner = mapChildren(expression, simplifyRecordEqualities);
|
|
52
45
|
if (
|
|
@@ -61,8 +54,7 @@ const simplifyRecordEqualities = (expression: Expr): Expr => {
|
|
|
61
54
|
return at(decompose(inner.args[0], inner.args[1], inner), inner);
|
|
62
55
|
};
|
|
63
56
|
|
|
64
|
-
//
|
|
65
|
-
// field values, so a record inside a record keeps the order it's written in.
|
|
57
|
+
// tlapm doesn't visit the field values, so a record inside a record keeps its written order.
|
|
66
58
|
const sortRecordFields = (expression: Expr): Expr =>
|
|
67
59
|
expression.kind === "Record" || expression.kind === "Rect"
|
|
68
60
|
? {
|
|
@@ -71,8 +63,6 @@ const sortRecordFields = (expression: Expr): Expr =>
|
|
|
71
63
|
}
|
|
72
64
|
: mapChildren(expression, sortRecordFields);
|
|
73
65
|
|
|
74
|
-
// N_axiomatize.collect: each symbol the obligation uses, in the order tlapm visits them, brings
|
|
75
|
-
// the symbols and axioms it depends on, smallest name first.
|
|
76
66
|
const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
77
67
|
const state: CollectState = {
|
|
78
68
|
recordFields: encoder.recordFields,
|
|
@@ -98,8 +88,6 @@ const collectSymbols = (entries: Entry[], encoder: Encoder) => {
|
|
|
98
88
|
spec.axioms.forEach((entry) => axioms.set(getAxiomKey(entry), entry));
|
|
99
89
|
}
|
|
100
90
|
};
|
|
101
|
-
// A flattened symbol stands for a builtin applied to its first-order arguments and then its
|
|
102
|
-
// higher-order ones, so its higher-order text is visited after its arguments.
|
|
103
91
|
const visit = (text: string) => {
|
|
104
92
|
const tokens = text.match(/[()]|[^\s()]+/g) ?? [];
|
|
105
93
|
const pending: { depth: number; text: string }[] = [];
|
|
@@ -132,12 +120,10 @@ type Encoder = ReturnType<typeof createEncoder>;
|
|
|
132
120
|
|
|
133
121
|
const HYPOTHESIS: Mode = { isOmitted: false, polarity: "Negative", at: undefined, depth: 0 };
|
|
134
122
|
|
|
135
|
-
// Prep.expand_defs substitutes visible definitions and pragmas, so they declare nothing.
|
|
136
123
|
const isExpanded = (hyp: Extract<Hyp, { kind: "Defn" }>) =>
|
|
137
124
|
hyp.definition.kind === "Bpragma" ||
|
|
138
125
|
(hyp.definition.kind === "Operator" && hyp.visibility === "Visible");
|
|
139
126
|
|
|
140
|
-
// Smtlib.is_sndord_fact: an ASSUME that declares an operator, which tlapm leaves out.
|
|
141
127
|
const isSecondOrder = (expression: Expr) =>
|
|
142
128
|
expression.kind === "Sequent" &&
|
|
143
129
|
expression.sequent.context.some((hyp) => hyp.kind === "Fresh" && hyp.shape > 0);
|
|
@@ -147,11 +133,10 @@ interface EncodedContext {
|
|
|
147
133
|
entries: Entry[];
|
|
148
134
|
}
|
|
149
135
|
|
|
150
|
-
// Declares each hypothesis's names and asserts its facts, in order, as Smtlib.pp_print_obligation.
|
|
151
136
|
const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
152
137
|
context.reduce<EncodedContext>(
|
|
153
138
|
(state, hyp) => {
|
|
154
|
-
const
|
|
139
|
+
const extend = (binding: Binding, entries: Entry[] = []) => ({
|
|
155
140
|
env: encoder.push(state.env, binding),
|
|
156
141
|
entries: [...state.entries, ...entries],
|
|
157
142
|
});
|
|
@@ -163,16 +148,15 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
163
148
|
? { kind: "constant", symbol }
|
|
164
149
|
: { kind: "operator", symbol, arity: hyp.shape };
|
|
165
150
|
const declaration = declare(symbol, hyp.shape);
|
|
166
|
-
if (!hyp.domain || hyp.domainVisibility === "Hidden")
|
|
167
|
-
|
|
151
|
+
if (!hyp.domain || hyp.domainVisibility === "Hidden")
|
|
152
|
+
return extend(binding, [declaration]);
|
|
168
153
|
const fact = `(assert (${MEM} ${symbol} ${encoder.encodeIdv(hyp.domain, state.env, HYPOTHESIS)}))`;
|
|
169
|
-
return
|
|
154
|
+
return extend(binding, [declaration, ...encoder.getEntries(fact)]);
|
|
170
155
|
}
|
|
171
|
-
// Rewrite.elim_flex: a variable is two constants, the second for its primed value.
|
|
172
156
|
case "Flex": {
|
|
173
157
|
const symbol = encoder.getUniqueName(hyp.name);
|
|
174
158
|
const primed = encoder.getUniqueName(`${hyp.name}_prime`);
|
|
175
|
-
return
|
|
159
|
+
return extend({ kind: "variable", name: hyp.name, symbol, primed }, [
|
|
176
160
|
declare(symbol, 0),
|
|
177
161
|
declare(primed, 0),
|
|
178
162
|
]);
|
|
@@ -180,38 +164,38 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
180
164
|
case "Defn": {
|
|
181
165
|
const definition = hyp.definition;
|
|
182
166
|
if (isExpanded(hyp))
|
|
183
|
-
return
|
|
167
|
+
return extend({ kind: "unsupported", reason: "an expanded definition" });
|
|
184
168
|
if (definition.kind === "Instance")
|
|
185
|
-
return
|
|
169
|
+
return extend({ kind: "unsupported", reason: "an instance" });
|
|
186
170
|
if (definition.kind === "Recursive") {
|
|
187
171
|
const symbol = encoder.getUniqueName(`CONSTANT_${definition.name}_`);
|
|
188
|
-
return
|
|
172
|
+
return extend({ kind: "operator", symbol, arity: definition.shape }, [
|
|
189
173
|
declare(symbol, definition.shape),
|
|
190
174
|
]);
|
|
191
175
|
}
|
|
192
176
|
if (definition.kind !== "Operator")
|
|
193
|
-
return
|
|
177
|
+
return extend({ kind: "unsupported", reason: "a definition" });
|
|
194
178
|
const body = definition.body;
|
|
195
179
|
const params = body.kind === "Lambda" ? body.params : [];
|
|
196
180
|
if (params.some((param) => param.shape > 0))
|
|
197
|
-
return
|
|
181
|
+
return extend({
|
|
198
182
|
kind: "secondOrder",
|
|
199
183
|
name: definition.name,
|
|
200
184
|
shapes: params.map((param) => param.shape),
|
|
201
185
|
});
|
|
202
186
|
const symbol = encoder.getUniqueName(definition.name);
|
|
203
|
-
return
|
|
187
|
+
return extend({ kind: "operator", symbol, arity: params.length }, [
|
|
204
188
|
declare(symbol, params.length),
|
|
205
189
|
]);
|
|
206
190
|
}
|
|
207
191
|
case "Fact": {
|
|
208
192
|
const binding: Binding = { kind: "unsupported", reason: "a reference to a fact" };
|
|
209
|
-
if (hyp.visibility === "Hidden") return
|
|
193
|
+
if (hyp.visibility === "Hidden") return extend(binding);
|
|
210
194
|
const isOmitted = isSecondOrder(hyp.expression);
|
|
211
195
|
const entries = encoder.getEntries(
|
|
212
196
|
`(assert ${encoder.encodeBool(hyp.expression, state.env, { ...HYPOTHESIS, isOmitted })})`,
|
|
213
197
|
);
|
|
214
|
-
return
|
|
198
|
+
return extend(
|
|
215
199
|
binding,
|
|
216
200
|
isOmitted
|
|
217
201
|
? entries.map((entry) => (typeof entry === "string" ? { omitted: entry } : entry))
|
|
@@ -223,9 +207,6 @@ const encodeContext = (context: Hyp[], encoder: Encoder) =>
|
|
|
223
207
|
{ env: undefined, entries: [] },
|
|
224
208
|
);
|
|
225
209
|
|
|
226
|
-
// Smtlib.pp_print_obligation: the logic, the sort, the builtin symbols by name, their axioms,
|
|
227
|
-
// then the hypotheses in order, the goal last. It throws a TlaUnsupportedError for what the
|
|
228
|
-
// encoding can't express, where tlapm's encoder fails.
|
|
229
210
|
export const encodeSmt = (prepared: Sequent, session: EncodingSession) => {
|
|
230
211
|
const simplified = sortRecordFields(
|
|
231
212
|
simplifyRecordEqualities({ kind: "Sequent", sequent: prepared }),
|
|
@@ -258,8 +239,6 @@ export const encodeSmt = (prepared: Sequent, session: EncodingSession) => {
|
|
|
258
239
|
return "omitted" in entry ? [] : entry.getLines(keys);
|
|
259
240
|
}),
|
|
260
241
|
];
|
|
261
|
-
// Smtlib.collect_sorts declares Idv only when a symbol or a bound variable has that sort.
|
|
262
|
-
// Type.Synthesize gives that sort to each definition left in the context, though none is printed.
|
|
263
242
|
const isIdvUsed =
|
|
264
243
|
lines.some((line) => /\bIdv\b/.test(line)) ||
|
|
265
244
|
sequent.context.some(
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Standardize.set_extensionality_visitor: an equality of sets where it may need proving triggers
|
|
2
|
-
// the set extensionality axiom, through TrigEq.
|
|
3
|
-
|
|
4
1
|
import {
|
|
5
2
|
CAP,
|
|
6
3
|
CUP,
|
|
@@ -16,14 +13,10 @@ import {
|
|
|
16
13
|
|
|
17
14
|
export type Polarity = "Positive" | "Negative" | "Neither";
|
|
18
15
|
|
|
19
|
-
// The head of a set equality whose polarity keeps it from triggering set extensionality unless a
|
|
20
|
-
// cast encloses it: (?trigger triggered kept).
|
|
21
16
|
const UNRESOLVED_TRIGGER = "?trigger";
|
|
22
17
|
|
|
23
18
|
const SET_HEADS = new Set([UNION, SUBSET, CUP, CAP, SET_MINUS, INT_RANGE, FUN_SET, SEQ]);
|
|
24
19
|
|
|
25
|
-
// Standardize.is_set: the applications of constructors whose values are sets. Standardize leaves
|
|
26
|
-
// BOOLEAN, STRING, Int, and Nat as bare symbols, which is_set doesn't match.
|
|
27
20
|
const isSetTerm = (text: string) => {
|
|
28
21
|
const head = /^\(?([^\s()]+)/.exec(text)?.[1] ?? "";
|
|
29
22
|
return (
|
|
@@ -34,7 +27,6 @@ const isSetTerm = (text: string) => {
|
|
|
34
27
|
);
|
|
35
28
|
};
|
|
36
29
|
|
|
37
|
-
// Picks the triggered or the kept form of each unresolved set equality in text.
|
|
38
30
|
export const resolveTriggers = (text: string, isTriggered: boolean): string => {
|
|
39
31
|
const start = text.indexOf(`(${UNRESOLVED_TRIGGER} `);
|
|
40
32
|
if (start === -1) return text;
|
|
@@ -47,7 +39,6 @@ export const resolveTriggers = (text: string, isTriggered: boolean): string => {
|
|
|
47
39
|
return text.slice(0, start) + chosen + resolveTriggers(text.slice(keptEnd + 1), isTriggered);
|
|
48
40
|
};
|
|
49
41
|
|
|
50
|
-
// The equality, or disequality, of two Idv terms at a polarity.
|
|
51
42
|
export const getEquality = (
|
|
52
43
|
left: string,
|
|
53
44
|
right: string,
|
|
@@ -58,7 +49,6 @@ export const getEquality = (
|
|
|
58
49
|
const kept = isNegated ? `(distinct ${left} ${right})` : `(= ${left} ${right})`;
|
|
59
50
|
if (!isSetTerm(left) && !isSetTerm(right)) return kept;
|
|
60
51
|
const text = isNegated ? `(not ${triggered})` : triggered;
|
|
61
|
-
// A cast around the equality may still trigger it, so both forms wait for resolveTriggers.
|
|
62
52
|
return polarity === (isNegated ? "Positive" : "Negative")
|
|
63
53
|
? `(${UNRESOLVED_TRIGGER} ${text} ${kept})`
|
|
64
54
|
: text;
|