tla-ts 0.0.9 → 0.0.10-dev.63a6693bd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +29 -29
- package/dist/deciders.js +42 -42
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +106 -10
- package/dist/index.d.ts +106 -10
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +117 -37
- package/dist/prove.js +116 -36
- package/dist/run.cjs +143 -31
- package/dist/run.js +143 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +129 -104
- package/dist/transfer.js +129 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +48 -62
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +599 -754
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +14 -25
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +687 -0
- package/src/cli/tlc-usage.ts +361 -0
- package/src/cli/tlc.ts +309 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +14 -53
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +169 -335
- package/src/errors.ts +71 -55
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +37 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +80 -100
- package/src/liveness-checker.ts +103 -153
- package/src/liveness.ts +150 -109
- package/src/obligations/action.ts +8 -39
- package/src/obligations/anonymize.ts +88 -82
- package/src/obligations/equality.ts +1 -1
- package/src/obligations/expression.ts +20 -21
- package/src/obligations/format.ts +1 -9
- package/src/obligations/generate.ts +46 -49
- package/src/obligations/index.ts +2 -13
- package/src/obligations/levels.ts +4 -8
- package/src/obligations/module.ts +28 -53
- package/src/obligations/normalize.ts +7 -25
- package/src/obligations/operators.ts +1 -2
- package/src/obligations/pragma.ts +1 -10
- package/src/obligations/printer.ts +47 -46
- package/src/obligations/proof.ts +1 -5
- package/src/obligations/regroup.ts +1 -4
- package/src/obligations/simplify.ts +42 -58
- package/src/obligations/source.ts +48 -78
- package/src/obligations/subexpression.ts +5 -11
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +13 -19
- package/src/obligations/tuples.ts +3 -9
- package/src/parallel-worker.ts +30 -60
- package/src/parallel.ts +57 -71
- package/src/parser.ts +584 -316
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +3 -7
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +0 -6
- package/src/prover/isabelle/encode.ts +11 -23
- package/src/prover/isabelle/isar/inner-syntax.ts +114 -115
- package/src/prover/isabelle/isar/method.ts +29 -53
- package/src/prover/isabelle/isar/proof.ts +1 -10
- package/src/prover/isabelle/isar/statement.ts +1 -6
- package/src/prover/isabelle/isar/theory.ts +26 -36
- package/src/prover/isabelle/isar/type-check.ts +17 -31
- package/src/prover/isabelle/provers/blast/blast.ts +17 -104
- package/src/prover/isabelle/provers/blast/branch.ts +1 -32
- package/src/prover/isabelle/provers/blast/prove.ts +1 -35
- package/src/prover/isabelle/provers/blast/rules.ts +6 -44
- package/src/prover/isabelle/provers/blast/state.ts +2 -28
- package/src/prover/isabelle/provers/blast/term.ts +9 -36
- package/src/prover/isabelle/provers/clasimp.ts +1 -13
- package/src/prover/isabelle/provers/classical.ts +14 -42
- package/src/prover/isabelle/provers/hypsubst.ts +28 -51
- package/src/prover/isabelle/pure/bicompose.ts +25 -38
- package/src/prover/isabelle/pure/consts.ts +1 -7
- package/src/prover/isabelle/pure/conv.ts +3 -17
- package/src/prover/isabelle/pure/drule.ts +33 -42
- package/src/prover/isabelle/pure/envir.ts +3 -52
- package/src/prover/isabelle/pure/goal.ts +1 -7
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +2 -15
- package/src/prover/isabelle/pure/name.ts +2 -9
- package/src/prover/isabelle/pure/net.ts +3 -59
- package/src/prover/isabelle/pure/object-logic.ts +3 -10
- package/src/prover/isabelle/pure/pattern.ts +2 -19
- package/src/prover/isabelle/pure/raw-simplifier.ts +17 -62
- package/src/prover/isabelle/pure/rewriter.ts +31 -67
- package/src/prover/isabelle/pure/search.ts +3 -10
- package/src/prover/isabelle/pure/seq.ts +1 -10
- package/src/prover/isabelle/pure/simplifier.ts +4 -12
- package/src/prover/isabelle/pure/table.ts +3 -32
- package/src/prover/isabelle/pure/tactic.ts +12 -22
- package/src/prover/isabelle/pure/tactical.ts +48 -47
- package/src/prover/isabelle/pure/term-ord.ts +2 -6
- package/src/prover/isabelle/pure/term.ts +2 -43
- package/src/prover/isabelle/pure/thm.ts +27 -47
- package/src/prover/isabelle/pure/type.ts +2 -15
- package/src/prover/isabelle/pure/unify.ts +20 -30
- package/src/prover/isabelle/pure/variable.ts +3 -7
- package/src/prover/isabelle/tla/classical-setup.ts +17 -24
- package/src/prover/isabelle/tla/context.ts +15 -18
- package/src/prover/isabelle/tla/logic.ts +14 -32
- package/src/prover/isabelle/tla/simpdata.ts +46 -43
- package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
- package/src/prover/ocaml.ts +0 -6
- package/src/prover/prep/action.ts +14 -54
- package/src/prover/prep/enabled-axioms.ts +12 -19
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +0 -2
- package/src/prover/prep/methods.ts +33 -39
- package/src/prover/prep/normalize.ts +4 -28
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +87 -100
- package/src/prover/ptl/decide.ts +7 -12
- package/src/prover/ptl/encode.ts +14 -36
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +12 -26
- package/src/prover/smt/axioms.ts +0 -7
- package/src/prover/smt/context.ts +20 -28
- package/src/prover/smt/data.ts +433 -424
- package/src/prover/smt/encode.ts +43 -52
- package/src/prover/smt/extensionality.ts +0 -10
- package/src/prover/smt/flatten.ts +3 -22
- package/src/prover/smt/format.ts +5 -10
- package/src/prover/smt/instances.ts +0 -10
- package/src/prover/smt/rewrite.ts +663 -667
- package/src/prover/smt/solver/act-cache.ts +0 -15
- package/src/prover/smt/solver/arith-rewriter.ts +3 -48
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +1 -43
- package/src/prover/smt/solver/ast-lt.ts +1 -11
- package/src/prover/smt/solver/ast-util.ts +1 -6
- package/src/prover/smt/solver/ast.ts +1 -165
- package/src/prover/smt/solver/auf-solver.ts +8 -44
- package/src/prover/smt/solver/case-split-queue.ts +1 -9
- package/src/prover/smt/solver/cg-table.ts +1 -18
- package/src/prover/smt/solver/clause.ts +1 -27
- package/src/prover/smt/solver/conflict-resolution.ts +0 -9
- package/src/prover/smt/solver/context.ts +7 -64
- package/src/prover/smt/solver/ctx-simplify.ts +14 -41
- package/src/prover/smt/solver/der.ts +2 -21
- package/src/prover/smt/solver/dyn-ack.ts +1 -11
- package/src/prover/smt/solver/e-matching.ts +4 -35
- package/src/prover/smt/solver/enode.ts +1 -21
- package/src/prover/smt/solver/expr-ref.ts +1 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +1 -6
- package/src/prover/smt/solver/fingerprints.ts +1 -12
- package/src/prover/smt/solver/flat-literals.ts +1 -9
- package/src/prover/smt/solver/goal.ts +2 -14
- package/src/prover/smt/solver/hash.ts +0 -8
- package/src/prover/smt/solver/hashtable.ts +1 -12
- package/src/prover/smt/solver/internalizer.ts +7 -100
- package/src/prover/smt/solver/lbool.ts +1 -2
- package/src/prover/smt/solver/literal.ts +0 -3
- package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
- package/src/prover/smt/solver/lp/constraints.ts +2 -8
- package/src/prover/smt/solver/lp/containers.ts +12 -30
- package/src/prover/smt/solver/lp/core-solver.ts +10 -31
- package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
- package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
- package/src/prover/smt/solver/lp/dependency.ts +1 -4
- package/src/prover/smt/solver/lp/dioph-eq.ts +9 -102
- package/src/prover/smt/solver/lp/explanation.ts +1 -6
- package/src/prover/smt/solver/lp/gomory.ts +9 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
- package/src/prover/smt/solver/lp/hnf.ts +11 -26
- package/src/prover/smt/solver/lp/int-cube.ts +15 -36
- package/src/prover/smt/solver/lp/int-solver.ts +4 -34
- package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
- package/src/prover/smt/solver/lp/lar-term.ts +1 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
- package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
- package/src/prover/smt/solver/lp/nex.ts +1 -6
- package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
- package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
- package/src/prover/smt/solver/lp/nla-core.ts +36 -135
- package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
- package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
- package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
- package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
- package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
- package/src/prover/smt/solver/lp/nla-order.ts +2 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
- package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
- package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
- package/src/prover/smt/solver/lp/nla-types.ts +1 -11
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
- package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
- package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- package/src/prover/smt/solver/lp/random-updater.ts +1 -8
- package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
- package/src/prover/smt/solver/lp/union-find.ts +1 -6
- package/src/prover/smt/solver/mam-compiler.ts +18 -58
- package/src/prover/smt/solver/mam-interpreter.ts +1 -21
- package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
- package/src/prover/smt/solver/model-checker.ts +3 -37
- package/src/prover/smt/solver/model-evaluator.ts +3 -29
- package/src/prover/smt/solver/model-finder.ts +15 -32
- package/src/prover/smt/solver/model-generator.ts +1 -12
- package/src/prover/smt/solver/model-macro-solver.ts +23 -88
- package/src/prover/smt/solver/nlsat/algebraic.ts +63 -159
- package/src/prover/smt/solver/nlsat/atoms.ts +25 -23
- package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
- package/src/prover/smt/solver/nlsat/explain.ts +10 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
- package/src/prover/smt/solver/nlsat/levelwise.ts +49 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -159
- package/src/prover/smt/solver/nlsat/solver.ts +18 -90
- package/src/prover/smt/solver/nlsat/types.ts +1 -8
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +2 -45
- package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
- package/src/prover/smt/solver/nnf.ts +3 -38
- package/src/prover/smt/solver/pattern-inference.ts +2 -15
- package/src/prover/smt/solver/poly-rewriter.ts +3 -23
- package/src/prover/smt/solver/propagate-values.ts +1 -10
- package/src/prover/smt/solver/proto-model.ts +3 -52
- package/src/prover/smt/solver/pull-quant.ts +1 -12
- package/src/prover/smt/solver/qe-lite-der.ts +1 -29
- package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
- package/src/prover/smt/solver/qe-lite.ts +3 -33
- package/src/prover/smt/solver/qi-queue.ts +1 -16
- package/src/prover/smt/solver/quant-tactics.ts +5 -22
- package/src/prover/smt/solver/quantifier-analyzer.ts +27 -47
- package/src/prover/smt/solver/quantifier-manager.ts +2 -13
- package/src/prover/smt/solver/random-gen.ts +1 -2
- package/src/prover/smt/solver/rational.ts +1 -8
- package/src/prover/smt/solver/ref-vector.ts +1 -6
- package/src/prover/smt/solver/relevancy.ts +2 -15
- package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
- package/src/prover/smt/solver/rewriter.ts +3 -85
- package/src/prover/smt/solver/rlimit.ts +2 -20
- package/src/prover/smt/solver/smtlib-parser.ts +80 -131
- package/src/prover/smt/solver/solver.ts +23 -34
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/sticky-generations.ts +0 -5
- package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
- package/src/prover/smt/solver/theory-lra-bounds.ts +1 -7
- package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
- package/src/prover/smt/solver/theory-lra-internalize.ts +6 -43
- package/src/prover/smt/solver/theory-lra-model.ts +4 -19
- package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
- package/src/prover/smt/solver/theory-lra-state.ts +3 -8
- package/src/prover/smt/solver/theory-lra.ts +1 -8
- package/src/prover/smt/solver/var-subst.ts +2 -26
- package/src/prover/smt/table.ts +0 -8
- package/src/prover/tlapm/cache.ts +45 -40
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/verdict.ts +7 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +0 -12
- package/src/prover/zenon/encode.ts +1 -8
- package/src/prover/zenon/eqrel.ts +2 -13
- package/src/prover/zenon/equality-rules.ts +0 -4
- package/src/prover/zenon/expr.ts +8 -26
- package/src/prover/zenon/index-table.ts +26 -57
- package/src/prover/zenon/isar-case.ts +9 -19
- package/src/prover/zenon/isar.ts +36 -64
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -20
- package/src/prover/zenon/mltoll.ts +66 -104
- package/src/prover/zenon/node.ts +1 -11
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +4 -12
- package/src/prover/zenon/phrase.ts +1 -11
- package/src/prover/zenon/proof.ts +0 -9
- package/src/prover/zenon/propositional-rules.ts +0 -5
- package/src/prover/zenon/rules.ts +2 -6
- package/src/prover/zenon/search.ts +5 -31
- package/src/prover/zenon/tla/functions.ts +59 -31
- package/src/prover/zenon/tla/llproof.ts +67 -76
- package/src/prover/zenon/tla/records.ts +57 -33
- package/src/prover/zenon/tla/rewrites.ts +12 -19
- package/src/prover/zenon/tla/sets.ts +83 -53
- package/src/prover/zenon/tla/terms.ts +0 -6
- package/src/prover/zenon/tla/tla.ts +66 -64
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +67 -184
- package/src/runtime.ts +22 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +6 -34
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +1 -9
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +541 -163
- package/src/simulate.ts +709 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +0 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -31
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +266 -99
- package/src/symmetry.ts +33 -25
- package/src/tableau.ts +27 -24
- package/src/tlc/fingerprint.ts +183 -67
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +36 -47
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +139 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- package/src/worker.ts +7 -8
package/src/cli/options.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
interface OptionSpec {
|
|
2
2
|
flag: string;
|
|
3
3
|
isRepeatable?: boolean;
|
|
4
|
-
// How many of the arguments after the flag the option takes, when that depends on them.
|
|
5
|
-
getArity?: (rest: string[]) => number;
|
|
6
4
|
}
|
|
7
5
|
|
|
8
6
|
interface ParsedOption {
|
|
@@ -19,37 +17,31 @@ export interface ParsedArgs {
|
|
|
19
17
|
get: (name: string) => string[] | undefined;
|
|
20
18
|
}
|
|
21
19
|
|
|
22
|
-
// Each <name> in a flag such as "--toolbox <start> <end>" is one value the option takes, and
|
|
23
|
-
// {options} in the usage stands for the options.
|
|
24
20
|
export const defineCommand = (usage: string, specs: OptionSpec[]) => {
|
|
25
21
|
const arities = new Map(
|
|
26
22
|
specs.map((spec) => {
|
|
27
23
|
const [name, ...values] = spec.flag.split(" ");
|
|
28
|
-
return [name,
|
|
24
|
+
return [name, values.length];
|
|
29
25
|
}),
|
|
30
26
|
);
|
|
31
27
|
const parse = (args: string[]): ParsedArgs => {
|
|
32
28
|
const options: ParsedOption[] = [];
|
|
33
29
|
const positionals: string[] = [];
|
|
34
30
|
const unknown: string[] = [];
|
|
35
|
-
const incomplete: ParsedOption[] = [];
|
|
36
31
|
for (let index = 0; index < args.length; index++) {
|
|
37
|
-
const
|
|
38
|
-
if (
|
|
32
|
+
const arity = arities.get(args[index]);
|
|
33
|
+
if (arity === undefined) {
|
|
39
34
|
(args[index].startsWith("-") ? unknown : positionals).push(args[index]);
|
|
40
35
|
continue;
|
|
41
36
|
}
|
|
42
|
-
|
|
43
|
-
const option = { name: args[index], values: args.slice(index + 1, index + 1 + arity) };
|
|
44
|
-
options.push(option);
|
|
45
|
-
if (option.values.length < arity) incomplete.push(option);
|
|
37
|
+
options.push({ name: args[index], values: args.slice(index + 1, index + 1 + arity) });
|
|
46
38
|
index += arity;
|
|
47
39
|
}
|
|
48
40
|
return {
|
|
49
41
|
options,
|
|
50
42
|
positionals,
|
|
51
43
|
unknown,
|
|
52
|
-
incomplete:
|
|
44
|
+
incomplete: options.find((option) => option.values.length < (arities.get(option.name) ?? 0)),
|
|
53
45
|
has: (name) => options.some((option) => option.name === name),
|
|
54
46
|
get: (name) => options.findLast((option) => option.name === name)?.values,
|
|
55
47
|
};
|
|
@@ -63,24 +55,6 @@ export const defineCommand = (usage: string, specs: OptionSpec[]) => {
|
|
|
63
55
|
};
|
|
64
56
|
};
|
|
65
57
|
|
|
66
|
-
export const CHECK_COMMAND = defineCommand("tla-ts <Spec.tla|Spec.cfg|glob>... {options}", [
|
|
67
|
-
{ flag: "-config <Spec.cfg>" },
|
|
68
|
-
{ flag: "-continue" },
|
|
69
|
-
{ flag: "-deadlock" },
|
|
70
|
-
// Like TLC, -dump takes a format only when the next argument starts with dot and a file follows.
|
|
71
|
-
{
|
|
72
|
-
flag: "-dump [<format>] <file>",
|
|
73
|
-
getArity: (rest) => (rest.length > 1 && rest[0].startsWith("dot") ? 2 : 1),
|
|
74
|
-
},
|
|
75
|
-
{ flag: "-fp <num>" },
|
|
76
|
-
{ flag: "-lncheck <final|default>" },
|
|
77
|
-
{ flag: "-metadir <directory>" },
|
|
78
|
-
{ flag: "-nowarning" },
|
|
79
|
-
{ flag: "-seed <num>" },
|
|
80
|
-
{ flag: "-tool" },
|
|
81
|
-
{ flag: "-workers <count|auto>" },
|
|
82
|
-
]);
|
|
83
|
-
|
|
84
58
|
export const TLAPM_COMMAND = defineCommand("tla-ts tlapm {options} <Module.tla|glob>...", [
|
|
85
59
|
{ flag: "-N" },
|
|
86
60
|
{ flag: "--summary" },
|
|
@@ -99,10 +73,16 @@ export const TLAPM_COMMAND = defineCommand("tla-ts tlapm {options} <Module.tla|g
|
|
|
99
73
|
{ flag: "--cleanfp" },
|
|
100
74
|
{ flag: "--usefp <file>" },
|
|
101
75
|
{ flag: "--cache-dir <directory>" },
|
|
76
|
+
{ flag: "--debug <flags>", isRepeatable: true },
|
|
77
|
+
{ flag: "--method <methods>" },
|
|
78
|
+
{ flag: "--solver <command>" },
|
|
79
|
+
{ flag: "--smt-logic <logic>" },
|
|
80
|
+
{ flag: "--stretch <factor>" },
|
|
81
|
+
{ flag: "--noflatten" },
|
|
102
82
|
]);
|
|
103
83
|
|
|
104
84
|
export const USAGE = [
|
|
105
|
-
|
|
85
|
+
"Usage: tla-ts <Spec.tla|Spec.cfg|spec.ts|glob>... [-config <Spec.cfg>] [-continue] [-deadlock] [-dump [<format>] <file>] [-fp <num>] [-lncheck <final|default|off>] [-maxSetSize <num>] [-metadir <directory>] [-nowarning] [-seed <num>] [-terse] [-tool] [-view] [-workers <count|auto>]",
|
|
106
86
|
` ${TLAPM_COMMAND.usage}`,
|
|
107
87
|
" tla-ts [<JVM option>]... tlc2.TLC <TLC option>... <Spec>",
|
|
108
88
|
" (-cp tla2tools.jar or -Dtla-ts.tlc=1.7.4 picks the TLC to reproduce)",
|
package/src/cli/run.ts
CHANGED
|
@@ -5,8 +5,6 @@ import { runTlapm } from "./tlapm";
|
|
|
5
5
|
import { checkSpecs } from "./tlc";
|
|
6
6
|
import { exportXml, exportXml174 } from "./xml-exporter";
|
|
7
7
|
|
|
8
|
-
// Tools that run TLC with Java, such as pstack's statechart skill, can run tla-ts in place of java,
|
|
9
|
-
// as in `tla-ts -DTLA-Library=lib -cp tla2tools.jar tlc2.TLC Spec`. Other JVM options are ignored.
|
|
10
8
|
const JAVA_MAIN_CLASSES = ["tlc2.TLC", "tla2sany.xml.XMLExporter"];
|
|
11
9
|
|
|
12
10
|
const TLA_LIBRARY_PROPERTY = "-DTLA-Library=";
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { TlaEvaluationError, TlaSyntaxError } from "../errors";
|
|
2
|
+
import { EXIT_STATUS, setExitCode } from "../exit-codes";
|
|
3
|
+
import { parseModule } from "../parser";
|
|
4
|
+
import { generateSanySpecification } from "../sany/generator";
|
|
5
|
+
import { checkModuleLevels } from "../sany/levels";
|
|
6
|
+
import {
|
|
7
|
+
VARIABLE_DECL_KIND,
|
|
8
|
+
type ModuleNode,
|
|
9
|
+
type OpDefNode,
|
|
10
|
+
type SymbolNode,
|
|
11
|
+
} from "../sany/nodes";
|
|
12
|
+
import type { TlcVersion } from "../tlc/version";
|
|
13
|
+
import type { RuntimeInvariant } from "./tlc-arguments";
|
|
14
|
+
|
|
15
|
+
const CONSTANT_LEVEL = 0;
|
|
16
|
+
const TEMPORAL_LEVEL = 3;
|
|
17
|
+
|
|
18
|
+
const isUserDefinition = (symbol: SymbolNode): symbol is OpDefNode =>
|
|
19
|
+
symbol.kind === "OpDef" && symbol.defKind !== "BuiltIn" && symbol.defKind !== "ModuleInstance";
|
|
20
|
+
|
|
21
|
+
const findDefinition = (module: ModuleNode, name: string) =>
|
|
22
|
+
module.context.symbols.find(
|
|
23
|
+
(symbol): symbol is OpDefNode => isUserDefinition(symbol) && symbol.name === name,
|
|
24
|
+
);
|
|
25
|
+
|
|
26
|
+
const createParsingFailure = (detail: string) =>
|
|
27
|
+
setExitCode(
|
|
28
|
+
new TlaEvaluationError(
|
|
29
|
+
`Parsing or semantic analysis failed.Parsing or semantic analysis failed.${detail}`,
|
|
30
|
+
),
|
|
31
|
+
EXIT_STATUS.specParseError,
|
|
32
|
+
);
|
|
33
|
+
|
|
34
|
+
const getDebuggerExpressionLevel = (
|
|
35
|
+
root: string,
|
|
36
|
+
name: string,
|
|
37
|
+
expression: string,
|
|
38
|
+
loadModule: (name: string) => string | undefined,
|
|
39
|
+
version: TlcVersion,
|
|
40
|
+
) => {
|
|
41
|
+
const moduleName = name.replace("__DebuggerExpr__", "__DebuggerModule__");
|
|
42
|
+
const text = `---- MODULE ${moduleName} ----\nEXTENDS ${root}\n\n${name} == ${expression}\n====`;
|
|
43
|
+
const createFailure = (message: string) =>
|
|
44
|
+
createParsingFailure(
|
|
45
|
+
`Unknown location\n\n${message} while parsing breakpoint expression "${expression}"`,
|
|
46
|
+
);
|
|
47
|
+
try {
|
|
48
|
+
parseModule(text);
|
|
49
|
+
} catch (error) {
|
|
50
|
+
if (!(error instanceof TlaSyntaxError)) throw error;
|
|
51
|
+
throw createParsingFailure(`Syntax error while parsing breakpoint expression "${expression}"`);
|
|
52
|
+
}
|
|
53
|
+
let isSemanticCorrect = false;
|
|
54
|
+
let isLevelCorrect = false;
|
|
55
|
+
const specification = (() => {
|
|
56
|
+
try {
|
|
57
|
+
return generateSanySpecification(text, loadModule, {
|
|
58
|
+
version,
|
|
59
|
+
onModule: (module, messages) => {
|
|
60
|
+
const isCorrect = () => messages.every((message) => message.isWarning);
|
|
61
|
+
if (!isCorrect()) return;
|
|
62
|
+
const isLevelChecked = checkModuleLevels(module, {
|
|
63
|
+
messages,
|
|
64
|
+
isTlc174: version === "1.7.4",
|
|
65
|
+
});
|
|
66
|
+
if (module.name !== moduleName) return;
|
|
67
|
+
isSemanticCorrect = true;
|
|
68
|
+
isLevelCorrect = isLevelChecked && isCorrect();
|
|
69
|
+
},
|
|
70
|
+
});
|
|
71
|
+
} catch (error) {
|
|
72
|
+
if (!(error instanceof TlaSyntaxError)) throw error;
|
|
73
|
+
throw createFailure("Semantic error");
|
|
74
|
+
}
|
|
75
|
+
})();
|
|
76
|
+
if (!isSemanticCorrect) throw createFailure("Semantic error");
|
|
77
|
+
if (!isLevelCorrect) throw createFailure("Level-checking error");
|
|
78
|
+
const level = findDefinition(specification.root, name)?.level ?? CONSTANT_LEVEL;
|
|
79
|
+
if (level === TEMPORAL_LEVEL) {
|
|
80
|
+
throw createParsingFailure(
|
|
81
|
+
`Unknown location\n\nDebug expressions must be action-level or below; actual level: ${level} (Temporal)`,
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
return level;
|
|
85
|
+
};
|
|
86
|
+
|
|
87
|
+
// Deviation from TLC: TLC puts a generated operator in a module that extends the root module.
|
|
88
|
+
export const addRuntimeInvariants = (
|
|
89
|
+
source: string,
|
|
90
|
+
root: ModuleNode,
|
|
91
|
+
invariants: RuntimeInvariant[],
|
|
92
|
+
loadModule: (name: string) => string | undefined,
|
|
93
|
+
version: TlcVersion,
|
|
94
|
+
) => {
|
|
95
|
+
const stamp = Date.now();
|
|
96
|
+
const named = invariants.map((invariant, index) => ({
|
|
97
|
+
expression: invariant.expression,
|
|
98
|
+
name: findDefinition(root, invariant.expression)
|
|
99
|
+
? invariant.expression
|
|
100
|
+
: `__DebuggerExpr__${stamp + index}`,
|
|
101
|
+
}));
|
|
102
|
+
const names = named.map((invariant) => invariant.name);
|
|
103
|
+
const generated = named.filter((invariant) => invariant.name !== invariant.expression);
|
|
104
|
+
if (generated.length === 0) return { names, source };
|
|
105
|
+
const loadDependency = (name: string) => (name === root.name ? source : loadModule(name));
|
|
106
|
+
const variable = root.context.symbols.find(
|
|
107
|
+
(symbol) => symbol.kind === "OpDecl" && symbol.declKind === VARIABLE_DECL_KIND,
|
|
108
|
+
);
|
|
109
|
+
const definitions = generated.map((invariant) => {
|
|
110
|
+
const head = `${invariant.name} == `;
|
|
111
|
+
const level = getDebuggerExpressionLevel(
|
|
112
|
+
root.name,
|
|
113
|
+
invariant.name,
|
|
114
|
+
invariant.expression,
|
|
115
|
+
loadDependency,
|
|
116
|
+
version,
|
|
117
|
+
);
|
|
118
|
+
// HACK: TLC checks a constant-level -inv in every state, so an unused LET makes it depend on one.
|
|
119
|
+
return level === CONSTANT_LEVEL && variable
|
|
120
|
+
? `${invariant.name} ==\nLET ${invariant.name}State == ${variable.name} IN\n${" ".repeat(head.length)}${invariant.expression}`
|
|
121
|
+
: `${head}${invariant.expression}`;
|
|
122
|
+
});
|
|
123
|
+
const lines = source.split("\n");
|
|
124
|
+
const end = (parseModule(source).location.range?.end.line ?? lines.length) - 1;
|
|
125
|
+
const terminator = lines[end].search(/={4,}/);
|
|
126
|
+
return {
|
|
127
|
+
names,
|
|
128
|
+
source: [
|
|
129
|
+
...lines.slice(0, end),
|
|
130
|
+
lines[end].slice(0, terminator),
|
|
131
|
+
...definitions,
|
|
132
|
+
lines[end].slice(terminator),
|
|
133
|
+
...lines.slice(end + 1),
|
|
134
|
+
].join("\n"),
|
|
135
|
+
};
|
|
136
|
+
};
|
package/src/cli/shared.ts
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
import { existsSync, globSync, readFileSync } from "node:fs";
|
|
2
2
|
import { delimiter, isAbsolute, join, resolve } from "node:path";
|
|
3
3
|
import { pathToFileURL } from "node:url";
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
getErrorExitCode,
|
|
6
|
+
TlaConfigError,
|
|
7
|
+
TlaError,
|
|
8
|
+
TlaEvaluationError,
|
|
9
|
+
TlaWarningAsError,
|
|
10
|
+
} from "../errors";
|
|
11
|
+
import { getMessageExitStatus } from "../exit-codes";
|
|
5
12
|
import { SANY_174_STANDARD_MODULES } from "../sany/modules";
|
|
6
13
|
import type { TlcVersion } from "../tlc/version";
|
|
7
14
|
import {
|
|
@@ -29,7 +36,6 @@ export const getInputPaths = (paths: string[]): InputPath[] =>
|
|
|
29
36
|
: [{ path: arg, isGlobbed: false }],
|
|
30
37
|
);
|
|
31
38
|
|
|
32
|
-
// Like TLC, tla-ts finds a module in the directory of the spec, then in each library directory.
|
|
33
39
|
export const findModuleFile = (directories: string[], name: string) =>
|
|
34
40
|
directories.map((directory) => join(directory, `${name}.tla`)).find(existsSync);
|
|
35
41
|
|
|
@@ -38,7 +44,6 @@ export const createModuleLoader = (directories: string[]) => (name: string) => {
|
|
|
38
44
|
return path === undefined ? undefined : readFileSync(path, "utf8");
|
|
39
45
|
};
|
|
40
46
|
|
|
41
|
-
// SimpleFilenameToStream: SANY names the file of a module it can't find, and where it looked.
|
|
42
47
|
export const printMissingFile = (userDirectory: string, fileName: string, directories: string[]) =>
|
|
43
48
|
console.error(
|
|
44
49
|
`File does not exist: ${userDirectory}/${fileName} while looking in these directories: ${userDirectory}, ${directories.join(", ")}, classpath:/tla2sany/StandardModules, classpath:/`,
|
|
@@ -47,12 +52,18 @@ export const printMissingFile = (userDirectory: string, fileName: string, direct
|
|
|
47
52
|
export const getStandardModulesUrl = (jar: string) =>
|
|
48
53
|
`jar:file:${pathToFileURL(resolve(jar)).pathname}!/tla2sany/StandardModules/`;
|
|
49
54
|
|
|
50
|
-
|
|
51
|
-
|
|
55
|
+
export const getTopLevelExitCode = (error: TlaError) =>
|
|
56
|
+
error instanceof TlaWarningAsError ? getMessageExitStatus(error.code) : getErrorExitCode(error);
|
|
57
|
+
|
|
52
58
|
export const printError = (error: TlaError, printer: MessagePrinter) => {
|
|
53
59
|
if (error instanceof TlaConfigError || error instanceof TlaEvaluationError) {
|
|
54
60
|
const coded = getCodedMessage(error.message);
|
|
55
|
-
const code =
|
|
61
|
+
const code =
|
|
62
|
+
error instanceof TlaWarningAsError
|
|
63
|
+
? error.code
|
|
64
|
+
: coded && !coded.isEvalException
|
|
65
|
+
? coded.code
|
|
66
|
+
: MESSAGE_CODE.general;
|
|
56
67
|
return printer.print(
|
|
57
68
|
code,
|
|
58
69
|
MESSAGE_LEVEL.error,
|
|
@@ -64,29 +75,25 @@ export const printError = (error: TlaError, printer: MessagePrinter) => {
|
|
|
64
75
|
|
|
65
76
|
export const reportErrors = async (
|
|
66
77
|
run: () => number | Promise<number>,
|
|
67
|
-
printer = createMessagePrinter(false),
|
|
78
|
+
printer = createMessagePrinter({ isTool: false }),
|
|
68
79
|
) => {
|
|
69
80
|
try {
|
|
70
81
|
return await run();
|
|
71
82
|
} catch (error) {
|
|
72
83
|
if (!(error instanceof TlaError)) throw error;
|
|
73
84
|
printError(error, printer);
|
|
74
|
-
return
|
|
85
|
+
return getTopLevelExitCode(error);
|
|
75
86
|
}
|
|
76
87
|
};
|
|
77
88
|
|
|
78
|
-
// TLC 1.7.4's FileUtil.createNamedInputStream names the last file SimpleFilenameToStream looked
|
|
79
|
-
// for, and the directories it looked in, the jar's standard modules last.
|
|
80
89
|
export const printMissingFile174 = (path: string, libraries: string[], jar: string | undefined) =>
|
|
81
90
|
console.error(
|
|
82
91
|
`File does not exist: ${isAbsolute(path) ? path : `${process.cwd()}/${path}`} while looking in these directories: ${[...libraries, ...(jar === undefined ? [] : [getStandardModulesUrl(jar)])].join(", ")}`,
|
|
83
92
|
);
|
|
84
93
|
|
|
85
|
-
// SimpleFilenameToStream ends a library directory with a separator.
|
|
86
94
|
export const toLibraryPath = (directory: string) =>
|
|
87
95
|
directory.endsWith("/") ? directory : `${directory}/`;
|
|
88
96
|
|
|
89
|
-
// TLC 1.7.4's SANY reports each module it can't find as it looks for it.
|
|
90
97
|
export const reportMissingModules174 =
|
|
91
98
|
(loadModule: (name: string) => string | undefined, onMissing: (fileName: string) => void) =>
|
|
92
99
|
(name: string) => {
|
package/src/cli/tlapm.ts
CHANGED
|
@@ -17,6 +17,8 @@ import { printSequent } from "../obligations/printer";
|
|
|
17
17
|
import {
|
|
18
18
|
encodeProofTheory,
|
|
19
19
|
formatNormalized,
|
|
20
|
+
getFailureReason,
|
|
21
|
+
isProvedAttempt,
|
|
20
22
|
proveObligations,
|
|
21
23
|
type ProofAttempt,
|
|
22
24
|
} from "../prover/prove";
|
|
@@ -34,18 +36,15 @@ import { getInputPaths } from "./shared";
|
|
|
34
36
|
|
|
35
37
|
const TLAPM_INTEGER_OPTIONS = new Set(["--toolbox", "--line", "--threads", "--nofpl"]);
|
|
36
38
|
|
|
37
|
-
// tlapm searches the current directory, then its standard library at lib/tlapm/stdlib beside
|
|
38
|
-
// bin/tlapm, then each -I directory, the last given first.
|
|
39
39
|
const getLibraryDirectories = (parsed: ParsedArgs) => [
|
|
40
40
|
".",
|
|
41
41
|
...getTlapmPaths()
|
|
42
42
|
.map((path) => join(dirname(dirname(realpathSync(path))), "lib/tlapm/stdlib"))
|
|
43
|
-
.filter(
|
|
43
|
+
.filter(existsSync)
|
|
44
44
|
.slice(0, 1),
|
|
45
45
|
...parsed.options.flatMap((option) => (option.name === "-I" ? option.values : [])).toReversed(),
|
|
46
46
|
];
|
|
47
47
|
|
|
48
|
-
// A message of tlapm's toolbox protocol, which it writes to stderr.
|
|
49
48
|
const printToolboxMessage = (fields: string[]) =>
|
|
50
49
|
console.error(`@!!BEGIN\n${fields.map((field) => `@!!${field}\n`).join("")}@!!END\n`);
|
|
51
50
|
|
|
@@ -63,7 +62,6 @@ const TLAPM_VERSION = "9ed0376";
|
|
|
63
62
|
const quoteShellArgument = (arg: string) =>
|
|
64
63
|
/^[+,\-./0-9:=@A-Z_a-z]+$/.test(arg) ? arg : `'${arg.replaceAll("'", "'\\''")}'`;
|
|
65
64
|
|
|
66
|
-
// The most severe first.
|
|
67
65
|
const STRICT_EXIT_STATUS = { failed: 10, incomplete: 11, emptyTarget: 12 };
|
|
68
66
|
|
|
69
67
|
const checkStrictly = (module: ModuleObligations, isTargeted: boolean, isSummary: boolean) => {
|
|
@@ -113,11 +111,10 @@ const generateObligations = (generate: () => ModuleObligations[]) => {
|
|
|
113
111
|
}
|
|
114
112
|
};
|
|
115
113
|
|
|
116
|
-
// Toolbox.print_res_aux.
|
|
117
114
|
const printAttempt = (obligation: PrintedObligation, attempt: ProofAttempt) => {
|
|
118
115
|
const timeLimitMs = attempt.method.timeLimitMs;
|
|
119
116
|
const used =
|
|
120
|
-
attempt.
|
|
117
|
+
attempt.kind !== "decided"
|
|
121
118
|
? ""
|
|
122
119
|
: `; time-used: ${(attempt.timeUsedMs / 1000).toFixed(1)} (${Math.round((100 * attempt.timeUsedMs) / timeLimitMs)}%)`;
|
|
123
120
|
const times =
|
|
@@ -126,24 +123,24 @@ const printAttempt = (obligation: PrintedObligation, attempt: ProofAttempt) => {
|
|
|
126
123
|
: `time-limit: ${timeLimitMs === Infinity ? "inf" : Number((timeLimitMs / 1000).toPrecision(6))}${used}`;
|
|
127
124
|
const method = [attempt.method.tactic, times].filter(Boolean).join("; ");
|
|
128
125
|
const isSmt = attempt.method.prover === "smt" || attempt.method.prover === "z3";
|
|
126
|
+
const reason = getFailureReason(attempt);
|
|
129
127
|
const note =
|
|
130
|
-
isSmt && attempt.
|
|
128
|
+
isSmt && attempt.kind === "decided" && reason === "false"
|
|
131
129
|
? `(* SMT failed with status = ${attempt.verdict}\n *)\n`
|
|
132
130
|
: "";
|
|
133
|
-
|
|
131
|
+
const isProved = isProvedAttempt(attempt);
|
|
132
|
+
const isReused = attempt.kind === "reused";
|
|
133
|
+
printObligationMessage(obligation, isProved ? "proved" : "failed", [
|
|
134
134
|
`prover:${attempt.method.prover}`,
|
|
135
135
|
...(method === "" ? [] : [`meth:${method}`]),
|
|
136
|
-
...(
|
|
137
|
-
`already:${
|
|
138
|
-
...(
|
|
136
|
+
...(reason === undefined ? [] : [`reason:${reason}`]),
|
|
137
|
+
`already:${isReused}`,
|
|
138
|
+
...(isProved
|
|
139
139
|
? []
|
|
140
|
-
: [
|
|
141
|
-
`obl:${attempt.isReused ? "" : `\n${note}`}${formatNormalized(obligation, attempt.isReused)}`,
|
|
142
|
-
]),
|
|
140
|
+
: [`obl:${isReused ? "" : `\n${note}`}${formatNormalized(obligation, isReused)}`]),
|
|
143
141
|
]);
|
|
144
142
|
};
|
|
145
143
|
|
|
146
|
-
// Method.Fail, for an error obligation or one no method was tried on.
|
|
147
144
|
const printFailedObligation = (obligation: PrintedObligation, reason: string) =>
|
|
148
145
|
printObligationMessage(obligation, "failed", [
|
|
149
146
|
"prover:fail",
|
|
@@ -161,7 +158,6 @@ interface ProvingSettings {
|
|
|
161
158
|
fingerprints: FingerprintTable;
|
|
162
159
|
}
|
|
163
160
|
|
|
164
|
-
// Tlapm_lib.process_obs. Returns whether some obligation failed.
|
|
165
161
|
const proveModule = async (
|
|
166
162
|
module: ModuleObligations,
|
|
167
163
|
theoryPath: string,
|
|
@@ -252,14 +248,12 @@ export const runTlapm = async (args: string[]) => {
|
|
|
252
248
|
`\n\\* TLAPM version ${TLAPM_VERSION}\n\\* launched at ${formatTlcDate(new Date())} with command line:\n\\* ${["tla-ts", "tlapm", ...args].map(quoteShellArgument).join(" ")}\n`,
|
|
253
249
|
);
|
|
254
250
|
}
|
|
255
|
-
// Like tlapm, the last of --toolbox and --line wins, and a 0 means the whole module.
|
|
256
251
|
const lines = parsed.options.reduce<LineRange>((range, option) => {
|
|
257
252
|
const [start, end] = option.values.map(Number);
|
|
258
253
|
if (option.name === "--toolbox") return { start, end: end === 0 ? Infinity : end };
|
|
259
254
|
if (option.name === "--line") return start === 0 ? WHOLE_MODULE : { start, end: start };
|
|
260
255
|
return range;
|
|
261
256
|
}, WHOLE_MODULE);
|
|
262
|
-
// tlapm also searches each module's directory. Without tlapm, TLAPS is tla-ts's copy.
|
|
263
257
|
const directories = modulePaths.reduce(
|
|
264
258
|
(found, path) => (found.includes(dirname(path)) ? found : [dirname(path), ...found]),
|
|
265
259
|
getLibraryDirectories(parsed),
|
|
@@ -276,10 +270,7 @@ export const runTlapm = async (args: string[]) => {
|
|
|
276
270
|
modulePaths.map((path) => ({ file: `./${path}`, source: readFileSync(path, "utf8") })),
|
|
277
271
|
(name) => {
|
|
278
272
|
moduleNames.add(name);
|
|
279
|
-
|
|
280
|
-
const file = directories
|
|
281
|
-
.map((directory) => `${directory}/${name}.tla`)
|
|
282
|
-
.find((path) => existsSync(path));
|
|
273
|
+
const file = directories.map((directory) => `${directory}/${name}.tla`).find(existsSync);
|
|
283
274
|
if (file !== undefined) return { file, source: readFileSync(file, "utf8") };
|
|
284
275
|
return name === "TLAPS" ? { file: "TLAPS.tla", source: TLAPS_MODULE } : undefined;
|
|
285
276
|
},
|
|
@@ -315,7 +306,6 @@ export const runTlapm = async (args: string[]) => {
|
|
|
315
306
|
};
|
|
316
307
|
const statuses: number[] = [];
|
|
317
308
|
for (const [index, module] of modules.entries()) {
|
|
318
|
-
// Tlapm_lib.mkdir_tlaps.
|
|
319
309
|
const directory = `${cacheDirectory}/${module.name}.tlaps`;
|
|
320
310
|
const fingerprintsPath = `${directory}/fingerprints`;
|
|
321
311
|
const loadedPath = parsed.get("--usefp")?.[0] ?? fingerprintsPath;
|
|
@@ -348,7 +338,6 @@ export const runTlapm = async (args: string[]) => {
|
|
|
348
338
|
...checkStrictly(module, lines.start > 0 || lines.end < Infinity, parsed.has("--summary")),
|
|
349
339
|
);
|
|
350
340
|
if (!isProcessing) continue;
|
|
351
|
-
// tlapm's history holds the source of each module read so far.
|
|
352
341
|
saveHistory(
|
|
353
342
|
fingerprintsPath,
|
|
354
343
|
[...moduleNames, ...modules.slice(0, index + 1).map((innerModule) => innerModule.name)].map(
|