tla-ts 0.0.4-dev.0be9567 → 0.0.4-dev.22c041b
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 +77 -122
- 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 -1153
- 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} +115 -721
- 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 +135 -120
- 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 +38 -22
- 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 -190
- 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/{tlc-version.ts → tlc/version.ts} +8 -7
- package/src/transfer.ts +32 -32
- package/src/values.ts +119 -71
- 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/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";
|
|
@@ -54,8 +54,8 @@ import {
|
|
|
54
54
|
markLambdaFunction,
|
|
55
55
|
isReducibleSet,
|
|
56
56
|
isSetValue,
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
isSettledValue,
|
|
58
|
+
isTlcInteger,
|
|
59
59
|
toFiniteFunction,
|
|
60
60
|
toFiniteSet,
|
|
61
61
|
updateFunction,
|
|
@@ -68,7 +68,7 @@ import {
|
|
|
68
68
|
markNormalized,
|
|
69
69
|
setTrace,
|
|
70
70
|
} from "./values";
|
|
71
|
-
import type { TlcVersion } from "./tlc
|
|
71
|
+
import type { TlcVersion } from "./tlc/version";
|
|
72
72
|
|
|
73
73
|
export type State = (Value | undefined)[];
|
|
74
74
|
|
|
@@ -113,6 +113,9 @@ export interface Thunk {
|
|
|
113
113
|
state: State | undefined;
|
|
114
114
|
next: State | undefined;
|
|
115
115
|
cache: Value | undefined;
|
|
116
|
+
// Whether the expression may build a set that streams until TLC caches it, so that the thunk
|
|
117
|
+
// caches only a settled value.
|
|
118
|
+
isStreamed: boolean;
|
|
116
119
|
}
|
|
117
120
|
|
|
118
121
|
type Binding = { kind: "Value"; value: Value } | Thunk | { kind: "Operator"; operator: Operator };
|
|
@@ -248,14 +251,14 @@ export const describeNode = (expression: Expression) =>
|
|
|
248
251
|
? (expression.text ?? String(expression.value))
|
|
249
252
|
: describeRange(expression);
|
|
250
253
|
|
|
251
|
-
export const
|
|
254
|
+
export const createConditionError = (expression: Expression, value: Value) =>
|
|
252
255
|
new TlaEvaluationError(
|
|
253
256
|
`A non-boolean expression (${getKindString(value)}) was used as the condition of an IF.\n${describeRange(expression)}`,
|
|
254
257
|
);
|
|
255
258
|
|
|
256
259
|
// TLC parses an infix chain of /\ or \/ as nested binary junctions and a bulleted list as one
|
|
257
260
|
// junction list, and it words the error differently for each.
|
|
258
|
-
export const
|
|
261
|
+
export const createJunctionError = (
|
|
259
262
|
expression: Expression & { kind: "And" | "Or" },
|
|
260
263
|
index: number,
|
|
261
264
|
value: Value,
|
|
@@ -344,6 +347,27 @@ export const createBigNumberError = (expression: NumberExpression) =>
|
|
|
344
347
|
EXIT_STATUS.error,
|
|
345
348
|
);
|
|
346
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
|
+
|
|
347
371
|
export const lookupScope = (scope: Scope | undefined, name: string): Binding | undefined => {
|
|
348
372
|
for (let current = scope; current; current = current.parent) {
|
|
349
373
|
if (current.name === name) return current.binding;
|
|
@@ -563,12 +587,12 @@ export const forEachBinding = (
|
|
|
563
587
|
visit: (scope: Scope | undefined) => boolean,
|
|
564
588
|
) => forEachBoundElement(bounds, getBoundElements(bounds, context), context.scope, visit);
|
|
565
589
|
|
|
566
|
-
|
|
590
|
+
const getBoundsDomain = (bounds: Bound[], context: Context): Value => {
|
|
567
591
|
const sets = bounds.map((bound) => evaluate(bound.set, context));
|
|
568
592
|
return sets.length === 1 ? sets[0] : { kind: "ProductSet", factors: sets };
|
|
569
593
|
};
|
|
570
594
|
|
|
571
|
-
|
|
595
|
+
const bindArgument = (bounds: Bound[], scope: Scope | undefined, argument: Value) => {
|
|
572
596
|
if (bounds.length === 1) return bindPattern(scope, bounds[0].pattern, argument);
|
|
573
597
|
const components = getSequenceElements(argument) ?? [];
|
|
574
598
|
return bounds.reduce<Scope | undefined>(
|
|
@@ -847,7 +871,7 @@ const forceThunk = (thunk: Thunk, context: Context) => {
|
|
|
847
871
|
const isSameState = thunk.state === context.state && thunk.next === context.next;
|
|
848
872
|
if (isSameState && thunk.cache !== undefined) return thunk.cache;
|
|
849
873
|
const value = evaluate(thunk.expression, withScope(context, thunk.scope));
|
|
850
|
-
if (isSameState) thunk.cache = value;
|
|
874
|
+
if (isSameState && (!thunk.isStreamed || isSettledValue(value))) thunk.cache = value;
|
|
851
875
|
return value;
|
|
852
876
|
};
|
|
853
877
|
|
|
@@ -961,6 +985,18 @@ const isOperatorArgument = (expression: Expression, context: Context) => {
|
|
|
961
985
|
return operator !== undefined && getArity(operator) > 0;
|
|
962
986
|
};
|
|
963
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
|
+
|
|
964
1000
|
const createThunk = (expression: Expression, context: Context): Thunk => ({
|
|
965
1001
|
kind: "Thunk",
|
|
966
1002
|
expression,
|
|
@@ -968,6 +1004,7 @@ const createThunk = (expression: Expression, context: Context): Thunk => ({
|
|
|
968
1004
|
state: context.state,
|
|
969
1005
|
next: context.next,
|
|
970
1006
|
cache: undefined,
|
|
1007
|
+
isStreamed: false,
|
|
971
1008
|
});
|
|
972
1009
|
|
|
973
1010
|
export const findGlobalName = (name: string, environment: Environment): GlobalName | undefined => {
|
|
@@ -1027,47 +1064,61 @@ export const bindOperatorArguments = (
|
|
|
1027
1064
|
closure: Closure,
|
|
1028
1065
|
args: Expression[],
|
|
1029
1066
|
context: Context,
|
|
1067
|
+
binders?: ArgumentBinder[],
|
|
1030
1068
|
): Scope | undefined => {
|
|
1031
|
-
if (args.length !== closure.params.length)
|
|
1032
|
-
throw new TlaEvaluationError(
|
|
1033
|
-
`Operator ${closure.name} expects ${closure.params.length} arguments but received ${args.length}`,
|
|
1034
|
-
);
|
|
1035
|
-
}
|
|
1069
|
+
if (args.length !== closure.params.length) throw createArityError(closure, args.length);
|
|
1036
1070
|
let scope = closure.scope;
|
|
1037
1071
|
for (let index = 0; index < args.length; index++) {
|
|
1038
1072
|
const param = closure.params[index];
|
|
1039
1073
|
const binding: Binding =
|
|
1040
1074
|
param.arity > 0
|
|
1041
1075
|
? { kind: "Operator", operator: evaluateOperatorArgument(args[index], context) }
|
|
1042
|
-
: getArgumentBinder(args[index], context.environment)(context);
|
|
1076
|
+
: (binders?.[index] ?? getArgumentBinder(args[index], context.environment))(context);
|
|
1043
1077
|
scope = { name: param.name, binding, parent: scope };
|
|
1044
1078
|
}
|
|
1045
1079
|
return scope;
|
|
1046
1080
|
};
|
|
1047
1081
|
|
|
1048
|
-
|
|
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
|
+
) => {
|
|
1049
1095
|
if (operator.kind === "Closure") {
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
|
|
1053
|
-
|
|
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);
|
|
1054
1106
|
}
|
|
1055
1107
|
if (operator.kind === "Operator") return operator.call(args.map((arg) => evaluate(arg, context)));
|
|
1056
1108
|
if (operator.isLazy) return operator.evaluate(getLazyArguments(args, context), context);
|
|
1057
|
-
return operator.evaluate(
|
|
1058
|
-
args.map((arg) =>
|
|
1059
|
-
isOperatorArgument(arg, context)
|
|
1060
|
-
? toOperatorValue(evaluateOperatorArgument(arg, context), context)
|
|
1061
|
-
: evaluate(arg, context),
|
|
1062
|
-
),
|
|
1063
|
-
context,
|
|
1064
|
-
);
|
|
1109
|
+
return operator.evaluate(evaluateBuiltinArguments(args, context), context);
|
|
1065
1110
|
};
|
|
1066
1111
|
|
|
1112
|
+
// The LET definitions that a reference evaluates again, and those that cache only a settled value.
|
|
1113
|
+
interface ReevaluatedDefinitions {
|
|
1114
|
+
impure: ReadonlySet<Definition>;
|
|
1115
|
+
streamed: ReadonlySet<Definition>;
|
|
1116
|
+
}
|
|
1117
|
+
|
|
1067
1118
|
export const bindDefinitions = (
|
|
1068
1119
|
definitions: Definition[],
|
|
1069
1120
|
context: Context,
|
|
1070
|
-
reevaluated?:
|
|
1121
|
+
reevaluated?: ReevaluatedDefinitions,
|
|
1071
1122
|
): Scope | undefined =>
|
|
1072
1123
|
definitions.reduce<Scope | undefined>((scope, definition) => {
|
|
1073
1124
|
const node: Scope = {
|
|
@@ -1089,10 +1140,11 @@ export const bindDefinitions = (
|
|
|
1089
1140
|
state: context.state,
|
|
1090
1141
|
next: context.next,
|
|
1091
1142
|
cache: undefined,
|
|
1143
|
+
isStreamed: false,
|
|
1092
1144
|
};
|
|
1093
1145
|
return node;
|
|
1094
1146
|
}
|
|
1095
|
-
if (definition.params.length > 0 || reevaluated?.has(definition)) {
|
|
1147
|
+
if (definition.params.length > 0 || reevaluated?.impure.has(definition)) {
|
|
1096
1148
|
node.binding = {
|
|
1097
1149
|
kind: "Operator",
|
|
1098
1150
|
operator: {
|
|
@@ -1112,6 +1164,7 @@ export const bindDefinitions = (
|
|
|
1112
1164
|
state: context.state,
|
|
1113
1165
|
next: context.next,
|
|
1114
1166
|
cache: undefined,
|
|
1167
|
+
isStreamed: reevaluated?.streamed.has(definition) ?? false,
|
|
1115
1168
|
};
|
|
1116
1169
|
return node;
|
|
1117
1170
|
}, context.scope);
|
|
@@ -1139,9 +1192,6 @@ const evaluateLocalIdentifier = (name: string, expression: Expression, context:
|
|
|
1139
1192
|
throw new TlaEvaluationError(`Unknown identifier ${name} at ${describeLocation(expression)}`);
|
|
1140
1193
|
};
|
|
1141
1194
|
|
|
1142
|
-
export const isTlcInteger = (value: number) =>
|
|
1143
|
-
Number.isInteger(value) && value <= MAXIMUM_INTEGER && value >= MINIMUM_INTEGER;
|
|
1144
|
-
|
|
1145
1195
|
const IMPURE_BUILTINS = new Set([
|
|
1146
1196
|
"Print",
|
|
1147
1197
|
"PrintT",
|
|
@@ -1228,14 +1278,15 @@ const STREAMED_SET: Impurity = {
|
|
|
1228
1278
|
// TLC's next-state generator does not bind LET definitions to values, so each reference to one
|
|
1229
1279
|
// evaluates it again: one that calls an impure builtin repeats its effects, and a set one builds
|
|
1230
1280
|
// with UNION or \cup starts out uncached.
|
|
1231
|
-
export const getReevaluatedDefinitions = (
|
|
1232
|
-
|
|
1233
|
-
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1237
|
-
),
|
|
1238
|
-
)
|
|
1281
|
+
export const getReevaluatedDefinitions = (
|
|
1282
|
+
definitions: Definition[],
|
|
1283
|
+
environment: Environment,
|
|
1284
|
+
): ReevaluatedDefinitions => ({
|
|
1285
|
+
impure: new Set(definitions.filter((definition) => isImpureDefinition(definition, environment))),
|
|
1286
|
+
streamed: new Set(
|
|
1287
|
+
definitions.filter((definition) => isImpureDefinition(definition, environment, STREAMED_SET)),
|
|
1288
|
+
),
|
|
1289
|
+
});
|
|
1239
1290
|
|
|
1240
1291
|
export const isImpure = (environment: Environment) =>
|
|
1241
1292
|
[...environment.definitions.values()].some((definition) =>
|
|
@@ -1519,7 +1570,7 @@ export const getEvaluator = (expression: Expression, environment: Environment):
|
|
|
1519
1570
|
|
|
1520
1571
|
const entryEvaluators = new WeakMap<Expression, Evaluator>();
|
|
1521
1572
|
|
|
1522
|
-
const getEntryEvaluator = (expression: Expression, environment: Environment) => {
|
|
1573
|
+
export const getEntryEvaluator = (expression: Expression, environment: Environment) => {
|
|
1523
1574
|
if (environment.callStack) return getEvaluator(expression, environment);
|
|
1524
1575
|
const cached = entryEvaluators.get(expression);
|
|
1525
1576
|
if (cached) return cached;
|
|
@@ -1606,20 +1657,13 @@ const cacheStateValue = (evaluator: Evaluator): Evaluator => {
|
|
|
1606
1657
|
};
|
|
1607
1658
|
};
|
|
1608
1659
|
|
|
1609
|
-
const
|
|
1610
|
-
|
|
1611
|
-
|
|
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;
|
|
1612
1665
|
};
|
|
1613
1666
|
|
|
1614
|
-
export const isValueArgument = (argument: Expression, environment: Environment) =>
|
|
1615
|
-
argument.kind !== "Lambda" &&
|
|
1616
|
-
argument.kind !== "OperatorReference" &&
|
|
1617
|
-
!(
|
|
1618
|
-
argument.kind === "Identifier" &&
|
|
1619
|
-
!isLocallyResolved(argument) &&
|
|
1620
|
-
isOperatorName(argument.name, environment)
|
|
1621
|
-
);
|
|
1622
|
-
|
|
1623
1667
|
const getLazyArguments = (args: Expression[], context: Context): OperatorValue[] =>
|
|
1624
1668
|
args.map((arg) => ({
|
|
1625
1669
|
kind: "Operator",
|
|
@@ -1652,15 +1696,7 @@ const compileBuiltinCall = (
|
|
|
1652
1696
|
const right = getEvaluator(args[1], environment);
|
|
1653
1697
|
return (context) => binary(left(context), right(context));
|
|
1654
1698
|
}
|
|
1655
|
-
return (context) =>
|
|
1656
|
-
builtin.evaluate(
|
|
1657
|
-
args.map((arg) =>
|
|
1658
|
-
isOperatorArgument(arg, context)
|
|
1659
|
-
? toOperatorValue(evaluateOperatorArgument(arg, context), context)
|
|
1660
|
-
: evaluate(arg, context),
|
|
1661
|
-
),
|
|
1662
|
-
context,
|
|
1663
|
-
);
|
|
1699
|
+
return (context) => builtin.evaluate(evaluateBuiltinArguments(args, context), context);
|
|
1664
1700
|
};
|
|
1665
1701
|
|
|
1666
1702
|
export const compileArgumentScope = (
|
|
@@ -1670,9 +1706,7 @@ export const compileArgumentScope = (
|
|
|
1670
1706
|
): ((context: Context) => Scope | undefined) => {
|
|
1671
1707
|
if (args.length !== closure.params.length) {
|
|
1672
1708
|
return () => {
|
|
1673
|
-
throw
|
|
1674
|
-
`Operator ${closure.name} expects ${closure.params.length} arguments but received ${args.length}`,
|
|
1675
|
-
);
|
|
1709
|
+
throw createArityError(closure, args.length);
|
|
1676
1710
|
};
|
|
1677
1711
|
}
|
|
1678
1712
|
const params = closure.params;
|
|
@@ -1986,9 +2020,11 @@ const compileApply = (
|
|
|
1986
2020
|
);
|
|
1987
2021
|
};
|
|
1988
2022
|
}
|
|
2023
|
+
const called = { entry: undefined as CalledBody | undefined };
|
|
2024
|
+
const binders = args.map((arg) => getArgumentBinder(arg, environment));
|
|
1989
2025
|
return (context) => {
|
|
1990
2026
|
const operator = resolveOperator(expression.operator, context);
|
|
1991
|
-
if (operator) return callOperator(operator, args, context);
|
|
2027
|
+
if (operator) return callOperator(operator, args, context, called, binders);
|
|
1992
2028
|
const definition = environment.definitions.get(expression.operator);
|
|
1993
2029
|
if (definition?.kind === "Function") {
|
|
1994
2030
|
throw new TlaEvaluationError(`${expression.operator} is a function; apply it with brackets`);
|
|
@@ -2051,7 +2087,7 @@ const compileQuantifier = (
|
|
|
2051
2087
|
};
|
|
2052
2088
|
};
|
|
2053
2089
|
|
|
2054
|
-
const
|
|
2090
|
+
const getBoundValue = (pattern: BoundPattern, scope: Scope | undefined) => {
|
|
2055
2091
|
if (pattern.kind === "Tuple") {
|
|
2056
2092
|
return createTuple(
|
|
2057
2093
|
pattern.names.map((name) => {
|
|
@@ -2106,8 +2142,8 @@ const compileFunctionConstruction = (
|
|
|
2106
2142
|
forEachBoundElement(bounds, sets, context.scope, (scope) => {
|
|
2107
2143
|
const key =
|
|
2108
2144
|
bounds.length === 1
|
|
2109
|
-
? (
|
|
2110
|
-
: createTuple(bounds.map((item) =>
|
|
2145
|
+
? (getBoundValue(bound.pattern, scope) ?? false)
|
|
2146
|
+
: createTuple(bounds.map((item) => getBoundValue(item.pattern, scope) ?? false));
|
|
2111
2147
|
pairs.push([key, body(withScope(context, scope))]);
|
|
2112
2148
|
return false;
|
|
2113
2149
|
});
|
|
@@ -2290,7 +2326,7 @@ const compileSetComprehension = (
|
|
|
2290
2326
|
someElement(elements, (element) => {
|
|
2291
2327
|
const scope = bindPattern(context.scope, expression.pattern, element);
|
|
2292
2328
|
if (!expectBoolean(body(withScope(context, scope)), "the body of CHOOSE")) return false;
|
|
2293
|
-
chosen.value =
|
|
2329
|
+
chosen.value = getBoundValue(expression.pattern, scope);
|
|
2294
2330
|
return true;
|
|
2295
2331
|
});
|
|
2296
2332
|
if (chosen.value === undefined) {
|
|
@@ -2309,27 +2345,6 @@ export const getSortedFields = (fields: RecordField[]) =>
|
|
|
2309
2345
|
export const hasDuplicateFields = (sortedFields: RecordField[]) =>
|
|
2310
2346
|
sortedFields.some((field, index) => index > 0 && sortedFields[index - 1].name === field.name);
|
|
2311
2347
|
|
|
2312
|
-
// TLC's Tool#evalAppl fails to look up a variable the state doesn't assign.
|
|
2313
|
-
export const createUnassignedError = (name: string, expression: Expression) =>
|
|
2314
|
-
new TlaUnassignedError(
|
|
2315
|
-
`In evaluation, the identifier ${name} is either undefined or not an operator.\n${describeRange(expression)}`,
|
|
2316
|
-
name,
|
|
2317
|
-
);
|
|
2318
|
-
|
|
2319
|
-
// TLC's Tool#enabled reads the subscript of <<A>>_v in the successor as a state of its own, and
|
|
2320
|
-
// names the fairness condition when A leaves a variable of v unassigned, unlike TLC 1.7.4's.
|
|
2321
|
-
export const toUnspecifiedSubscriptError = (error: unknown, version: TlcVersion | undefined) =>
|
|
2322
|
-
error instanceof TlaUnassignedError && version !== "1.7.4"
|
|
2323
|
-
? new TlaEvaluationError(
|
|
2324
|
-
`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`,
|
|
2325
|
-
)
|
|
2326
|
-
: error;
|
|
2327
|
-
|
|
2328
|
-
export const createPrimeOutsideActionError = (expression: Expression) =>
|
|
2329
|
-
new TlaEvaluationError(
|
|
2330
|
-
`A primed expression appears outside an action at ${describeLocation(expression)}`,
|
|
2331
|
-
);
|
|
2332
|
-
|
|
2333
2348
|
const compileRecord = (recordFields: RecordField[], environment: Environment): Evaluator => {
|
|
2334
2349
|
const fields = getSortedFields(recordFields);
|
|
2335
2350
|
const hasDuplicates = hasDuplicateFields(fields);
|
|
@@ -2358,7 +2373,7 @@ const compileRecord = (recordFields: RecordField[], environment: Environment): E
|
|
|
2358
2373
|
};
|
|
2359
2374
|
|
|
2360
2375
|
const compile = (expression: Expression, environment: Environment): Evaluator => {
|
|
2361
|
-
const
|
|
2376
|
+
const getChildEvaluator = (node: Expression) => getEvaluator(node, environment);
|
|
2362
2377
|
switch (expression.kind) {
|
|
2363
2378
|
case "Number": {
|
|
2364
2379
|
const value = expression.value;
|
|
@@ -2394,29 +2409,29 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2394
2409
|
);
|
|
2395
2410
|
};
|
|
2396
2411
|
case "And": {
|
|
2397
|
-
const operands = expression.operands.map(
|
|
2412
|
+
const operands = expression.operands.map(getChildEvaluator);
|
|
2398
2413
|
return (context) => {
|
|
2399
2414
|
for (let index = 0; index < operands.length; index++) {
|
|
2400
2415
|
const value = operands[index](context);
|
|
2401
|
-
if (typeof value !== "boolean") throw
|
|
2416
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
2402
2417
|
if (!value) return false;
|
|
2403
2418
|
}
|
|
2404
2419
|
return true;
|
|
2405
2420
|
};
|
|
2406
2421
|
}
|
|
2407
2422
|
case "Or": {
|
|
2408
|
-
const operands = expression.operands.map(
|
|
2423
|
+
const operands = expression.operands.map(getChildEvaluator);
|
|
2409
2424
|
return (context) => {
|
|
2410
2425
|
for (let index = 0; index < operands.length; index++) {
|
|
2411
2426
|
const value = operands[index](context);
|
|
2412
|
-
if (typeof value !== "boolean") throw
|
|
2427
|
+
if (typeof value !== "boolean") throw createJunctionError(expression, index, value);
|
|
2413
2428
|
if (value) return true;
|
|
2414
2429
|
}
|
|
2415
2430
|
return false;
|
|
2416
2431
|
};
|
|
2417
2432
|
}
|
|
2418
2433
|
case "Prime": {
|
|
2419
|
-
const inner =
|
|
2434
|
+
const inner = getChildEvaluator(expression.expression);
|
|
2420
2435
|
return (context) => {
|
|
2421
2436
|
if (!context.next) throw createPrimeOutsideActionError(expression);
|
|
2422
2437
|
return inner({
|
|
@@ -2429,31 +2444,31 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2429
2444
|
};
|
|
2430
2445
|
}
|
|
2431
2446
|
case "Unchanged": {
|
|
2432
|
-
const primed =
|
|
2447
|
+
const primed = getChildEvaluator({
|
|
2433
2448
|
kind: "Prime",
|
|
2434
2449
|
expression: expression.expression,
|
|
2435
2450
|
location: expression.location,
|
|
2436
2451
|
});
|
|
2437
|
-
const current =
|
|
2452
|
+
const current = getChildEvaluator(expression.expression);
|
|
2438
2453
|
return (context) => valuesEqual(primed(context), current(context));
|
|
2439
2454
|
}
|
|
2440
2455
|
case "If": {
|
|
2441
|
-
const condition =
|
|
2442
|
-
const consequent =
|
|
2443
|
-
const alternative =
|
|
2456
|
+
const condition = getChildEvaluator(expression.condition);
|
|
2457
|
+
const consequent = getChildEvaluator(expression.consequent);
|
|
2458
|
+
const alternative = getChildEvaluator(expression.alternative);
|
|
2444
2459
|
return (context) => {
|
|
2445
2460
|
const value = condition(context);
|
|
2446
|
-
if (typeof value !== "boolean") throw
|
|
2461
|
+
if (typeof value !== "boolean") throw createConditionError(expression, value);
|
|
2447
2462
|
return value ? consequent(context) : alternative(context);
|
|
2448
2463
|
};
|
|
2449
2464
|
}
|
|
2450
2465
|
case "Case": {
|
|
2451
2466
|
const arms = expression.arms.map((arm) => ({
|
|
2452
2467
|
source: arm.condition,
|
|
2453
|
-
condition:
|
|
2454
|
-
body:
|
|
2468
|
+
condition: getChildEvaluator(arm.condition),
|
|
2469
|
+
body: getChildEvaluator(arm.body),
|
|
2455
2470
|
}));
|
|
2456
|
-
const other = expression.other ?
|
|
2471
|
+
const other = expression.other ? getChildEvaluator(expression.other) : undefined;
|
|
2457
2472
|
return (context) => {
|
|
2458
2473
|
for (const arm of arms) {
|
|
2459
2474
|
const value = arm.condition(context);
|
|
@@ -2471,7 +2486,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2471
2486
|
};
|
|
2472
2487
|
}
|
|
2473
2488
|
case "Let": {
|
|
2474
|
-
const body =
|
|
2489
|
+
const body = getChildEvaluator(expression.body);
|
|
2475
2490
|
return (context) =>
|
|
2476
2491
|
body(withScope(context, bindDefinitions(expression.definitions, context)));
|
|
2477
2492
|
}
|
|
@@ -2489,18 +2504,18 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2489
2504
|
case "SetMap":
|
|
2490
2505
|
return compileSetComprehension(expression, environment);
|
|
2491
2506
|
case "SetEnumeration": {
|
|
2492
|
-
const elements = expression.elements.map(
|
|
2507
|
+
const elements = expression.elements.map(getChildEvaluator);
|
|
2493
2508
|
return (context) => createEnumeratedSet(elements.map((element) => element(context)));
|
|
2494
2509
|
}
|
|
2495
2510
|
case "Tuple": {
|
|
2496
|
-
const elements = expression.elements.map(
|
|
2511
|
+
const elements = expression.elements.map(getChildEvaluator);
|
|
2497
2512
|
return (context) => createTuple(elements.map((element) => element(context)));
|
|
2498
2513
|
}
|
|
2499
2514
|
case "FunctionConstruction":
|
|
2500
2515
|
return compileFunctionConstruction(expression, environment);
|
|
2501
2516
|
case "FunctionSet": {
|
|
2502
|
-
const domain =
|
|
2503
|
-
const range =
|
|
2517
|
+
const domain = getChildEvaluator(expression.domain);
|
|
2518
|
+
const range = getChildEvaluator(expression.range);
|
|
2504
2519
|
return (context) => ({ kind: "FunctionSet", domain: domain(context), range: range(context) });
|
|
2505
2520
|
}
|
|
2506
2521
|
case "Record":
|
|
@@ -2508,7 +2523,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2508
2523
|
case "RecordSet": {
|
|
2509
2524
|
const fields = getSortedFields(expression.fields);
|
|
2510
2525
|
const names = fields.map((field) => field.name);
|
|
2511
|
-
const sets = fields.map((field) =>
|
|
2526
|
+
const sets = fields.map((field) => getChildEvaluator(field.value));
|
|
2512
2527
|
return (context) => ({ kind: "RecordSet", names, sets: sets.map((set) => set(context)) });
|
|
2513
2528
|
}
|
|
2514
2529
|
case "Except":
|
|
@@ -2525,10 +2540,10 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2525
2540
|
};
|
|
2526
2541
|
case "FunctionApplication": {
|
|
2527
2542
|
keepLazy(expression.function);
|
|
2528
|
-
const evaluated =
|
|
2543
|
+
const evaluated = getChildEvaluator(expression.function);
|
|
2529
2544
|
const evaluateFunction = (context: Context) =>
|
|
2530
2545
|
expectFunction(evaluated(toKeepLazyContext(context)), expression);
|
|
2531
|
-
const args = expression.args.map(
|
|
2546
|
+
const args = expression.args.map(getChildEvaluator);
|
|
2532
2547
|
const describeMissing = getMissingArgumentDescriber(environment.runtime.version);
|
|
2533
2548
|
if (args.length === 1) {
|
|
2534
2549
|
const argument = args[0];
|
|
@@ -2543,12 +2558,12 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2543
2558
|
);
|
|
2544
2559
|
}
|
|
2545
2560
|
case "FieldAccess": {
|
|
2546
|
-
const record =
|
|
2561
|
+
const record = getChildEvaluator(expression.record);
|
|
2547
2562
|
const select = getFieldSelector(expression);
|
|
2548
2563
|
return (context) => select(record(context));
|
|
2549
2564
|
}
|
|
2550
2565
|
case "Product": {
|
|
2551
|
-
const factors = expression.factors.map(
|
|
2566
|
+
const factors = expression.factors.map(getChildEvaluator);
|
|
2552
2567
|
return (context) => ({
|
|
2553
2568
|
kind: "ProductSet",
|
|
2554
2569
|
factors: factors.map((factor) => factor(context)),
|
|
@@ -2556,8 +2571,8 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2556
2571
|
}
|
|
2557
2572
|
case "BoxAction":
|
|
2558
2573
|
case "AngleAction": {
|
|
2559
|
-
const action =
|
|
2560
|
-
const unchanged =
|
|
2574
|
+
const action = getChildEvaluator(expression.action);
|
|
2575
|
+
const unchanged = getChildEvaluator({
|
|
2561
2576
|
kind: "Unchanged",
|
|
2562
2577
|
expression: expression.subscript,
|
|
2563
2578
|
location: expression.location,
|
|
@@ -2573,7 +2588,7 @@ const compile = (expression: Expression, environment: Environment): Evaluator =>
|
|
|
2573
2588
|
return (context) => isEnabled(action, context);
|
|
2574
2589
|
}
|
|
2575
2590
|
case "Label":
|
|
2576
|
-
return
|
|
2591
|
+
return getChildEvaluator(expression.body);
|
|
2577
2592
|
case "Subexpression":
|
|
2578
2593
|
return () => {
|
|
2579
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";
|