tla-ts 0.0.9 → 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/README.md +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -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 +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- 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 +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- 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 +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- 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 +8 -13
- package/src/prover/deciders.ts +3 -7
- 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 +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- 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 +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- 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 +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- 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 +2 -15
- 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 +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- 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 +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- 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 +27 -47
- 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 +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- 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 +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- 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 +663 -667
- 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 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- 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 +7 -64
- 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 +4 -35
- 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 +1 -6
- 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 +7 -100
- 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 +9 -102
- 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 +36 -135
- 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 +18 -58
- 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 +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- 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 -52
- 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 +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- 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 +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- 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 +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- 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 +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- 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 +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- 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 +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- 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 +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- 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 +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- 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 +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -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 +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
// tlapm's
|
|
2
|
-
// modules a module depends on (Module.Dep), and substitution in units (Module.Subst).
|
|
1
|
+
// A port of tlapm's Module.Standard, Module.Flatten, Module.Dep and Module.Subst.
|
|
3
2
|
|
|
4
3
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
4
|
import {
|
|
6
5
|
at,
|
|
7
6
|
exprifySequent,
|
|
7
|
+
getDefinitionHyp,
|
|
8
8
|
getFact,
|
|
9
9
|
getFresh,
|
|
10
10
|
mapAccumulate,
|
|
@@ -54,8 +54,6 @@ type ModuleUnitCore =
|
|
|
54
54
|
| { kind: "Mutate"; mode: "Use" | "Hide"; usable: Usable }
|
|
55
55
|
| { kind: "Anoninst"; instance: InstanceDefinition; isLocal: boolean };
|
|
56
56
|
|
|
57
|
-
// depth is the size of the context the module was normalized in, which instantiation shifts
|
|
58
|
-
// its body by.
|
|
59
57
|
export interface Mule {
|
|
60
58
|
name: string;
|
|
61
59
|
extendees: string[];
|
|
@@ -156,7 +154,6 @@ const getStandardModule = (name: string, body: ModuleUnit[]): Mule => ({
|
|
|
156
154
|
isStandard: true,
|
|
157
155
|
});
|
|
158
156
|
|
|
159
|
-
// Module.Standard.initctx, apart from $TLAPM, whose Builtins! names no module of the corpora uses.
|
|
160
157
|
export const STANDARD_MODULES = new Map(
|
|
161
158
|
[
|
|
162
159
|
getStandardModule("Naturals", NATURALS),
|
|
@@ -176,31 +173,26 @@ export const getUnitHyps = (unit: ModuleUnit): Hyp[] => {
|
|
|
176
173
|
location,
|
|
177
174
|
}));
|
|
178
175
|
case "Recursives":
|
|
179
|
-
return unit.declarations.map((declaration) =>
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
176
|
+
return unit.declarations.map((declaration) =>
|
|
177
|
+
getDefinitionHyp(
|
|
178
|
+
{ kind: "Recursive", name: declaration.name, shape: declaration.shape, location },
|
|
179
|
+
"User",
|
|
180
|
+
"Hidden",
|
|
181
|
+
false,
|
|
185
182
|
location,
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
visibility: "Hidden",
|
|
189
|
-
isLocal: false,
|
|
190
|
-
location,
|
|
191
|
-
}));
|
|
183
|
+
),
|
|
184
|
+
);
|
|
192
185
|
case "Variables":
|
|
193
186
|
return unit.names.map((name) => ({ kind: "Flex", name, location }));
|
|
194
187
|
case "Definition":
|
|
195
188
|
return [
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
isLocal: unit.isLocal,
|
|
189
|
+
getDefinitionHyp(
|
|
190
|
+
unit.definition,
|
|
191
|
+
unit.whereDefined,
|
|
192
|
+
unit.visibility,
|
|
193
|
+
unit.isLocal,
|
|
202
194
|
location,
|
|
203
|
-
|
|
195
|
+
),
|
|
204
196
|
];
|
|
205
197
|
case "Axiom":
|
|
206
198
|
case "Theorem": {
|
|
@@ -240,19 +232,16 @@ export const getHypSize = (unit: ModuleUnit) =>
|
|
|
240
232
|
: getUnitHyps(unit).length;
|
|
241
233
|
|
|
242
234
|
const getNamedFact = (name: string, expression: Expr, location: Locus | undefined): Hyp[] => [
|
|
243
|
-
|
|
244
|
-
kind: "
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
isLocal: false,
|
|
235
|
+
getDefinitionHyp(
|
|
236
|
+
{ kind: "Operator", name, body: expression, location },
|
|
237
|
+
"User",
|
|
238
|
+
"Visible",
|
|
239
|
+
false,
|
|
249
240
|
location,
|
|
250
|
-
|
|
241
|
+
),
|
|
251
242
|
getFact({ kind: "Ix", index: 1, location }, "Hidden", "Always", location),
|
|
252
243
|
];
|
|
253
244
|
|
|
254
|
-
// Module.Flatten.exports: what an extending module sees, with local definitions inlined like
|
|
255
|
-
// builtins and proofs omitted.
|
|
256
245
|
const getExports = (module: Mule): ModuleUnit[] =>
|
|
257
246
|
module.body.flatMap((unit): ModuleUnit[] => {
|
|
258
247
|
switch (unit.kind) {
|
|
@@ -271,7 +260,6 @@ const getExports = (module: Mule): ModuleUnit[] =>
|
|
|
271
260
|
}
|
|
272
261
|
});
|
|
273
262
|
|
|
274
|
-
// tlapm recurses on a module that extends itself until the stack overflows.
|
|
275
263
|
export const flatten = (
|
|
276
264
|
modules: Map<string, Mule>,
|
|
277
265
|
module: Mule,
|
|
@@ -295,8 +283,6 @@ export const flatten = (
|
|
|
295
283
|
};
|
|
296
284
|
};
|
|
297
285
|
|
|
298
|
-
// Module.Dep.external_deps: the modules a module extends or instantiates, including those of its
|
|
299
|
-
// submodules.
|
|
300
286
|
export const getDependencies = (module: Mule) => {
|
|
301
287
|
const dependencies = new Map<string, Locus | undefined>();
|
|
302
288
|
const addDependency = (name: string, location: Locus | undefined) => {
|
|
@@ -308,7 +294,6 @@ export const getDependencies = (module: Mule) => {
|
|
|
308
294
|
);
|
|
309
295
|
const locals = new Set<string>();
|
|
310
296
|
const submodules = new Map<string, Mule>();
|
|
311
|
-
// Every INSTANCE definition inside a value, such as one in a LET.
|
|
312
297
|
const addInstances = (value: unknown) => {
|
|
313
298
|
if (typeof value !== "object" || value === null) return;
|
|
314
299
|
if ("instance" in value && isInstanceDefinition(value.instance)) {
|
|
@@ -316,7 +301,6 @@ export const getDependencies = (module: Mule) => {
|
|
|
316
301
|
}
|
|
317
302
|
Object.values(value).forEach(addInstances);
|
|
318
303
|
};
|
|
319
|
-
// Leaves out the proofs of theorems.
|
|
320
304
|
const visit = (unit: ModuleUnit) => {
|
|
321
305
|
if (unit.kind !== "Submod") {
|
|
322
306
|
addInstances(unit.kind === "Theorem" ? unit.sequent : unit);
|
|
@@ -357,8 +341,6 @@ const substituteUsable = (substitution: Substitution, usable: Usable): Usable =>
|
|
|
357
341
|
}),
|
|
358
342
|
});
|
|
359
343
|
|
|
360
|
-
// Module.Subst.app_modunit. Instantiated theorems carry omitted proofs, which a substitution leaves
|
|
361
|
-
// alone.
|
|
362
344
|
const substituteUnit = (
|
|
363
345
|
substitution: Substitution,
|
|
364
346
|
unit: ModuleUnit,
|
|
@@ -417,7 +399,6 @@ const substituteUnit = (
|
|
|
417
399
|
export const substituteUnits = (substitution: Substitution, units: ModuleUnit[]) =>
|
|
418
400
|
mapAccumulate(substitution, units, substituteUnit)[1];
|
|
419
401
|
|
|
420
|
-
// A named theorem binds its name as a proof definition, which its statement shifts past.
|
|
421
402
|
export const bindTheoremName = (
|
|
422
403
|
name: string | undefined,
|
|
423
404
|
sequent: Sequent,
|
|
@@ -427,19 +408,13 @@ export const bindTheoremName = (
|
|
|
427
408
|
? { hyps: [], sequent }
|
|
428
409
|
: {
|
|
429
410
|
hyps: [
|
|
430
|
-
|
|
431
|
-
kind: "
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
body: at(exprifySequent(sequent), { location }),
|
|
436
|
-
location,
|
|
437
|
-
},
|
|
438
|
-
whereDefined: { kind: "Proof", time: "Always" },
|
|
439
|
-
visibility: "Visible",
|
|
440
|
-
isLocal: false,
|
|
411
|
+
getDefinitionHyp(
|
|
412
|
+
{ kind: "Operator", name, body: at(exprifySequent(sequent), { location }), location },
|
|
413
|
+
{ kind: "Proof", time: "Always" },
|
|
414
|
+
"Visible",
|
|
415
|
+
false,
|
|
441
416
|
location,
|
|
442
|
-
|
|
417
|
+
),
|
|
443
418
|
],
|
|
444
419
|
sequent: substituteSequent(shift(1), sequent),
|
|
445
420
|
};
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// A port of tlapm's Module.Elab
|
|
2
|
-
// instance into the units of the module it instantiates.
|
|
1
|
+
// A port of tlapm's Module.Elab.
|
|
3
2
|
|
|
4
3
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
4
|
import { lambdify } from "./action";
|
|
@@ -16,6 +15,7 @@ import {
|
|
|
16
15
|
getLocationText,
|
|
17
16
|
getLocusPrefix,
|
|
18
17
|
getScopeHyps,
|
|
18
|
+
getTrue,
|
|
19
19
|
mapAccumulate,
|
|
20
20
|
type Defn,
|
|
21
21
|
type Expr,
|
|
@@ -48,8 +48,6 @@ import {
|
|
|
48
48
|
} from "./substitution";
|
|
49
49
|
import { getScopeTime } from "./temporal";
|
|
50
50
|
|
|
51
|
-
// latestModules is the module context of the latest anonymization of an axiom, theorem or USE,
|
|
52
|
-
// which tlapm's anonymizer keeps using for the instances inside later definitions.
|
|
53
51
|
export interface Pipeline {
|
|
54
52
|
anonymizer: Anonymizer;
|
|
55
53
|
simplify: ReturnType<typeof createSimplifier>;
|
|
@@ -77,7 +75,7 @@ const lambdifyTheorem = (
|
|
|
77
75
|
const message = `${error.failure}\nCould not instantiate the theorem ${name === undefined ? "" : `named: ${name}, `}at: ${getLocationText(location)}`;
|
|
78
76
|
pipeline.onWarning({ text: `${getAtPrefix(location)}[ERROR]${message}`, channel: "stdout" });
|
|
79
77
|
pipeline.onWarning({ text: message, channel: "toolboxOnly" });
|
|
80
|
-
return { context: [], active:
|
|
78
|
+
return { context: [], active: getTrue(sequent.active) };
|
|
81
79
|
}
|
|
82
80
|
};
|
|
83
81
|
|
|
@@ -92,9 +90,6 @@ const lambdifyUnit = (pipeline: Pipeline, scope: Scope | undefined, unit: Module
|
|
|
92
90
|
return { ...unit, definition: { ...definition, body } };
|
|
93
91
|
};
|
|
94
92
|
|
|
95
|
-
// lambdify_enabled_cdot: the ENABLED and \cdot of each definition and theorem statement bind
|
|
96
|
-
// their variables before instantiation substitutes for them. A theorem that cannot be lambdified
|
|
97
|
-
// states TRUE.
|
|
98
93
|
const lambdifyUnits = (
|
|
99
94
|
pipeline: Pipeline,
|
|
100
95
|
scope: Scope | undefined,
|
|
@@ -109,7 +104,6 @@ const lambdifyUnits = (
|
|
|
109
104
|
return [adjoinAll(current, getUnitHyps(lambdified)), lambdified];
|
|
110
105
|
});
|
|
111
106
|
|
|
112
|
-
// apply_subst: each parameter declaration of the instancee gives way to its substitute.
|
|
113
107
|
const applyParameters = (units: ModuleUnit[], substitutes: Map<string, Expr>) => {
|
|
114
108
|
const body: ModuleUnit[] = [];
|
|
115
109
|
let size = 0;
|
|
@@ -142,8 +136,6 @@ const applyParameters = (units: ModuleUnit[], substitutes: Map<string, Expr>) =>
|
|
|
142
136
|
return body;
|
|
143
137
|
};
|
|
144
138
|
|
|
145
|
-
// resub_for: references to the instancee's own units become applications to the instance
|
|
146
|
-
// arguments, which the definitions now bind themselves.
|
|
147
139
|
const getLocalSubstitution = (
|
|
148
140
|
count: number,
|
|
149
141
|
argumentCount: number,
|
|
@@ -171,8 +163,6 @@ const addParameters = (expression: Expr, args: string[]): Expr => {
|
|
|
171
163
|
: at({ kind: "Lambda", params, body: expression }, expression);
|
|
172
164
|
};
|
|
173
165
|
|
|
174
|
-
// localize: names the instancee's units under the instance name, salting its local definitions, and
|
|
175
|
-
// abstracts each over the instance arguments.
|
|
176
166
|
const localize = (
|
|
177
167
|
pipeline: Pipeline,
|
|
178
168
|
units: ModuleUnit[],
|
|
@@ -195,7 +185,7 @@ const localize = (
|
|
|
195
185
|
while (rest.length > 0) {
|
|
196
186
|
const [unit, ...tail] = rest;
|
|
197
187
|
rest = tail;
|
|
198
|
-
const
|
|
188
|
+
const localizeExpr = (expression: Expr) =>
|
|
199
189
|
addParameters(
|
|
200
190
|
substituteExpr(getLocalSubstitution(size, argumentCount, location), expression),
|
|
201
191
|
instance.args,
|
|
@@ -214,7 +204,7 @@ const localize = (
|
|
|
214
204
|
definition: {
|
|
215
205
|
...definition,
|
|
216
206
|
name: getLocalizedName(name),
|
|
217
|
-
body:
|
|
207
|
+
body: localizeExpr(definition.body),
|
|
218
208
|
},
|
|
219
209
|
whereDefined: unit.isLocal ? "Builtin" : unit.whereDefined,
|
|
220
210
|
isLocal: unit.isLocal || isLocal,
|
|
@@ -229,7 +219,7 @@ const localize = (
|
|
|
229
219
|
const axiom: ModuleUnit = {
|
|
230
220
|
...unit,
|
|
231
221
|
name: unit.name === undefined ? undefined : getLocalizedName(unit.name),
|
|
232
|
-
expression:
|
|
222
|
+
expression: localizeExpr(unit.expression),
|
|
233
223
|
};
|
|
234
224
|
body.push(axiom);
|
|
235
225
|
size += getHypSize(axiom);
|
|
@@ -239,7 +229,7 @@ const localize = (
|
|
|
239
229
|
complain(
|
|
240
230
|
`${getAtPrefix(location)}Warning: Instancing produces parametric theorems.\nSuch theorems will be forcibly hidden and cannot be cited.\n(This warning appears at-most once per INSTANCE declaration.)`,
|
|
241
231
|
);
|
|
242
|
-
const expression =
|
|
232
|
+
const expression = localizeExpr(at(exprifySequent(unit.sequent), unit));
|
|
243
233
|
body.push({
|
|
244
234
|
...unit,
|
|
245
235
|
name: unit.name === undefined ? undefined : getLocalizedName(unit.name),
|
|
@@ -264,8 +254,6 @@ const localize = (
|
|
|
264
254
|
return body;
|
|
265
255
|
};
|
|
266
256
|
|
|
267
|
-
// localize_axioms: an axiom becomes a hypothesis of each theorem after it, and a named one also a
|
|
268
|
-
// definition.
|
|
269
257
|
const localizeAxioms = (units: ModuleUnit[]) => {
|
|
270
258
|
const body: ModuleUnit[] = [];
|
|
271
259
|
let rest = units;
|
|
@@ -321,7 +309,6 @@ const getParameters = (module: Mule) =>
|
|
|
321
309
|
),
|
|
322
310
|
);
|
|
323
311
|
|
|
324
|
-
// Module.Elab.instantiate: the units of an instantiated module, in the context of the instance.
|
|
325
312
|
const instantiate = (
|
|
326
313
|
pipeline: Pipeline,
|
|
327
314
|
modules: Map<string, Mule>,
|
|
@@ -387,7 +374,6 @@ const instantiate = (
|
|
|
387
374
|
);
|
|
388
375
|
};
|
|
389
376
|
|
|
390
|
-
// make_defs: the definitions among the units an INSTANCE inside a LET or DEFINE stands for.
|
|
391
377
|
export const expandInstance = (
|
|
392
378
|
pipeline: Pipeline,
|
|
393
379
|
scope: Scope | undefined,
|
|
@@ -426,9 +412,6 @@ export const expandInstance = (
|
|
|
426
412
|
return definitions;
|
|
427
413
|
};
|
|
428
414
|
|
|
429
|
-
// Module.Elab.normalize: anonymizes each unit in the context of the ones before it, expands
|
|
430
|
-
// instances, merges repeated definitions, and simplifies the proofs of important modules. The
|
|
431
|
-
// result also joins the modules that later instances can name.
|
|
432
415
|
export const normalize = (
|
|
433
416
|
pipeline: Pipeline,
|
|
434
417
|
modules: Map<string, Mule>,
|
|
@@ -443,7 +426,6 @@ export const normalize = (
|
|
|
443
426
|
};
|
|
444
427
|
const isRedundant = (name: string | undefined) =>
|
|
445
428
|
name !== undefined && findNamed(current, name) !== undefined;
|
|
446
|
-
// Instantiated units arrive anonymized.
|
|
447
429
|
const queue = module.body.map((unit) => ({ unit, isAnonymized: false }));
|
|
448
430
|
for (let index = 0; index < queue.length; index++) {
|
|
449
431
|
const unit = queue[index].unit;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
//
|
|
1
|
+
// A port of tlapm's Optable.
|
|
2
2
|
|
|
3
3
|
import type { Builtin } from "./expression";
|
|
4
4
|
|
|
@@ -113,7 +113,6 @@ const OPERATORS: [string, number, number, Fixity, string[]][] = [
|
|
|
113
113
|
["\\propto", 5, 5, "InfixNon", []],
|
|
114
114
|
];
|
|
115
115
|
|
|
116
|
-
// OCaml's Hashtbl.find returns the most recent binding, so later aliases win over earlier names.
|
|
117
116
|
const OPERATOR_TABLE = new Map<string, Operator>();
|
|
118
117
|
for (const [name, low, high, fixity, aliases] of OPERATORS) {
|
|
119
118
|
const operator = { name, low, high, fixity };
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
// tlapm's
|
|
2
|
-
// E_parser.read_new_method reads into a Bpragma, and the old (*{ by (zenon) }*) of Method_prs.
|
|
1
|
+
// A port of tlapm's E_parser.read_new_method and Method_prs.
|
|
3
2
|
|
|
4
3
|
type PragmaValue =
|
|
5
4
|
| { kind: "Default" }
|
|
@@ -37,7 +36,6 @@ const skipBlanks = (lines: string[], position: Position) => {
|
|
|
37
36
|
}
|
|
38
37
|
};
|
|
39
38
|
|
|
40
|
-
// Where the pragma after start opens, past blanks and line ends.
|
|
41
39
|
export const findPragma = (lines: string[], start: Position) => {
|
|
42
40
|
const position = { ...start };
|
|
43
41
|
skipBlanks(lines, position);
|
|
@@ -84,7 +82,6 @@ const getValue = (token: Token | undefined): PragmaValue | undefined => {
|
|
|
84
82
|
return isPunct(token, "@") ? { kind: "Default" } : undefined;
|
|
85
83
|
};
|
|
86
84
|
|
|
87
|
-
// The methods of Method_prs's old pragma syntax, by the name Method.prover_meth_of_tac gives them.
|
|
88
85
|
const OLD_METHODS = new Map([
|
|
89
86
|
["smt", "smt"],
|
|
90
87
|
["cvc3", "cvc4"],
|
|
@@ -113,16 +110,12 @@ const OLD_METHODS = new Map([
|
|
|
113
110
|
["trivial", "trivial"],
|
|
114
111
|
]);
|
|
115
112
|
|
|
116
|
-
// An old-style method, with the tactic an isabelle method takes and the timeout in seconds an
|
|
117
|
-
// isabelle or zenon method may take.
|
|
118
113
|
export interface OldMethod {
|
|
119
114
|
name: string;
|
|
120
115
|
tactic?: string;
|
|
121
116
|
timeout?: number;
|
|
122
117
|
}
|
|
123
118
|
|
|
124
|
-
// Method_prs.read_method: the (*{ by (zenon) }*) after a BY, OBVIOUS, proof step, theorem, or
|
|
125
|
-
// axiom, which names one method, isabelle with a tactic, or zenon with a timeout and a fallback.
|
|
126
119
|
export const readOldMethod = (lines: string[], start: Position) => {
|
|
127
120
|
const tokens = tokenizePragma(lines, start);
|
|
128
121
|
if (!tokens) return undefined;
|
|
@@ -162,8 +155,6 @@ export const readOldMethod = (lines: string[], start: Position) => {
|
|
|
162
155
|
return index === tokens.length ? method : undefined;
|
|
163
156
|
};
|
|
164
157
|
|
|
165
|
-
// read_new_method: by (hint: value; ...), repeated, where a value is a string, a number, or @ for
|
|
166
|
-
// the argument the definition is applied to.
|
|
167
158
|
export const readNewMethod = (lines: string[], start: Position) => {
|
|
168
159
|
const tokens = tokenizePragma(lines, start);
|
|
169
160
|
if (!tokens) return undefined;
|