tla-ts 0.0.4-dev.6dec595 → 0.0.4-dev.7714e32
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 +37 -126
- 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 +44 -12
- package/dist/index.d.ts +44 -12
- 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 +76 -92
- package/dist/transfer.js +76 -92
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +21 -12
- package/src/ast.ts +2 -2
- package/src/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1154
- package/src/{cli-options.ts → cli/options.ts} +54 -9
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/{run-cli.ts → cli/tlc.ts} +112 -718
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +17 -15
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +97 -35
- package/src/evaluate.ts +109 -108
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/index.ts +10 -0
- package/src/instances.ts +56 -46
- package/src/java-overrides.ts +79 -41
- package/src/json.ts +31 -36
- package/src/levels.ts +10 -13
- package/src/{live-check.ts → liveness-checker.ts} +169 -142
- package/src/liveness.ts +38 -34
- 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} +172 -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 +39 -51
- package/src/parallel.ts +39 -66
- package/src/parser.ts +67 -74
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
- package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
- package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
- package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
- 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 +19 -24
- package/src/resolve.ts +15 -22
- package/src/runtime.ts +8 -8
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +38 -55
- package/src/{sany-levels.ts → sany/levels.ts} +45 -48
- package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +16 -17
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
- package/src/{sany-source.ts → sany/source.ts} +6 -7
- package/src/{sany-xml.ts → sany/xml.ts} +5 -6
- package/src/search.ts +969 -0
- package/src/spec-description.ts +26 -20
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +16 -20
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +16 -19
- package/src/symmetry.ts +1 -1
- package/src/tableau.ts +6 -7
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -213
- package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
- package/src/transfer.ts +32 -32
- package/src/values.ts +80 -70
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -55
- package/dist/run-cli.js +0 -55
- package/src/canonical.ts +0 -40
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
- /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
package/src/evaluate.ts
CHANGED
|
@@ -16,7 +16,7 @@ import { getKindString } from "./builtins";
|
|
|
16
16
|
import { isStackOverflow, TlaEvaluationError, TlaUnassignedError } from "./errors";
|
|
17
17
|
import { EXIT_STATUS, setExitCode } from "./exit-codes";
|
|
18
18
|
import { generateEvaluator } from "./codegen";
|
|
19
|
-
import { MESSAGE_CODE } from "./tlc
|
|
19
|
+
import { MESSAGE_CODE } from "./tlc/messages";
|
|
20
20
|
import type { CheckerRuntime } from "./runtime";
|
|
21
21
|
import { getReadVariables } from "./dependencies";
|
|
22
22
|
import { contextualApplications, mapChildren, substitutedExpressions } from "./instances";
|
|
@@ -55,8 +55,7 @@ import {
|
|
|
55
55
|
isReducibleSet,
|
|
56
56
|
isSetValue,
|
|
57
57
|
isSettledValue,
|
|
58
|
-
|
|
59
|
-
MINIMUM_INTEGER,
|
|
58
|
+
isTlcInteger,
|
|
60
59
|
toFiniteFunction,
|
|
61
60
|
toFiniteSet,
|
|
62
61
|
updateFunction,
|
|
@@ -69,7 +68,7 @@ import {
|
|
|
69
68
|
markNormalized,
|
|
70
69
|
setTrace,
|
|
71
70
|
} from "./values";
|
|
72
|
-
import type { TlcVersion } from "./tlc
|
|
71
|
+
import type { TlcVersion } from "./tlc/version";
|
|
73
72
|
|
|
74
73
|
export type State = (Value | undefined)[];
|
|
75
74
|
|
|
@@ -252,14 +251,14 @@ export const describeNode = (expression: Expression) =>
|
|
|
252
251
|
? (expression.text ?? String(expression.value))
|
|
253
252
|
: describeRange(expression);
|
|
254
253
|
|
|
255
|
-
export const
|
|
254
|
+
export const createConditionError = (expression: Expression, value: Value) =>
|
|
256
255
|
new TlaEvaluationError(
|
|
257
256
|
`A non-boolean expression (${getKindString(value)}) was used as the condition of an IF.\n${describeRange(expression)}`,
|
|
258
257
|
);
|
|
259
258
|
|
|
260
259
|
// TLC parses an infix chain of /\ or \/ as nested binary junctions and a bulleted list as one
|
|
261
260
|
// junction list, and it words the error differently for each.
|
|
262
|
-
export const
|
|
261
|
+
export const createJunctionError = (
|
|
263
262
|
expression: Expression & { kind: "And" | "Or" },
|
|
264
263
|
index: number,
|
|
265
264
|
value: Value,
|
|
@@ -348,6 +347,27 @@ export const createBigNumberError = (expression: NumberExpression) =>
|
|
|
348
347
|
EXIT_STATUS.error,
|
|
349
348
|
);
|
|
350
349
|
|
|
350
|
+
// TLC's Tool#evalAppl fails to look up a variable the state doesn't assign.
|
|
351
|
+
export const createUnassignedError = (name: string, expression: Expression) =>
|
|
352
|
+
new TlaUnassignedError(
|
|
353
|
+
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
354
|
+
name,
|
|
355
|
+
);
|
|
356
|
+
|
|
357
|
+
// TLC's Tool#enabled reads the subscript of <<A>>_v in the successor as a state of its own, and
|
|
358
|
+
// names the fairness condition when A leaves a variable of v unassigned, unlike TLC 1.7.4's.
|
|
359
|
+
export const toUnspecifiedSubscriptError = (error: unknown, version: TlcVersion | undefined) =>
|
|
360
|
+
error instanceof TlaUnassignedError && version !== "1.7.4"
|
|
361
|
+
? new TlaEvaluationError(
|
|
362
|
+
`The action formula A appearing in a WF_v(A) or SF_v(A) operator does not specify the primed value of the variable ${error.variable} occurring in the state formula v.\n`,
|
|
363
|
+
)
|
|
364
|
+
: error;
|
|
365
|
+
|
|
366
|
+
export const createPrimeOutsideActionError = (expression: Expression) =>
|
|
367
|
+
new TlaEvaluationError(
|
|
368
|
+
`A primed expression appears outside an action at ${describeLocation(expression)}`,
|
|
369
|
+
);
|
|
370
|
+
|
|
351
371
|
export const lookupScope = (scope: Scope | undefined, name: string): Binding | undefined => {
|
|
352
372
|
for (let current = scope; current; current = current.parent) {
|
|
353
373
|
if (current.name === name) return current.binding;
|
|
@@ -567,12 +587,12 @@ export const forEachBinding = (
|
|
|
567
587
|
visit: (scope: Scope | undefined) => boolean,
|
|
568
588
|
) => forEachBoundElement(bounds, getBoundElements(bounds, context), context.scope, visit);
|
|
569
589
|
|
|
570
|
-
|
|
590
|
+
const getBoundsDomain = (bounds: Bound[], context: Context): Value => {
|
|
571
591
|
const sets = bounds.map((bound) => evaluate(bound.set, context));
|
|
572
592
|
return sets.length === 1 ? sets[0] : { kind: "ProductSet", factors: sets };
|
|
573
593
|
};
|
|
574
594
|
|
|
575
|
-
|
|
595
|
+
const bindArgument = (bounds: Bound[], scope: Scope | undefined, argument: Value) => {
|
|
576
596
|
if (bounds.length === 1) return bindPattern(scope, bounds[0].pattern, argument);
|
|
577
597
|
const components = getSequenceElements(argument) ?? [];
|
|
578
598
|
return bounds.reduce<Scope | undefined>(
|
|
@@ -965,6 +985,18 @@ const isOperatorArgument = (expression: Expression, context: Context) => {
|
|
|
965
985
|
return operator !== undefined && getArity(operator) > 0;
|
|
966
986
|
};
|
|
967
987
|
|
|
988
|
+
const evaluateBuiltinArguments = (args: Expression[], context: Context) =>
|
|
989
|
+
args.map((arg) =>
|
|
990
|
+
isOperatorArgument(arg, context)
|
|
991
|
+
? toOperatorValue(evaluateOperatorArgument(arg, context), context)
|
|
992
|
+
: evaluate(arg, context),
|
|
993
|
+
);
|
|
994
|
+
|
|
995
|
+
const createArityError = (closure: Closure, count: number) =>
|
|
996
|
+
new TlaEvaluationError(
|
|
997
|
+
`Operator ${closure.name} expects ${closure.params.length} arguments but received ${count}`,
|
|
998
|
+
);
|
|
999
|
+
|
|
968
1000
|
const createThunk = (expression: Expression, context: Context): Thunk => ({
|
|
969
1001
|
kind: "Thunk",
|
|
970
1002
|
expression,
|
|
@@ -1032,41 +1064,49 @@ export const bindOperatorArguments = (
|
|
|
1032
1064
|
closure: Closure,
|
|
1033
1065
|
args: Expression[],
|
|
1034
1066
|
context: Context,
|
|
1067
|
+
binders?: ArgumentBinder[],
|
|
1035
1068
|
): Scope | undefined => {
|
|
1036
|
-
if (args.length !== closure.params.length)
|
|
1037
|
-
throw new TlaEvaluationError(
|
|
1038
|
-
`Operator ${closure.name} expects ${closure.params.length} arguments but received ${args.length}`,
|
|
1039
|
-
);
|
|
1040
|
-
}
|
|
1069
|
+
if (args.length !== closure.params.length) throw createArityError(closure, args.length);
|
|
1041
1070
|
let scope = closure.scope;
|
|
1042
1071
|
for (let index = 0; index < args.length; index++) {
|
|
1043
1072
|
const param = closure.params[index];
|
|
1044
1073
|
const binding: Binding =
|
|
1045
1074
|
param.arity > 0
|
|
1046
1075
|
? { kind: "Operator", operator: evaluateOperatorArgument(args[index], context) }
|
|
1047
|
-
: getArgumentBinder(args[index], context.environment)(context);
|
|
1076
|
+
: (binders?.[index] ?? getArgumentBinder(args[index], context.environment))(context);
|
|
1048
1077
|
scope = { name: param.name, binding, parent: scope };
|
|
1049
1078
|
}
|
|
1050
1079
|
return scope;
|
|
1051
1080
|
};
|
|
1052
1081
|
|
|
1053
|
-
|
|
1082
|
+
// The body a call site last called and its evaluator, as a site mostly calls one closure.
|
|
1083
|
+
interface CalledBody {
|
|
1084
|
+
body: Expression;
|
|
1085
|
+
evaluator: Evaluator;
|
|
1086
|
+
}
|
|
1087
|
+
|
|
1088
|
+
const callOperator = (
|
|
1089
|
+
operator: Operator,
|
|
1090
|
+
args: Expression[],
|
|
1091
|
+
context: Context,
|
|
1092
|
+
called: { entry: CalledBody | undefined },
|
|
1093
|
+
binders: ArgumentBinder[],
|
|
1094
|
+
) => {
|
|
1054
1095
|
if (operator.kind === "Closure") {
|
|
1055
|
-
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1096
|
+
const bodyContext = withScope(context, bindOperatorArguments(operator, args, context, binders));
|
|
1097
|
+
if (context.environment.callStack) return evaluate(operator.body, bodyContext);
|
|
1098
|
+
const entry =
|
|
1099
|
+
called.entry?.body === operator.body
|
|
1100
|
+
? called.entry
|
|
1101
|
+
: (called.entry = {
|
|
1102
|
+
body: operator.body,
|
|
1103
|
+
evaluator: getEntryEvaluator(operator.body, context.environment),
|
|
1104
|
+
});
|
|
1105
|
+
return entry.evaluator(bodyContext);
|
|
1059
1106
|
}
|
|
1060
1107
|
if (operator.kind === "Operator") return operator.call(args.map((arg) => evaluate(arg, context)));
|
|
1061
1108
|
if (operator.isLazy) return operator.evaluate(getLazyArguments(args, context), context);
|
|
1062
|
-
return operator.evaluate(
|
|
1063
|
-
args.map((arg) =>
|
|
1064
|
-
isOperatorArgument(arg, context)
|
|
1065
|
-
? toOperatorValue(evaluateOperatorArgument(arg, context), context)
|
|
1066
|
-
: evaluate(arg, context),
|
|
1067
|
-
),
|
|
1068
|
-
context,
|
|
1069
|
-
);
|
|
1109
|
+
return operator.evaluate(evaluateBuiltinArguments(args, context), context);
|
|
1070
1110
|
};
|
|
1071
1111
|
|
|
1072
1112
|
// The LET definitions that a reference evaluates again, and those that cache only a settled value.
|
|
@@ -1152,9 +1192,6 @@ const evaluateLocalIdentifier = (name: string, expression: Expression, context:
|
|
|
1152
1192
|
throw new TlaEvaluationError(`Unknown identifier ${name} at ${describeLocation(expression)}`);
|
|
1153
1193
|
};
|
|
1154
1194
|
|
|
1155
|
-
export const isTlcInteger = (value: number) =>
|
|
1156
|
-
Number.isInteger(value) && value <= MAXIMUM_INTEGER && value >= MINIMUM_INTEGER;
|
|
1157
|
-
|
|
1158
1195
|
const IMPURE_BUILTINS = new Set([
|
|
1159
1196
|
"Print",
|
|
1160
1197
|
"PrintT",
|
|
@@ -1620,20 +1657,13 @@ const cacheStateValue = (evaluator: Evaluator): Evaluator => {
|
|
|
1620
1657
|
};
|
|
1621
1658
|
};
|
|
1622
1659
|
|
|
1623
|
-
const
|
|
1624
|
-
|
|
1625
|
-
|
|
1660
|
+
export const isValueArgument = (argument: Expression, environment: Environment) => {
|
|
1661
|
+
if (argument.kind === "Lambda" || argument.kind === "OperatorReference") return false;
|
|
1662
|
+
if (argument.kind !== "Identifier" || isLocallyResolved(argument)) return true;
|
|
1663
|
+
const operator = resolveGlobalOperator(argument.name, environment);
|
|
1664
|
+
return operator === undefined || getArity(operator) === 0;
|
|
1626
1665
|
};
|
|
1627
1666
|
|
|
1628
|
-
export const isValueArgument = (argument: Expression, environment: Environment) =>
|
|
1629
|
-
argument.kind !== "Lambda" &&
|
|
1630
|
-
argument.kind !== "OperatorReference" &&
|
|
1631
|
-
!(
|
|
1632
|
-
argument.kind === "Identifier" &&
|
|
1633
|
-
!isLocallyResolved(argument) &&
|
|
1634
|
-
isOperatorName(argument.name, environment)
|
|
1635
|
-
);
|
|
1636
|
-
|
|
1637
1667
|
const getLazyArguments = (args: Expression[], context: Context): OperatorValue[] =>
|
|
1638
1668
|
args.map((arg) => ({
|
|
1639
1669
|
kind: "Operator",
|
|
@@ -1666,15 +1696,7 @@ const compileBuiltinCall = (
|
|
|
1666
1696
|
const right = getEvaluator(args[1], environment);
|
|
1667
1697
|
return (context) => binary(left(context), right(context));
|
|
1668
1698
|
}
|
|
1669
|
-
return (context) =>
|
|
1670
|
-
builtin.evaluate(
|
|
1671
|
-
args.map((arg) =>
|
|
1672
|
-
isOperatorArgument(arg, context)
|
|
1673
|
-
? toOperatorValue(evaluateOperatorArgument(arg, context), context)
|
|
1674
|
-
: evaluate(arg, context),
|
|
1675
|
-
),
|
|
1676
|
-
context,
|
|
1677
|
-
);
|
|
1699
|
+
return (context) => builtin.evaluate(evaluateBuiltinArguments(args, context), context);
|
|
1678
1700
|
};
|
|
1679
1701
|
|
|
1680
1702
|
export const compileArgumentScope = (
|
|
@@ -1684,9 +1706,7 @@ export const compileArgumentScope = (
|
|
|
1684
1706
|
): ((context: Context) => Scope | undefined) => {
|
|
1685
1707
|
if (args.length !== closure.params.length) {
|
|
1686
1708
|
return () => {
|
|
1687
|
-
throw
|
|
1688
|
-
`Operator ${closure.name} expects ${closure.params.length} arguments but received ${args.length}`,
|
|
1689
|
-
);
|
|
1709
|
+
throw createArityError(closure, args.length);
|
|
1690
1710
|
};
|
|
1691
1711
|
}
|
|
1692
1712
|
const params = closure.params;
|
|
@@ -2000,9 +2020,11 @@ const compileApply = (
|
|
|
2000
2020
|
);
|
|
2001
2021
|
};
|
|
2002
2022
|
}
|
|
2023
|
+
const called = { entry: undefined as CalledBody | undefined };
|
|
2024
|
+
const binders = args.map((arg) => getArgumentBinder(arg, environment));
|
|
2003
2025
|
return (context) => {
|
|
2004
2026
|
const operator = resolveOperator(expression.operator, context);
|
|
2005
|
-
if (operator) return callOperator(operator, args, context);
|
|
2027
|
+
if (operator) return callOperator(operator, args, context, called, binders);
|
|
2006
2028
|
const definition = environment.definitions.get(expression.operator);
|
|
2007
2029
|
if (definition?.kind === "Function") {
|
|
2008
2030
|
throw new TlaEvaluationError(`${expression.operator} is a function; apply it with brackets`);
|
|
@@ -2065,7 +2087,7 @@ const compileQuantifier = (
|
|
|
2065
2087
|
};
|
|
2066
2088
|
};
|
|
2067
2089
|
|
|
2068
|
-
const
|
|
2090
|
+
const getBoundValue = (pattern: BoundPattern, scope: Scope | undefined) => {
|
|
2069
2091
|
if (pattern.kind === "Tuple") {
|
|
2070
2092
|
return createTuple(
|
|
2071
2093
|
pattern.names.map((name) => {
|
|
@@ -2120,8 +2142,8 @@ const compileFunctionConstruction = (
|
|
|
2120
2142
|
forEachBoundElement(bounds, sets, context.scope, (scope) => {
|
|
2121
2143
|
const key =
|
|
2122
2144
|
bounds.length === 1
|
|
2123
|
-
? (
|
|
2124
|
-
: createTuple(bounds.map((item) =>
|
|
2145
|
+
? (getBoundValue(bound.pattern, scope) ?? false)
|
|
2146
|
+
: createTuple(bounds.map((item) => getBoundValue(item.pattern, scope) ?? false));
|
|
2125
2147
|
pairs.push([key, body(withScope(context, scope))]);
|
|
2126
2148
|
return false;
|
|
2127
2149
|
});
|
|
@@ -2304,7 +2326,7 @@ const compileSetComprehension = (
|
|
|
2304
2326
|
someElement(elements, (element) => {
|
|
2305
2327
|
const scope = bindPattern(context.scope, expression.pattern, element);
|
|
2306
2328
|
if (!expectBoolean(body(withScope(context, scope)), "the body of CHOOSE")) return false;
|
|
2307
|
-
chosen.value =
|
|
2329
|
+
chosen.value = getBoundValue(expression.pattern, scope);
|
|
2308
2330
|
return true;
|
|
2309
2331
|
});
|
|
2310
2332
|
if (chosen.value === undefined) {
|
|
@@ -2323,27 +2345,6 @@ export const getSortedFields = (fields: RecordField[]) =>
|
|
|
2323
2345
|
export const hasDuplicateFields = (sortedFields: RecordField[]) =>
|
|
2324
2346
|
sortedFields.some((field, index) => index > 0 && sortedFields[index - 1].name === field.name);
|
|
2325
2347
|
|
|
2326
|
-
// TLC's Tool#evalAppl fails to look up a variable the state doesn't assign.
|
|
2327
|
-
export const createUnassignedError = (name: string, expression: Expression) =>
|
|
2328
|
-
new TlaUnassignedError(
|
|
2329
|
-
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
2330
|
-
name,
|
|
2331
|
-
);
|
|
2332
|
-
|
|
2333
|
-
// TLC's Tool#enabled reads the subscript of <<A>>_v in the successor as a state of its own, and
|
|
2334
|
-
// names the fairness condition when A leaves a variable of v unassigned, unlike TLC 1.7.4's.
|
|
2335
|
-
export const toUnspecifiedSubscriptError = (error: unknown, version: TlcVersion | undefined) =>
|
|
2336
|
-
error instanceof TlaUnassignedError && version !== "1.7.4"
|
|
2337
|
-
? new TlaEvaluationError(
|
|
2338
|
-
`The action formula A appearing in a WF_v(A) or SF_v(A) operator does not specify the primed value of the variable ${error.variable} occurring in the state formula v.\n`,
|
|
2339
|
-
)
|
|
2340
|
-
: error;
|
|
2341
|
-
|
|
2342
|
-
export const createPrimeOutsideActionError = (expression: Expression) =>
|
|
2343
|
-
new TlaEvaluationError(
|
|
2344
|
-
`A primed expression appears outside an action at ${describeLocation(expression)}`,
|
|
2345
|
-
);
|
|
2346
|
-
|
|
2347
2348
|
const compileRecord = (recordFields: RecordField[], environment: Environment): Evaluator => {
|
|
2348
2349
|
const fields = getSortedFields(recordFields);
|
|
2349
2350
|
const hasDuplicates = hasDuplicateFields(fields);
|
|
@@ -2372,7 +2373,7 @@ const compileRecord = (recordFields: RecordField[], environment: Environment): E
|
|
|
2372
2373
|
};
|
|
2373
2374
|
|
|
2374
2375
|
const compile = (expression: Expression, environment: Environment): Evaluator => {
|
|
2375
|
-
const
|
|
2376
|
+
const getChildEvaluator = (node: Expression) => getEvaluator(node, environment);
|
|
2376
2377
|
switch (expression.kind) {
|
|
2377
2378
|
case "Number": {
|
|
2378
2379
|
const value = expression.value;
|
|
@@ -2408,29 +2409,29 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2408
2409
|
);
|
|
2409
2410
|
};
|
|
2410
2411
|
case "And": {
|
|
2411
|
-
const operands = expression.operands.map(
|
|
2412
|
+
const operands = expression.operands.map(getChildEvaluator);
|
|
2412
2413
|
return (context) => {
|
|
2413
2414
|
for (let index = 0; index < operands.length; index++) {
|
|
2414
2415
|
const value = operands[index](context);
|
|
2415
|
-
if (typeof value !== "boolean") throw
|
|
2416
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
2416
2417
|
if (!value) return false;
|
|
2417
2418
|
}
|
|
2418
2419
|
return true;
|
|
2419
2420
|
};
|
|
2420
2421
|
}
|
|
2421
2422
|
case "Or": {
|
|
2422
|
-
const operands = expression.operands.map(
|
|
2423
|
+
const operands = expression.operands.map(getChildEvaluator);
|
|
2423
2424
|
return (context) => {
|
|
2424
2425
|
for (let index = 0; index < operands.length; index++) {
|
|
2425
2426
|
const value = operands[index](context);
|
|
2426
|
-
if (typeof value !== "boolean") throw
|
|
2427
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
2427
2428
|
if (value) return true;
|
|
2428
2429
|
}
|
|
2429
2430
|
return false;
|
|
2430
2431
|
};
|
|
2431
2432
|
}
|
|
2432
2433
|
case "Prime": {
|
|
2433
|
-
const inner =
|
|
2434
|
+
const inner = getChildEvaluator(expression.expression);
|
|
2434
2435
|
return (context) => {
|
|
2435
2436
|
if (!context.next) throw createPrimeOutsideActionError(expression);
|
|
2436
2437
|
return inner({
|
|
@@ -2443,31 +2444,31 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2443
2444
|
};
|
|
2444
2445
|
}
|
|
2445
2446
|
case "Unchanged": {
|
|
2446
|
-
const primed =
|
|
2447
|
+
const primed = getChildEvaluator({
|
|
2447
2448
|
kind: "Prime",
|
|
2448
2449
|
expression: expression.expression,
|
|
2449
2450
|
location: expression.location,
|
|
2450
2451
|
});
|
|
2451
|
-
const current =
|
|
2452
|
+
const current = getChildEvaluator(expression.expression);
|
|
2452
2453
|
return (context) => valuesEqual(primed(context), current(context));
|
|
2453
2454
|
}
|
|
2454
2455
|
case "If": {
|
|
2455
|
-
const condition =
|
|
2456
|
-
const consequent =
|
|
2457
|
-
const alternative =
|
|
2456
|
+
const condition = getChildEvaluator(expression.condition);
|
|
2457
|
+
const consequent = getChildEvaluator(expression.consequent);
|
|
2458
|
+
const alternative = getChildEvaluator(expression.alternative);
|
|
2458
2459
|
return (context) => {
|
|
2459
2460
|
const value = condition(context);
|
|
2460
|
-
if (typeof value !== "boolean") throw
|
|
2461
|
+
if (typeof value !== "boolean") throw createConditionError(expression, value);
|
|
2461
2462
|
return value ? consequent(context) : alternative(context);
|
|
2462
2463
|
};
|
|
2463
2464
|
}
|
|
2464
2465
|
case "Case": {
|
|
2465
2466
|
const arms = expression.arms.map((arm) => ({
|
|
2466
2467
|
source: arm.condition,
|
|
2467
|
-
condition:
|
|
2468
|
-
body:
|
|
2468
|
+
condition: getChildEvaluator(arm.condition),
|
|
2469
|
+
body: getChildEvaluator(arm.body),
|
|
2469
2470
|
}));
|
|
2470
|
-
const other = expression.other ?
|
|
2471
|
+
const other = expression.other ? getChildEvaluator(expression.other) : undefined;
|
|
2471
2472
|
return (context) => {
|
|
2472
2473
|
for (const arm of arms) {
|
|
2473
2474
|
const value = arm.condition(context);
|
|
@@ -2485,7 +2486,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2485
2486
|
};
|
|
2486
2487
|
}
|
|
2487
2488
|
case "Let": {
|
|
2488
|
-
const body =
|
|
2489
|
+
const body = getChildEvaluator(expression.body);
|
|
2489
2490
|
return (context) =>
|
|
2490
2491
|
body(withScope(context, bindDefinitions(expression.definitions, context)));
|
|
2491
2492
|
}
|
|
@@ -2503,18 +2504,18 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2503
2504
|
case "SetMap":
|
|
2504
2505
|
return compileSetComprehension(expression, environment);
|
|
2505
2506
|
case "SetEnumeration": {
|
|
2506
|
-
const elements = expression.elements.map(
|
|
2507
|
+
const elements = expression.elements.map(getChildEvaluator);
|
|
2507
2508
|
return (context) => createEnumeratedSet(elements.map((element) => element(context)));
|
|
2508
2509
|
}
|
|
2509
2510
|
case "Tuple": {
|
|
2510
|
-
const elements = expression.elements.map(
|
|
2511
|
+
const elements = expression.elements.map(getChildEvaluator);
|
|
2511
2512
|
return (context) => createTuple(elements.map((element) => element(context)));
|
|
2512
2513
|
}
|
|
2513
2514
|
case "FunctionConstruction":
|
|
2514
2515
|
return compileFunctionConstruction(expression, environment);
|
|
2515
2516
|
case "FunctionSet": {
|
|
2516
|
-
const domain =
|
|
2517
|
-
const range =
|
|
2517
|
+
const domain = getChildEvaluator(expression.domain);
|
|
2518
|
+
const range = getChildEvaluator(expression.range);
|
|
2518
2519
|
return (context) => ({ kind: "FunctionSet", domain: domain(context), range: range(context) });
|
|
2519
2520
|
}
|
|
2520
2521
|
case "Record":
|
|
@@ -2522,7 +2523,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2522
2523
|
case "RecordSet": {
|
|
2523
2524
|
const fields = getSortedFields(expression.fields);
|
|
2524
2525
|
const names = fields.map((field) => field.name);
|
|
2525
|
-
const sets = fields.map((field) =>
|
|
2526
|
+
const sets = fields.map((field) => getChildEvaluator(field.value));
|
|
2526
2527
|
return (context) => ({ kind: "RecordSet", names, sets: sets.map((set) => set(context)) });
|
|
2527
2528
|
}
|
|
2528
2529
|
case "Except":
|
|
@@ -2539,10 +2540,10 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2539
2540
|
};
|
|
2540
2541
|
case "FunctionApplication": {
|
|
2541
2542
|
keepLazy(expression.function);
|
|
2542
|
-
const evaluated =
|
|
2543
|
+
const evaluated = getChildEvaluator(expression.function);
|
|
2543
2544
|
const evaluateFunction = (context: Context) =>
|
|
2544
2545
|
expectFunction(evaluated(toKeepLazyContext(context)), expression);
|
|
2545
|
-
const args = expression.args.map(
|
|
2546
|
+
const args = expression.args.map(getChildEvaluator);
|
|
2546
2547
|
const describeMissing = getMissingArgumentDescriber(environment.runtime.version);
|
|
2547
2548
|
if (args.length === 1) {
|
|
2548
2549
|
const argument = args[0];
|
|
@@ -2557,12 +2558,12 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2557
2558
|
);
|
|
2558
2559
|
}
|
|
2559
2560
|
case "FieldAccess": {
|
|
2560
|
-
const record =
|
|
2561
|
+
const record = getChildEvaluator(expression.record);
|
|
2561
2562
|
const select = getFieldSelector(expression);
|
|
2562
2563
|
return (context) => select(record(context));
|
|
2563
2564
|
}
|
|
2564
2565
|
case "Product": {
|
|
2565
|
-
const factors = expression.factors.map(
|
|
2566
|
+
const factors = expression.factors.map(getChildEvaluator);
|
|
2566
2567
|
return (context) => ({
|
|
2567
2568
|
kind: "ProductSet",
|
|
2568
2569
|
factors: factors.map((factor) => factor(context)),
|
|
@@ -2570,8 +2571,8 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2570
2571
|
}
|
|
2571
2572
|
case "BoxAction":
|
|
2572
2573
|
case "AngleAction": {
|
|
2573
|
-
const action =
|
|
2574
|
-
const unchanged =
|
|
2574
|
+
const action = getChildEvaluator(expression.action);
|
|
2575
|
+
const unchanged = getChildEvaluator({
|
|
2575
2576
|
kind: "Unchanged",
|
|
2576
2577
|
expression: expression.subscript,
|
|
2577
2578
|
location: expression.location,
|
|
@@ -2587,7 +2588,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2587
2588
|
return (context) => isEnabled(action, context);
|
|
2588
2589
|
}
|
|
2589
2590
|
case "Label":
|
|
2590
|
-
return
|
|
2591
|
+
return getChildEvaluator(expression.body);
|
|
2591
2592
|
case "Subexpression":
|
|
2592
2593
|
return () => {
|
|
2593
2594
|
throw new TlaEvaluationError(
|
package/src/exit-codes.ts
CHANGED
package/src/fingerprints.ts
CHANGED
|
@@ -7,7 +7,7 @@ interface FingerprintTable {
|
|
|
7
7
|
insert: (first: number, second: number) => boolean;
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
const
|
|
10
|
+
const mixHash = (hash: number) => {
|
|
11
11
|
const first = Math.imul(hash ^ (hash >>> 16), 0x7feb352d);
|
|
12
12
|
const second = Math.imul(first ^ (first >>> 15), 0x846ca68b);
|
|
13
13
|
return second ^ (second >>> 16);
|
|
@@ -20,8 +20,8 @@ export const writeStateFingerprint = (state: Value[], fingerprint: Int32Array) =
|
|
|
20
20
|
first = Math.imul(first ^ getValueHash(state[index]), 0x01000193);
|
|
21
21
|
second = Math.imul(second ^ getValueFingerprint(state[index]), 0x5bd1e995);
|
|
22
22
|
}
|
|
23
|
-
fingerprint[0] =
|
|
24
|
-
fingerprint[1] =
|
|
23
|
+
fingerprint[0] = mixHash(first) || 1;
|
|
24
|
+
fingerprint[1] = mixHash(second);
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
export const createFingerprintTable = (): FingerprintTable => {
|
package/src/index.ts
CHANGED
|
@@ -18,6 +18,16 @@ export {
|
|
|
18
18
|
} from "./errors";
|
|
19
19
|
export { check } from "./parallel";
|
|
20
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";
|
|
21
31
|
export type { Module } from "./ast";
|
|
22
32
|
export { formatValue } from "./values";
|
|
23
33
|
export type { Value } from "./values";
|