tla-ts 0.0.3 → 0.0.4-dev.1a3acf6
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 +46 -115
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +194 -8
- package/dist/index.d.ts +194 -8
- 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 +1006 -0
- package/dist/prove.js +1006 -0
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +1377 -18
- package/dist/transfer.js +1377 -18
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +24 -11
- package/src/ast.ts +149 -8
- package/src/bags.ts +26 -30
- package/src/builtins.ts +45 -19
- package/src/bundled-modules.ts +3 -3
- package/src/check.ts +1182 -900
- package/src/cli/options.ts +109 -0
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/cli/tlc.ts +941 -0
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +9 -2
- package/src/codegen.ts +112 -51
- package/src/config.ts +254 -181
- package/src/dependencies.ts +5 -7
- package/src/environment.ts +579 -184
- package/src/errors.ts +287 -4
- package/src/evaluate.ts +1095 -365
- package/src/exit-codes.ts +22 -43
- package/src/fingerprints.ts +49 -14
- package/src/index.ts +11 -0
- package/src/instances.ts +73 -60
- package/src/java-overrides.ts +183 -66
- package/src/json.ts +31 -36
- package/src/levels.ts +197 -54
- package/src/lexer.ts +127 -30
- package/src/liveness-checker.ts +894 -0
- package/src/liveness.ts +246 -596
- package/src/{obligation-action.ts → obligations/action.ts} +248 -74
- package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +618 -0
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/obligations/generate.ts +457 -0
- package/src/{obligations.ts → obligations/index.ts} +46 -32
- package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
- package/src/obligations/module.ts +445 -0
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +195 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
- package/src/obligations/regroup.ts +100 -0
- package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
- package/src/{obligation-source.ts → obligations/source.ts} +174 -216
- package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +321 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
- package/src/parallel-worker.ts +184 -235
- package/src/parallel.ts +156 -91
- package/src/parser.ts +490 -188
- package/src/pcal/ast.ts +755 -0
- package/src/pcal/parse.ts +1487 -0
- package/src/pcal/tokenize.ts +487 -0
- package/src/pcal/translate.ts +1151 -0
- package/src/pcal/validate.ts +444 -0
- package/src/prover/decide-pool.ts +95 -0
- package/src/prover/deciders.ts +33 -0
- package/src/prover/first-order.ts +175 -0
- package/src/prover/isabelle/LICENSE +36 -0
- package/src/prover/isabelle/LICENSE-tlapm +26 -0
- package/src/prover/isabelle/decide.ts +44 -0
- package/src/prover/isabelle/encode.ts +445 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prover/isabelle/isar/method.ts +367 -0
- package/src/prover/isabelle/isar/proof.ts +28 -0
- package/src/prover/isabelle/isar/statement.ts +57 -0
- package/src/prover/isabelle/isar/theory.ts +192 -0
- package/src/prover/isabelle/isar/type-check.ts +278 -0
- package/src/prover/isabelle/provers/blast/blast.ts +258 -0
- package/src/prover/isabelle/provers/blast/branch.ts +322 -0
- package/src/prover/isabelle/provers/blast/prove.ts +347 -0
- package/src/prover/isabelle/provers/blast/rules.ts +330 -0
- package/src/prover/isabelle/provers/blast/state.ts +180 -0
- package/src/prover/isabelle/provers/blast/term.ts +546 -0
- package/src/prover/isabelle/provers/clasimp.ts +150 -0
- package/src/prover/isabelle/provers/classical.ts +389 -0
- package/src/prover/isabelle/provers/hypsubst.ts +433 -0
- package/src/prover/isabelle/pure/bicompose.ts +174 -0
- package/src/prover/isabelle/pure/consts.ts +32 -0
- package/src/prover/isabelle/pure/conv.ts +79 -0
- package/src/prover/isabelle/pure/drule.ts +264 -0
- package/src/prover/isabelle/pure/envir.ts +331 -0
- package/src/prover/isabelle/pure/goal.ts +53 -0
- package/src/prover/isabelle/pure/interrupt.ts +16 -0
- package/src/prover/isabelle/pure/list.ts +12 -0
- package/src/prover/isabelle/pure/logic.ts +330 -0
- package/src/prover/isabelle/pure/name.ts +98 -0
- package/src/prover/isabelle/pure/net.ts +215 -0
- package/src/prover/isabelle/pure/object-logic.ts +41 -0
- package/src/prover/isabelle/pure/pattern.ts +631 -0
- package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
- package/src/prover/isabelle/pure/rewriter.ts +602 -0
- package/src/prover/isabelle/pure/search.ts +68 -0
- package/src/prover/isabelle/pure/seq.ts +133 -0
- package/src/prover/isabelle/pure/simplifier.ts +106 -0
- package/src/prover/isabelle/pure/table.ts +201 -0
- package/src/prover/isabelle/pure/tactic.ts +168 -0
- package/src/prover/isabelle/pure/tactical.ts +264 -0
- package/src/prover/isabelle/pure/term-ord.ts +105 -0
- package/src/prover/isabelle/pure/term.ts +688 -0
- package/src/prover/isabelle/pure/thm.ts +783 -0
- package/src/prover/isabelle/pure/type.ts +121 -0
- package/src/prover/isabelle/pure/unify.ts +753 -0
- package/src/prover/isabelle/pure/variable.ts +25 -0
- package/src/prover/isabelle/tla/classical-setup.ts +101 -0
- package/src/prover/isabelle/tla/context.ts +74 -0
- package/src/prover/isabelle/tla/logic-data.ts +5 -0
- package/src/prover/isabelle/tla/logic.ts +215 -0
- package/src/prover/isabelle/tla/simpdata.ts +241 -0
- package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prover/ocaml.ts +22 -0
- package/src/prover/prep/action.ts +508 -0
- package/src/prover/prep/enabled-axioms.ts +189 -0
- package/src/prover/prep/fingerprint.ts +388 -0
- package/src/prover/prep/level-comparison.ts +529 -0
- package/src/prover/prep/md5.ts +60 -0
- package/src/prover/prep/methods.ts +221 -0
- package/src/prover/prep/normalize.ts +309 -0
- package/src/prover/prove-worker.ts +22 -0
- package/src/prover/prove.ts +492 -0
- package/src/prover/ptl/decide.ts +68 -0
- package/src/prover/ptl/encode.ts +244 -0
- package/src/prover/ptl/sat.ts +151 -0
- package/src/prover/ptl/tableau.ts +276 -0
- package/src/prover/smt/axioms.ts +209 -0
- package/src/prover/smt/context.ts +108 -0
- package/src/prover/smt/data.ts +636 -0
- package/src/prover/smt/encode.ts +275 -0
- package/src/prover/smt/extensionality.ts +65 -0
- package/src/prover/smt/flatten.ts +112 -0
- package/src/prover/smt/format.ts +154 -0
- package/src/prover/smt/instances.ts +181 -0
- package/src/prover/smt/rewrite.ts +766 -0
- package/src/prover/smt/solver/act-cache.ts +265 -0
- package/src/prover/smt/solver/arith-rewriter.ts +962 -0
- package/src/prover/smt/solver/array.ts +22 -0
- package/src/prover/smt/solver/asserted-formulas.ts +469 -0
- package/src/prover/smt/solver/ast-lt.ts +157 -0
- package/src/prover/smt/solver/ast-util.ts +91 -0
- package/src/prover/smt/solver/ast.ts +1315 -0
- package/src/prover/smt/solver/auf-solver.ts +572 -0
- package/src/prover/smt/solver/case-split-queue.ts +178 -0
- package/src/prover/smt/solver/cg-table.ts +175 -0
- package/src/prover/smt/solver/clause.ts +276 -0
- package/src/prover/smt/solver/conflict-resolution.ts +343 -0
- package/src/prover/smt/solver/context.ts +1292 -0
- package/src/prover/smt/solver/ctx-simplify.ts +334 -0
- package/src/prover/smt/solver/der.ts +224 -0
- package/src/prover/smt/solver/dyn-ack.ts +141 -0
- package/src/prover/smt/solver/e-matching.ts +659 -0
- package/src/prover/smt/solver/enode.ts +259 -0
- package/src/prover/smt/solver/expr-ref.ts +21 -0
- package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prover/smt/solver/fingerprints.ts +92 -0
- package/src/prover/smt/solver/flat-literals.ts +51 -0
- package/src/prover/smt/solver/goal.ts +138 -0
- package/src/prover/smt/solver/hash.ts +173 -0
- package/src/prover/smt/solver/hashtable.ts +166 -0
- package/src/prover/smt/solver/internalizer.ts +1381 -0
- package/src/prover/smt/solver/lbool.ts +5 -0
- package/src/prover/smt/solver/literal.ts +24 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prover/smt/solver/lp/constraints.ts +78 -0
- package/src/prover/smt/solver/lp/containers.ts +296 -0
- package/src/prover/smt/solver/lp/core-solver.ts +504 -0
- package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
- package/src/prover/smt/solver/lp/dependency.ts +51 -0
- package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prover/smt/solver/lp/explanation.ts +46 -0
- package/src/prover/smt/solver/lp/gomory.ts +255 -0
- package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prover/smt/solver/lp/hnf.ts +281 -0
- package/src/prover/smt/solver/lp/int-cube.ts +295 -0
- package/src/prover/smt/solver/lp/int-solver.ts +514 -0
- package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prover/smt/solver/lp/lar-term.ts +62 -0
- package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prover/smt/solver/lp/nex.ts +120 -0
- package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prover/smt/solver/lp/nla-core.ts +968 -0
- package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prover/smt/solver/lp/nla-order.ts +307 -0
- package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prover/smt/solver/lp/nla-types.ts +124 -0
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prover/smt/solver/lp/pdd.ts +971 -0
- package/src/prover/smt/solver/lp/random-updater.ts +138 -0
- package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prover/smt/solver/lp/union-find.ts +96 -0
- package/src/prover/smt/solver/mam-compiler.ts +847 -0
- package/src/prover/smt/solver/mam-interpreter.ts +400 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prover/smt/solver/model-checker.ts +347 -0
- package/src/prover/smt/solver/model-evaluator.ts +262 -0
- package/src/prover/smt/solver/model-finder.ts +155 -0
- package/src/prover/smt/solver/model-generator.ts +97 -0
- package/src/prover/smt/solver/model-macro-solver.ts +728 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prover/smt/solver/nlsat/explain.ts +607 -0
- package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
- package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prover/smt/solver/nlsat/solver.ts +911 -0
- package/src/prover/smt/solver/nlsat/types.ts +43 -0
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prover/smt/solver/nnf.ts +469 -0
- package/src/prover/smt/solver/pattern-inference.ts +351 -0
- package/src/prover/smt/solver/poly-rewriter.ts +477 -0
- package/src/prover/smt/solver/propagate-values.ts +83 -0
- package/src/prover/smt/solver/proto-model.ts +551 -0
- package/src/prover/smt/solver/pull-quant.ts +139 -0
- package/src/prover/smt/solver/qe-lite-der.ts +526 -0
- package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prover/smt/solver/qe-lite.ts +381 -0
- package/src/prover/smt/solver/qi-queue.ts +362 -0
- package/src/prover/smt/solver/quant-tactics.ts +117 -0
- package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prover/smt/solver/quantifier-manager.ts +186 -0
- package/src/prover/smt/solver/random-gen.ts +10 -0
- package/src/prover/smt/solver/rational.ts +165 -0
- package/src/prover/smt/solver/ref-vector.ts +62 -0
- package/src/prover/smt/solver/relevancy.ts +247 -0
- package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prover/smt/solver/rewriter.ts +843 -0
- package/src/prover/smt/solver/rlimit.ts +79 -0
- package/src/prover/smt/solver/smtlib-parser.ts +526 -0
- package/src/prover/smt/solver/solver.ts +71 -0
- package/src/prover/smt/solver/sort.ts +35 -0
- package/src/prover/smt/solver/sticky-generations.ts +69 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prover/smt/solver/theory-lra-model.ts +243 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prover/smt/solver/theory-lra-state.ts +43 -0
- package/src/prover/smt/solver/theory-lra.ts +56 -0
- package/src/prover/smt/solver/var-subst.ts +258 -0
- package/src/prover/smt/solver/z3-license.txt +10 -0
- package/src/prover/smt/table.ts +170 -0
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/prover/tlapm/tlapm.ts +96 -0
- package/src/prover/tlaps-module.ts +510 -0
- package/src/prover/verdict.ts +13 -0
- package/src/prover/zenon/LICENSE +32 -0
- package/src/prover/zenon/check/check.ts +105 -0
- package/src/prover/zenon/check/definitions.ts +144 -0
- package/src/prover/zenon/check/equality.ts +182 -0
- package/src/prover/zenon/check/functions.ts +62 -0
- package/src/prover/zenon/check/keys.ts +125 -0
- package/src/prover/zenon/check/propositional.ts +104 -0
- package/src/prover/zenon/check/records.ts +188 -0
- package/src/prover/zenon/check/relations.ts +121 -0
- package/src/prover/zenon/check/rewrites.ts +224 -0
- package/src/prover/zenon/check/sets.ts +302 -0
- package/src/prover/zenon/check/terms.ts +127 -0
- package/src/prover/zenon/check/tla.ts +126 -0
- package/src/prover/zenon/decide.ts +107 -0
- package/src/prover/zenon/encode.ts +378 -0
- package/src/prover/zenon/eqrel.ts +300 -0
- package/src/prover/zenon/equality-rules.ts +435 -0
- package/src/prover/zenon/expr.ts +551 -0
- package/src/prover/zenon/index-table.ts +350 -0
- package/src/prover/zenon/isar-case.ts +513 -0
- package/src/prover/zenon/isar.ts +1249 -0
- package/src/prover/zenon/limits.ts +15 -0
- package/src/prover/zenon/llproof.ts +173 -0
- package/src/prover/zenon/mltoll.ts +1566 -0
- package/src/prover/zenon/node.ts +297 -0
- package/src/prover/zenon/ocaml.ts +169 -0
- package/src/prover/zenon/parse.ts +247 -0
- package/src/prover/zenon/phrase.ts +191 -0
- package/src/prover/zenon/proof.ts +198 -0
- package/src/prover/zenon/propositional-rules.ts +387 -0
- package/src/prover/zenon/rules.ts +94 -0
- package/src/prover/zenon/search.ts +288 -0
- package/src/prover/zenon/tla/functions.ts +151 -0
- package/src/prover/zenon/tla/llproof.ts +480 -0
- package/src/prover/zenon/tla/records.ts +225 -0
- package/src/prover/zenon/tla/rewrites.ts +447 -0
- package/src/prover/zenon/tla/sets.ts +304 -0
- package/src/prover/zenon/tla/terms.ts +162 -0
- package/src/prover/zenon/tla/tla.ts +506 -0
- package/src/randomization.ts +39 -27
- package/src/resolve.ts +1474 -426
- package/src/runtime.ts +25 -7
- package/src/sany/builtins.ts +147 -0
- package/src/sany/generator.ts +3111 -0
- package/src/sany/levels.ts +1205 -0
- package/src/sany/lexer.ts +544 -0
- package/src/sany/linter.ts +122 -0
- package/src/sany/modules.ts +1398 -0
- package/src/sany/nodes.ts +463 -0
- package/src/sany/parse-error.ts +2161 -0
- package/src/sany/report.ts +355 -0
- package/src/sany/selectors.ts +736 -0
- package/src/sany/source.ts +247 -0
- package/src/sany/xml.ts +1016 -0
- package/src/search.ts +969 -0
- package/src/spec-description.ts +66 -29
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +215 -164
- package/src/state-graph.ts +181 -0
- package/src/subexpressions.ts +231 -171
- package/src/substitution-levels.ts +40 -19
- package/src/successors.ts +253 -125
- package/src/symmetry.ts +194 -54
- package/src/tableau.ts +60 -32
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-modules.ts → tlc/jar-data.ts} +4 -0
- package/src/tlc/messages.ts +441 -0
- package/src/{tlc-order.ts → tlc/order.ts} +84 -16
- package/src/{tlc-random.ts → tlc/random.ts} +30 -189
- package/src/tlc/replay.ts +659 -0
- package/src/{tlc-summary.ts → tlc/summary.ts} +20 -5
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +59 -50
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +63 -45
- package/src/tlc/version.ts +19 -0
- package/src/transfer.ts +44 -32
- package/src/values.ts +843 -241
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -28
- package/dist/run-cli.js +0 -28
- package/src/canonical.ts +0 -39
- package/src/cli-options.ts +0 -58
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/run-cli.ts +0 -478
package/src/exit-codes.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { LivenessChecker } from "./liveness";
|
|
1
|
+
import type { LivenessChecker } from "./liveness-checker";
|
|
2
2
|
|
|
3
3
|
// TLC's exit statuses, from EC.ExitStatus.
|
|
4
4
|
export const EXIT_STATUS = {
|
|
@@ -17,12 +17,6 @@ export const EXIT_STATUS = {
|
|
|
17
17
|
} as const;
|
|
18
18
|
|
|
19
19
|
const exitCodes = new WeakMap<Error, number>();
|
|
20
|
-
const moduleExitCodes = new WeakMap<Error, number>();
|
|
21
|
-
const phase = { isNextState: false };
|
|
22
|
-
|
|
23
|
-
export const setNextStatePhase = (isNextState: boolean) => {
|
|
24
|
-
phase.isNextState = isNextState;
|
|
25
|
-
};
|
|
26
20
|
|
|
27
21
|
// The innermost site that knows TLC's exit status for an error sets it first and wins.
|
|
28
22
|
export const setExitCode = <Thrown>(error: Thrown, code: number) => {
|
|
@@ -30,46 +24,31 @@ export const setExitCode = <Thrown>(error: Thrown, code: number) => {
|
|
|
30
24
|
return error;
|
|
31
25
|
};
|
|
32
26
|
|
|
33
|
-
|
|
34
|
-
// escapes the computation of next states. In every other phase, the phase decides the code.
|
|
35
|
-
export const setModuleExitCode = (error: Error, code: number) => {
|
|
36
|
-
if (phase.isNextState) moduleExitCodes.set(error, code);
|
|
37
|
-
};
|
|
38
|
-
|
|
39
|
-
export const getExitCode = (error: Error) => exitCodes.get(error) ?? moduleExitCodes.get(error);
|
|
27
|
+
export const getExitCode = (error: Error) => exitCodes.get(error);
|
|
40
28
|
|
|
41
29
|
// TLC exits with 255 when it fails to process or evaluate a liveness property, in any phase.
|
|
42
|
-
|
|
43
|
-
create: () => LivenessChecker | undefined,
|
|
44
|
-
): LivenessChecker | undefined => {
|
|
30
|
+
const withErrorExitCode = <Result>(run: () => Result) => {
|
|
45
31
|
try {
|
|
46
|
-
|
|
47
|
-
return (
|
|
48
|
-
checker && {
|
|
49
|
-
addInitialState: (index, state) => {
|
|
50
|
-
try {
|
|
51
|
-
checker.addInitialState(index, state);
|
|
52
|
-
} catch (error) {
|
|
53
|
-
throw setExitCode(error, EXIT_STATUS.error);
|
|
54
|
-
}
|
|
55
|
-
},
|
|
56
|
-
addState: (index, state, successors) => {
|
|
57
|
-
try {
|
|
58
|
-
return checker.addState(index, state, successors);
|
|
59
|
-
} catch (error) {
|
|
60
|
-
throw setExitCode(error, EXIT_STATUS.error);
|
|
61
|
-
}
|
|
62
|
-
},
|
|
63
|
-
findViolation: () => {
|
|
64
|
-
try {
|
|
65
|
-
return checker.findViolation();
|
|
66
|
-
} catch (error) {
|
|
67
|
-
throw setExitCode(error, EXIT_STATUS.error);
|
|
68
|
-
}
|
|
69
|
-
},
|
|
70
|
-
}
|
|
71
|
-
);
|
|
32
|
+
return run();
|
|
72
33
|
} catch (error) {
|
|
73
34
|
throw setExitCode(error, EXIT_STATUS.error);
|
|
74
35
|
}
|
|
75
36
|
};
|
|
37
|
+
|
|
38
|
+
export const withLivenessExitCode = (
|
|
39
|
+
create: () => LivenessChecker | undefined,
|
|
40
|
+
): LivenessChecker | undefined => {
|
|
41
|
+
const checker = withErrorExitCode(create);
|
|
42
|
+
return (
|
|
43
|
+
checker && {
|
|
44
|
+
branches: checker.branches,
|
|
45
|
+
addInitialState: (index, state, tracing) =>
|
|
46
|
+
withErrorExitCode(() => checker.addInitialState(index, state, tracing)),
|
|
47
|
+
addState: (index, state, successors, tracing) =>
|
|
48
|
+
withErrorExitCode(() => checker.addState(index, state, successors, tracing)),
|
|
49
|
+
findViolation: () => withErrorExitCode(() => checker.findViolation()),
|
|
50
|
+
getViolatedProperties: (path, cycleStart) =>
|
|
51
|
+
withErrorExitCode(() => checker.getViolatedProperties(path, cycleStart)),
|
|
52
|
+
}
|
|
53
|
+
);
|
|
54
|
+
};
|
package/src/fingerprints.ts
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import { getValueFingerprint, getValueHash, type Value } from "./values";
|
|
2
2
|
|
|
3
3
|
const EMPTY = 0;
|
|
4
|
-
const TOMBSTONE = 1;
|
|
5
4
|
const INITIAL_CAPACITY = 1 << 12;
|
|
6
5
|
|
|
7
6
|
interface FingerprintTable {
|
|
8
7
|
insert: (first: number, second: number) => boolean;
|
|
9
|
-
remove: (first: number, second: number) => void;
|
|
10
8
|
}
|
|
11
9
|
|
|
12
|
-
const
|
|
10
|
+
const mixHash = (hash: number) => {
|
|
13
11
|
const first = Math.imul(hash ^ (hash >>> 16), 0x7feb352d);
|
|
14
12
|
const second = Math.imul(first ^ (first >>> 15), 0x846ca68b);
|
|
15
13
|
return second ^ (second >>> 16);
|
|
@@ -22,19 +20,17 @@ export const writeStateFingerprint = (state: Value[], fingerprint: Int32Array) =
|
|
|
22
20
|
first = Math.imul(first ^ getValueHash(state[index]), 0x01000193);
|
|
23
21
|
second = Math.imul(second ^ getValueFingerprint(state[index]), 0x5bd1e995);
|
|
24
22
|
}
|
|
25
|
-
fingerprint[0] =
|
|
26
|
-
fingerprint[1] =
|
|
23
|
+
fingerprint[0] = mixHash(first) || 1;
|
|
24
|
+
fingerprint[1] = mixHash(second);
|
|
27
25
|
};
|
|
28
26
|
|
|
29
|
-
export const getFingerprintOwner = (second: number, count: number) => (second >>> 0) % count;
|
|
30
|
-
|
|
31
27
|
export const createFingerprintTable = (): FingerprintTable => {
|
|
32
28
|
const table = { slots: new Int32Array(INITIAL_CAPACITY * 2), used: 0 };
|
|
33
29
|
const findSlot = (slots: Int32Array, first: number, second: number) => {
|
|
34
30
|
const mask = slots.length / 2 - 1;
|
|
35
31
|
for (let index = first & mask; ; index = (index + 1) & mask) {
|
|
36
32
|
const stored = slots[index * 2];
|
|
37
|
-
if (stored === EMPTY
|
|
33
|
+
if (stored === EMPTY) return index;
|
|
38
34
|
if (stored === first && slots[index * 2 + 1] === second) return index;
|
|
39
35
|
}
|
|
40
36
|
};
|
|
@@ -59,11 +55,50 @@ export const createFingerprintTable = (): FingerprintTable => {
|
|
|
59
55
|
table.used++;
|
|
60
56
|
return true;
|
|
61
57
|
},
|
|
62
|
-
remove: (first, second) => {
|
|
63
|
-
const slot = findSlot(table.slots, first, second);
|
|
64
|
-
if (table.slots[slot * 2] !== first) return;
|
|
65
|
-
table.slots[slot * 2] = EMPTY;
|
|
66
|
-
table.slots[slot * 2 + 1] = TOMBSTONE;
|
|
67
|
-
},
|
|
68
58
|
};
|
|
69
59
|
};
|
|
60
|
+
|
|
61
|
+
// Workers share one table of 64-bit fingerprints. The first word is never 0, so 0 marks an empty slot.
|
|
62
|
+
export interface SharedFingerprints {
|
|
63
|
+
slots: BigInt64Array;
|
|
64
|
+
used: Int32Array;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const INITIAL_SHARED_CAPACITY = 1 << 10;
|
|
68
|
+
|
|
69
|
+
const insertSharedKey = (slots: BigInt64Array, key: bigint) => {
|
|
70
|
+
const mask = slots.length - 1;
|
|
71
|
+
for (let index = Number(key >> 32n) & mask; ; index = (index + 1) & mask) {
|
|
72
|
+
const stored = Atomics.load(slots, index);
|
|
73
|
+
if (stored === key) return false;
|
|
74
|
+
if (stored !== 0n) continue;
|
|
75
|
+
const previous = Atomics.compareExchange(slots, index, 0n, key);
|
|
76
|
+
if (previous === 0n) return true;
|
|
77
|
+
if (previous === key) return false;
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
export const createSharedFingerprints = (): SharedFingerprints => ({
|
|
82
|
+
slots: new BigInt64Array(new SharedArrayBuffer(INITIAL_SHARED_CAPACITY * 8)),
|
|
83
|
+
used: new Int32Array(new SharedArrayBuffer(4)),
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
export const insertSharedFingerprint = (
|
|
87
|
+
table: SharedFingerprints,
|
|
88
|
+
first: number,
|
|
89
|
+
second: number,
|
|
90
|
+
) => {
|
|
91
|
+
const key = BigInt.asIntN(64, (BigInt(first) << 32n) | BigInt(second >>> 0));
|
|
92
|
+
if (!insertSharedKey(table.slots, key)) return false;
|
|
93
|
+
Atomics.add(table.used, 0, 1);
|
|
94
|
+
return true;
|
|
95
|
+
};
|
|
96
|
+
|
|
97
|
+
export const isSharedFingerprintsFull = (table: SharedFingerprints) =>
|
|
98
|
+
Atomics.load(table.used, 0) * 2 >= table.slots.length;
|
|
99
|
+
|
|
100
|
+
export const growSharedFingerprints = (table: SharedFingerprints): SharedFingerprints => {
|
|
101
|
+
const slots = new BigInt64Array(new SharedArrayBuffer(table.slots.byteLength * 2));
|
|
102
|
+
for (const key of table.slots) if (key !== 0n) insertSharedKey(slots, key);
|
|
103
|
+
return { slots, used: table.used };
|
|
104
|
+
};
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export type {
|
|
2
2
|
CheckOptions,
|
|
3
|
+
CheckProgress,
|
|
3
4
|
CheckResult,
|
|
4
5
|
CheckStatus,
|
|
5
6
|
EvaluationFailure,
|
|
@@ -17,6 +18,16 @@ export {
|
|
|
17
18
|
} from "./errors";
|
|
18
19
|
export { check } from "./parallel";
|
|
19
20
|
export { parseModule } from "./parser";
|
|
21
|
+
export { prove } from "./prover/prove";
|
|
22
|
+
export type {
|
|
23
|
+
ProofObligation,
|
|
24
|
+
ProofStatus,
|
|
25
|
+
ProveOptions,
|
|
26
|
+
ProveResult,
|
|
27
|
+
ProvedObligation,
|
|
28
|
+
TrivialObligation,
|
|
29
|
+
UnprovedObligation,
|
|
30
|
+
} from "./prover/prove";
|
|
20
31
|
export type { Module } from "./ast";
|
|
21
32
|
export { formatValue } from "./values";
|
|
22
33
|
export type { Value } from "./values";
|
package/src/instances.ts
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
1
|
+
import {
|
|
2
|
+
getChildren,
|
|
3
|
+
isLocallyResolved,
|
|
4
|
+
type Bound,
|
|
5
|
+
type BoundPattern,
|
|
6
|
+
type Definition,
|
|
7
|
+
type Expression,
|
|
8
|
+
type Instance,
|
|
9
|
+
type Module,
|
|
10
|
+
type OperatorParam,
|
|
11
|
+
type SourceLocation,
|
|
12
|
+
type Theorem,
|
|
11
13
|
} from "./ast";
|
|
12
14
|
import { TlaSyntaxError } from "./errors";
|
|
13
|
-
import {
|
|
14
|
-
import { getArity, getBoundNames, getPatternNames, isBefore } from "./resolve";
|
|
15
|
+
import { getArity, getBoundNames, getPatternNames, isBefore, LOCAL_RESOLUTION } from "./resolve";
|
|
15
16
|
|
|
16
17
|
export const substitutedExpressions = new WeakSet<Expression>();
|
|
17
18
|
|
|
@@ -78,7 +79,7 @@ export const mapChildren = (
|
|
|
78
79
|
expression: Expression,
|
|
79
80
|
map: (child: Expression, bound: string[]) => Expression,
|
|
80
81
|
): Expression => {
|
|
81
|
-
const
|
|
82
|
+
const mapUnbound = (child: Expression) => map(child, []);
|
|
82
83
|
switch (expression.kind) {
|
|
83
84
|
case "Number":
|
|
84
85
|
case "Decimal":
|
|
@@ -88,33 +89,33 @@ export const mapChildren = (
|
|
|
88
89
|
case "ExceptAt":
|
|
89
90
|
return expression;
|
|
90
91
|
case "Apply":
|
|
91
|
-
return { ...expression, args: expression.args.map(
|
|
92
|
+
return { ...expression, args: expression.args.map(mapUnbound) };
|
|
92
93
|
case "Lambda":
|
|
93
94
|
return { ...expression, body: map(expression.body, expression.params) };
|
|
94
95
|
case "And":
|
|
95
96
|
case "Or":
|
|
96
|
-
return { ...expression, operands: expression.operands.map(
|
|
97
|
+
return { ...expression, operands: expression.operands.map(mapUnbound) };
|
|
97
98
|
case "Prime":
|
|
98
99
|
case "Unchanged":
|
|
99
100
|
case "Enabled":
|
|
100
101
|
case "Always":
|
|
101
102
|
case "Eventually":
|
|
102
|
-
return { ...expression, expression:
|
|
103
|
+
return { ...expression, expression: mapUnbound(expression.expression) };
|
|
103
104
|
case "If":
|
|
104
105
|
return {
|
|
105
106
|
...expression,
|
|
106
|
-
condition:
|
|
107
|
-
consequent:
|
|
108
|
-
alternative:
|
|
107
|
+
condition: mapUnbound(expression.condition),
|
|
108
|
+
consequent: mapUnbound(expression.consequent),
|
|
109
|
+
alternative: mapUnbound(expression.alternative),
|
|
109
110
|
};
|
|
110
111
|
case "Case":
|
|
111
112
|
return {
|
|
112
113
|
...expression,
|
|
113
114
|
arms: expression.arms.map((arm) => ({
|
|
114
|
-
condition:
|
|
115
|
-
body:
|
|
115
|
+
condition: mapUnbound(arm.condition),
|
|
116
|
+
body: mapUnbound(arm.body),
|
|
116
117
|
})),
|
|
117
|
-
other: expression.other ?
|
|
118
|
+
other: expression.other ? mapUnbound(expression.other) : undefined,
|
|
118
119
|
};
|
|
119
120
|
case "Let": {
|
|
120
121
|
const names = expression.definitions.map((definition) => definition.name);
|
|
@@ -131,7 +132,7 @@ export const mapChildren = (
|
|
|
131
132
|
case "FunctionConstruction":
|
|
132
133
|
return {
|
|
133
134
|
...expression,
|
|
134
|
-
bounds: mapBounds(expression.bounds,
|
|
135
|
+
bounds: mapBounds(expression.bounds, mapUnbound),
|
|
135
136
|
body: map(expression.body, getBoundNames(expression.bounds)),
|
|
136
137
|
};
|
|
137
138
|
case "UnboundedQuantifier":
|
|
@@ -139,74 +140,80 @@ export const mapChildren = (
|
|
|
139
140
|
case "Choose":
|
|
140
141
|
return {
|
|
141
142
|
...expression,
|
|
142
|
-
set: expression.set ?
|
|
143
|
+
set: expression.set ? mapUnbound(expression.set) : undefined,
|
|
143
144
|
body: map(expression.body, getPatternNames(expression.pattern)),
|
|
144
145
|
};
|
|
145
146
|
case "SetEnumeration":
|
|
146
147
|
case "Tuple":
|
|
147
|
-
return { ...expression, elements: expression.elements.map(
|
|
148
|
+
return { ...expression, elements: expression.elements.map(mapUnbound) };
|
|
148
149
|
case "SetFilter":
|
|
149
150
|
return {
|
|
150
151
|
...expression,
|
|
151
|
-
bound: { pattern: expression.bound.pattern, set:
|
|
152
|
+
bound: { pattern: expression.bound.pattern, set: mapUnbound(expression.bound.set) },
|
|
152
153
|
predicate: map(expression.predicate, getPatternNames(expression.bound.pattern)),
|
|
153
154
|
};
|
|
154
155
|
case "SetMap":
|
|
155
156
|
return {
|
|
156
157
|
...expression,
|
|
157
|
-
bounds: mapBounds(expression.bounds,
|
|
158
|
+
bounds: mapBounds(expression.bounds, mapUnbound),
|
|
158
159
|
expression: map(expression.expression, getBoundNames(expression.bounds)),
|
|
159
160
|
};
|
|
160
161
|
case "FunctionSet":
|
|
161
|
-
return {
|
|
162
|
+
return {
|
|
163
|
+
...expression,
|
|
164
|
+
domain: mapUnbound(expression.domain),
|
|
165
|
+
range: mapUnbound(expression.range),
|
|
166
|
+
};
|
|
162
167
|
case "Record":
|
|
163
168
|
case "RecordSet":
|
|
164
169
|
return {
|
|
165
170
|
...expression,
|
|
166
|
-
fields: expression.fields.map((field) => ({
|
|
171
|
+
fields: expression.fields.map((field) => ({ ...field, value: mapUnbound(field.value) })),
|
|
167
172
|
};
|
|
168
173
|
case "Except":
|
|
169
174
|
return {
|
|
170
175
|
...expression,
|
|
171
|
-
function:
|
|
176
|
+
function: mapUnbound(expression.function),
|
|
172
177
|
updates: expression.updates.map((update) => ({
|
|
173
178
|
path: update.path.map((step) =>
|
|
174
|
-
step.kind === "Index" ? { kind: "Index", args: step.args.map(
|
|
179
|
+
step.kind === "Index" ? { kind: "Index", args: step.args.map(mapUnbound) } : step,
|
|
175
180
|
),
|
|
176
|
-
value:
|
|
181
|
+
value: mapUnbound(update.value),
|
|
177
182
|
})),
|
|
178
183
|
};
|
|
179
184
|
case "FunctionApplication":
|
|
180
185
|
return {
|
|
181
186
|
...expression,
|
|
182
|
-
function:
|
|
183
|
-
args: expression.args.map(
|
|
187
|
+
function: mapUnbound(expression.function),
|
|
188
|
+
args: expression.args.map(mapUnbound),
|
|
184
189
|
};
|
|
190
|
+
case "Bracket":
|
|
191
|
+
return { ...expression, args: expression.args.map(mapUnbound) };
|
|
185
192
|
case "FieldAccess":
|
|
186
|
-
return { ...expression, record:
|
|
193
|
+
return { ...expression, record: mapUnbound(expression.record) };
|
|
187
194
|
case "Product":
|
|
188
|
-
return { ...expression, factors: expression.factors.map(
|
|
195
|
+
return { ...expression, factors: expression.factors.map(mapUnbound) };
|
|
189
196
|
case "BoxAction":
|
|
190
197
|
case "AngleAction":
|
|
191
198
|
return {
|
|
192
199
|
...expression,
|
|
193
|
-
action:
|
|
194
|
-
subscript:
|
|
200
|
+
action: mapUnbound(expression.action),
|
|
201
|
+
subscript: mapUnbound(expression.subscript),
|
|
195
202
|
};
|
|
196
203
|
case "WeakFairness":
|
|
197
204
|
case "StrongFairness":
|
|
198
205
|
return {
|
|
199
206
|
...expression,
|
|
200
|
-
subscript:
|
|
201
|
-
action:
|
|
207
|
+
subscript: mapUnbound(expression.subscript),
|
|
208
|
+
action: mapUnbound(expression.action),
|
|
202
209
|
};
|
|
203
210
|
case "Label":
|
|
204
|
-
return { ...expression, body:
|
|
211
|
+
return { ...expression, body: mapUnbound(expression.body) };
|
|
205
212
|
case "Subexpression":
|
|
206
213
|
return {
|
|
207
214
|
...expression,
|
|
208
215
|
selectors: expression.selectors.map((selector) =>
|
|
209
|
-
"args" in selector ? { ...selector, args: selector.args.map(
|
|
216
|
+
"args" in selector ? { ...selector, args: selector.args.map(mapUnbound) } : selector,
|
|
210
217
|
),
|
|
211
218
|
};
|
|
212
219
|
}
|
|
@@ -218,7 +225,7 @@ interface Instantiation {
|
|
|
218
225
|
variables: Set<string>;
|
|
219
226
|
getDefinition: (key: string) => Definition | undefined;
|
|
220
227
|
isParameterized: (key: string) => boolean;
|
|
221
|
-
addDefinition: (name: string, create: (key: string) => Definition) => string;
|
|
228
|
+
addDefinition: (source: string, name: string, create: (key: string) => Definition) => string;
|
|
222
229
|
createName: (name: string) => string;
|
|
223
230
|
}
|
|
224
231
|
|
|
@@ -433,14 +440,14 @@ const substituteInEnabled = (
|
|
|
433
440
|
};
|
|
434
441
|
};
|
|
435
442
|
|
|
436
|
-
const createLocalIdentifier = (name: string, location: SourceLocation): Expression => ({
|
|
443
|
+
export const createLocalIdentifier = (name: string, location: SourceLocation): Expression => ({
|
|
437
444
|
kind: "Identifier",
|
|
438
445
|
name,
|
|
439
446
|
location,
|
|
440
|
-
resolution:
|
|
447
|
+
resolution: LOCAL_RESOLUTION,
|
|
441
448
|
});
|
|
442
449
|
|
|
443
|
-
const
|
|
450
|
+
export const createLocalArguments = (params: OperatorParam[], location: SourceLocation) =>
|
|
444
451
|
params.map((param) => createLocalIdentifier(param.name, location));
|
|
445
452
|
|
|
446
453
|
const getInstanceOperator = (
|
|
@@ -457,7 +464,7 @@ const getInstanceOperator = (
|
|
|
457
464
|
kind: "Apply",
|
|
458
465
|
operator: key,
|
|
459
466
|
args: [
|
|
460
|
-
...
|
|
467
|
+
...createLocalArguments(params, location),
|
|
461
468
|
...names.map((name) => createLocalIdentifier(name, location)),
|
|
462
469
|
],
|
|
463
470
|
location,
|
|
@@ -522,7 +529,7 @@ const substitute = (
|
|
|
522
529
|
return {
|
|
523
530
|
kind: "Apply",
|
|
524
531
|
operator: copy,
|
|
525
|
-
args:
|
|
532
|
+
args: createLocalArguments(params, expression.location),
|
|
526
533
|
location: expression.location,
|
|
527
534
|
};
|
|
528
535
|
}
|
|
@@ -533,13 +540,13 @@ const substitute = (
|
|
|
533
540
|
instantiation.substitutions.size > 0 ||
|
|
534
541
|
params.length > 0 ||
|
|
535
542
|
contextualApplications.has(expression);
|
|
536
|
-
const
|
|
543
|
+
const markContextual = (rewritten: Expression) => {
|
|
537
544
|
if (isContextual) contextualApplications.add(rewritten);
|
|
538
545
|
return rewritten;
|
|
539
546
|
};
|
|
540
547
|
if (replacement?.kind === "Identifier" || replacement?.kind === "OperatorReference") {
|
|
541
548
|
const operator = replacement.kind === "Identifier" ? replacement.name : replacement.operator;
|
|
542
|
-
return
|
|
549
|
+
return markContextual({
|
|
543
550
|
...expression,
|
|
544
551
|
operator,
|
|
545
552
|
args,
|
|
@@ -547,7 +554,7 @@ const substitute = (
|
|
|
547
554
|
});
|
|
548
555
|
}
|
|
549
556
|
if (replacement?.kind === "Apply") {
|
|
550
|
-
return
|
|
557
|
+
return markContextual({
|
|
551
558
|
...expression,
|
|
552
559
|
operator: replacement.operator,
|
|
553
560
|
args: [...replacement.args, ...args],
|
|
@@ -572,7 +579,7 @@ const substitute = (
|
|
|
572
579
|
...expression,
|
|
573
580
|
operator: LAMBDA_NAME,
|
|
574
581
|
args,
|
|
575
|
-
resolution:
|
|
582
|
+
resolution: LOCAL_RESOLUTION,
|
|
576
583
|
},
|
|
577
584
|
location: expression.location,
|
|
578
585
|
};
|
|
@@ -583,11 +590,11 @@ const substitute = (
|
|
|
583
590
|
);
|
|
584
591
|
}
|
|
585
592
|
const copy = getCopy(rewrite, expression.operator);
|
|
586
|
-
if (copy === undefined) return
|
|
593
|
+
if (copy === undefined) return markContextual({ ...expression, args });
|
|
587
594
|
return {
|
|
588
595
|
...expression,
|
|
589
596
|
operator: copy,
|
|
590
|
-
args: [...
|
|
597
|
+
args: [...createLocalArguments(params, expression.location), ...args],
|
|
591
598
|
};
|
|
592
599
|
}
|
|
593
600
|
if (expression.kind === "OperatorReference" && isFree(expression.operator)) {
|
|
@@ -639,7 +646,7 @@ const copyDefinition = (rewrite: Rewrite, key: string): string => {
|
|
|
639
646
|
const instantiation = rewrite.instantiation;
|
|
640
647
|
const definition = instantiation.getDefinition(key);
|
|
641
648
|
if (!definition) return key;
|
|
642
|
-
return instantiation.addDefinition(definition.name, (copyKey) => {
|
|
649
|
+
return instantiation.addDefinition(key, definition.name, (copyKey) => {
|
|
643
650
|
rewrite.copies.set(key, copyKey);
|
|
644
651
|
const rename = createRenamer(rewrite);
|
|
645
652
|
const mapped = renameParams(
|
|
@@ -678,7 +685,7 @@ export const createInstantiation = (instantiation: Instantiation) => {
|
|
|
678
685
|
if (copy !== undefined) return copy;
|
|
679
686
|
const definition = instantiation.getDefinition(key);
|
|
680
687
|
if (!definition) return key;
|
|
681
|
-
return instantiation.addDefinition(definition.name, () =>
|
|
688
|
+
return instantiation.addDefinition(key, definition.name, () =>
|
|
682
689
|
withInstanceParams(definition, instantiation.params, definition.location),
|
|
683
690
|
);
|
|
684
691
|
},
|
|
@@ -694,17 +701,23 @@ const expandLetInstances = (
|
|
|
694
701
|
instantiate: (instance: Instance, lets: Definition[]) => Definition[],
|
|
695
702
|
lets: Definition[],
|
|
696
703
|
): Expression => {
|
|
697
|
-
const
|
|
698
|
-
const mapped = mapChildren(expression, (child) =>
|
|
704
|
+
const visibleLets = expression.kind === "Let" ? [...lets, ...expression.definitions] : lets;
|
|
705
|
+
const mapped = mapChildren(expression, (child) =>
|
|
706
|
+
expandLetInstances(child, instantiate, visibleLets),
|
|
707
|
+
);
|
|
699
708
|
if (mapped.kind !== "Let" || !mapped.instances) return mapped;
|
|
700
709
|
const definitions = mapped.instances.reduce((current, instance) => {
|
|
701
710
|
const position = current.findIndex((definition) =>
|
|
702
711
|
isBefore(instance.location, definition.location),
|
|
703
712
|
);
|
|
704
713
|
const index = position === -1 ? current.length : position;
|
|
705
|
-
return [
|
|
714
|
+
return [
|
|
715
|
+
...current.slice(0, index),
|
|
716
|
+
...instantiate(instance, visibleLets),
|
|
717
|
+
...current.slice(index),
|
|
718
|
+
];
|
|
706
719
|
}, mapped.definitions);
|
|
707
|
-
return {
|
|
720
|
+
return { ...mapped, definitions };
|
|
708
721
|
};
|
|
709
722
|
|
|
710
723
|
// A named theorem's statement is linked as its definition.
|