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/state-graph.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// A port of TLC's -dump writers, tlc2.util.StateWriter and tlc2.util.DotStateWriter.
|
|
2
2
|
|
|
3
|
+
import { getJavaHashCode } from "./java-hash";
|
|
3
4
|
import type { TlcVersion } from "./tlc/version";
|
|
4
5
|
|
|
5
6
|
export interface StateDump {
|
|
@@ -8,12 +9,14 @@ export interface StateDump {
|
|
|
8
9
|
colorize?: boolean;
|
|
9
10
|
actionLabels?: boolean;
|
|
10
11
|
snapshot?: boolean;
|
|
12
|
+
constrained?: boolean;
|
|
13
|
+
stuttering?: boolean;
|
|
14
|
+
strict?: boolean;
|
|
11
15
|
}
|
|
12
16
|
|
|
13
17
|
export interface GraphState {
|
|
14
18
|
fingerprint: bigint;
|
|
15
19
|
level: number;
|
|
16
|
-
// The state as TLC prints it after evaluating the alias, and as it prints it without the alias.
|
|
17
20
|
getLabel: () => string;
|
|
18
21
|
getText: () => string;
|
|
19
22
|
}
|
|
@@ -31,7 +34,12 @@ export interface StateWriter {
|
|
|
31
34
|
isSeen: boolean,
|
|
32
35
|
action: GraphAction | undefined,
|
|
33
36
|
) => void;
|
|
34
|
-
|
|
37
|
+
writeConstrained: (
|
|
38
|
+
state: GraphState,
|
|
39
|
+
successor: GraphState,
|
|
40
|
+
action: GraphAction | undefined,
|
|
41
|
+
constraint: string,
|
|
42
|
+
) => void;
|
|
35
43
|
writeStuttering: (state: GraphState) => void;
|
|
36
44
|
close: () => void;
|
|
37
45
|
}
|
|
@@ -45,8 +53,6 @@ const INITIAL_CAPACITY = 16;
|
|
|
45
53
|
const getCapacity = (size: number, capacity = INITIAL_CAPACITY): number =>
|
|
46
54
|
size <= capacity * LOAD_FACTOR ? capacity : getCapacity(size, capacity * 2);
|
|
47
55
|
|
|
48
|
-
// The order in which a java.util.HashMap iterates over keys put in this order: by bucket, and in
|
|
49
|
-
// insertion order within a bucket. A bucket only becomes a tree once 8 keys collide in it.
|
|
50
56
|
const getJavaHashOrder = <Key>(keys: Key[], getHash: (key: Key) => number) => {
|
|
51
57
|
const mask = getCapacity(keys.length) - 1;
|
|
52
58
|
const getBucket = (key: Key) => {
|
|
@@ -62,12 +68,6 @@ const getJavaHashOrder = <Key>(keys: Key[], getHash: (key: Key) => number) => {
|
|
|
62
68
|
const getLongHash = (value: bigint) =>
|
|
63
69
|
Number(BigInt.asIntN(32, value ^ (BigInt.asUintN(64, value) >> 32n)));
|
|
64
70
|
|
|
65
|
-
const getStringHash = (text: string) =>
|
|
66
|
-
[...Array(text.length).keys()].reduce(
|
|
67
|
-
(hash, index) => (Math.imul(31, hash) + text.charCodeAt(index)) | 0,
|
|
68
|
-
0,
|
|
69
|
-
);
|
|
70
|
-
|
|
71
71
|
const escapeDotString = (text: string) =>
|
|
72
72
|
text.replaceAll("\\", "\\\\").replaceAll('"', '\\"').trim();
|
|
73
73
|
|
|
@@ -82,14 +82,12 @@ const createPlainWriter = (dump: StateDump, writeFile: WriteFile): StateWriter =
|
|
|
82
82
|
writeSuccessor: (_state, successor, isSeen) => {
|
|
83
83
|
if (!isSeen) writeState(successor);
|
|
84
84
|
},
|
|
85
|
-
|
|
85
|
+
writeConstrained: () => {},
|
|
86
86
|
writeStuttering: writeState,
|
|
87
87
|
close: () => writeFile?.(dump.path, states.join("")),
|
|
88
88
|
};
|
|
89
89
|
};
|
|
90
90
|
|
|
91
|
-
// TLC 1.7.4 draws its nodes as ellipses, gives them no tooltip, and labels an edge with the name
|
|
92
|
-
// of its action alone.
|
|
93
91
|
const createDotWriter = (
|
|
94
92
|
dump: StateDump,
|
|
95
93
|
writeFile: WriteFile,
|
|
@@ -106,11 +104,19 @@ const createDotWriter = (
|
|
|
106
104
|
];
|
|
107
105
|
const ranks = new Map<number, Set<bigint>>();
|
|
108
106
|
const colors = new Map<string, number>();
|
|
107
|
+
// Deviation from TLC: it keys an edge by the XOR of its fingerprints, which merges distinct edges.
|
|
108
|
+
const edges = new Set<string>();
|
|
109
|
+
const isDuplicate = (state: GraphState, successor: GraphState) => {
|
|
110
|
+
if (!dump.strict) return false;
|
|
111
|
+
const key = `${state.fingerprint} ${successor.fingerprint}`;
|
|
112
|
+
if (edges.has(key)) return true;
|
|
113
|
+
edges.add(key);
|
|
114
|
+
return false;
|
|
115
|
+
};
|
|
109
116
|
const addRank = (state: GraphState) => {
|
|
110
117
|
const rank = ranks.get(state.level) ?? new Set();
|
|
111
118
|
ranks.set(state.level, rank.add(state.fingerprint));
|
|
112
119
|
};
|
|
113
|
-
// TLC colors an edge by the name of its action, numbering the names from 2 as it finds them.
|
|
114
120
|
const getColor = (action: GraphAction | undefined) => {
|
|
115
121
|
if (!action) return 1;
|
|
116
122
|
const color = colors.get(action.name) ?? colors.size + 2;
|
|
@@ -121,7 +127,7 @@ const createDotWriter = (
|
|
|
121
127
|
[
|
|
122
128
|
`subgraph cluster_legend {graph[style=bold];label = "Next State Actions" style="solid"\n`,
|
|
123
129
|
`node [ labeljust="l",colorscheme="${COLOR_SCHEME}",style=filled,shape=record ]\n`,
|
|
124
|
-
...getJavaHashOrder([...colors.keys()],
|
|
130
|
+
...getJavaHashOrder([...colors.keys()], getJavaHashCode).map(
|
|
125
131
|
(name) => `${name.replaceAll("!", ":")} [label="${name}",fillcolor=${colors.get(name)}]\n`,
|
|
126
132
|
),
|
|
127
133
|
"}",
|
|
@@ -143,30 +149,45 @@ const createDotWriter = (
|
|
|
143
149
|
writeFile?.(dump.path.replaceAll(".dot", "_snapshot.dot"), lines.join("") + getEnding());
|
|
144
150
|
}
|
|
145
151
|
};
|
|
152
|
+
const writeEdge = (
|
|
153
|
+
state: GraphState,
|
|
154
|
+
successor: GraphState,
|
|
155
|
+
isSeen: boolean,
|
|
156
|
+
action: GraphAction | undefined,
|
|
157
|
+
constraint?: string,
|
|
158
|
+
) => {
|
|
159
|
+
if (isDuplicate(state, successor)) return;
|
|
160
|
+
const color = dump.colorize ? String(getColor(action)) : "black";
|
|
161
|
+
const name =
|
|
162
|
+
dump.actionLabels && action ? escapeDotString(is174 ? action.name : action.signature) : "";
|
|
163
|
+
const label = constraint === undefined ? name : `${name}\n${constraint}`;
|
|
164
|
+
lines.push(
|
|
165
|
+
`${state.fingerprint} -> ${successor.fingerprint} [label="${label}",color="${color}",fontcolor="${color}"];\n`,
|
|
166
|
+
);
|
|
167
|
+
if (!isSeen) {
|
|
168
|
+
const tooltip = is174 ? "" : `,tooltip="${toDotLabel(successor.getText())}"`;
|
|
169
|
+
const fill = constraint === undefined ? "" : ",style = filled, fillcolor=lightyellow";
|
|
170
|
+
lines.push(
|
|
171
|
+
`${successor.fingerprint} [label="${toDotLabel(successor.getLabel())}"${tooltip}${fill}];\n`,
|
|
172
|
+
);
|
|
173
|
+
}
|
|
174
|
+
addRank(state);
|
|
175
|
+
writeSnapshot();
|
|
176
|
+
};
|
|
146
177
|
return {
|
|
147
178
|
writeInitialState: (state) => {
|
|
148
179
|
lines.push(`${state.fingerprint} [label="${toDotLabel(state.getLabel())}",style = filled]\n`);
|
|
149
180
|
addRank(state);
|
|
150
181
|
writeSnapshot();
|
|
151
182
|
},
|
|
152
|
-
writeSuccessor:
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
183
|
+
writeSuccessor: writeEdge,
|
|
184
|
+
writeConstrained: (state, successor, action, constraint) =>
|
|
185
|
+
writeEdge(state, successor, false, action, constraint),
|
|
186
|
+
writeStuttering: (state) => {
|
|
187
|
+
if (isDuplicate(state, state)) return;
|
|
156
188
|
lines.push(
|
|
157
|
-
`${state.fingerprint} -> ${
|
|
189
|
+
`${state.fingerprint} -> ${state.fingerprint} [style="dashed"${is174 ? "" : ',color="lightgray"'}];\n`,
|
|
158
190
|
);
|
|
159
|
-
if (!isSeen) {
|
|
160
|
-
const tooltip = is174 ? "" : `,tooltip="${toDotLabel(successor.getText())}"`;
|
|
161
|
-
lines.push(
|
|
162
|
-
`${successor.fingerprint} [label="${toDotLabel(successor.getLabel())}"${tooltip}];\n`,
|
|
163
|
-
);
|
|
164
|
-
}
|
|
165
|
-
addRank(state);
|
|
166
|
-
writeSnapshot();
|
|
167
|
-
},
|
|
168
|
-
writeStuttering: (state) => {
|
|
169
|
-
lines.push(`${state.fingerprint} -> ${state.fingerprint} [style="dashed"];\n`);
|
|
170
191
|
addRank(state);
|
|
171
192
|
writeSnapshot();
|
|
172
193
|
},
|
package/src/subexpressions.ts
CHANGED
|
@@ -41,8 +41,6 @@ interface Selection {
|
|
|
41
41
|
location: SourceLocation;
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
// A name that selects a subexpression, with the range of each part and of the arguments of each
|
|
45
|
-
// part, where SANY reports an error in selecting that part.
|
|
46
44
|
interface SelectingName {
|
|
47
45
|
location: SourceLocation;
|
|
48
46
|
selectorRanges?: SourceRange[];
|
|
@@ -151,9 +149,6 @@ const applyDefinition = (definition: Definition, selection: Selection) => {
|
|
|
151
149
|
return createApplication({ ...selection, params: [...selection.params, ...params] }, reference);
|
|
152
150
|
};
|
|
153
151
|
|
|
154
|
-
// Generator.selectorToNode reports the first part of a name that selects nothing, after it analyzes
|
|
155
|
-
// the arguments of the parts before, and goes on after the name. An operator or a label must be given
|
|
156
|
-
// all its arguments, except in a name that an operator argument may select whole.
|
|
157
152
|
const selectSubexpression = (
|
|
158
153
|
selectors: Selector[],
|
|
159
154
|
lookup: Lookup,
|
|
@@ -162,25 +157,27 @@ const selectSubexpression = (
|
|
|
162
157
|
): Expression => {
|
|
163
158
|
const location = reference.location;
|
|
164
159
|
const selection: Selection = { params: [], args: [], lets: [], location };
|
|
165
|
-
|
|
160
|
+
let selectorIndex = 0;
|
|
161
|
+
let current = undefined as Expression | undefined;
|
|
162
|
+
let isFailed = false;
|
|
166
163
|
|
|
167
164
|
const report = (range: SourceRange | undefined, message: string) => {
|
|
168
165
|
if (!range) throw createError(message, location);
|
|
169
166
|
selectionErrors.set(reference, {
|
|
170
167
|
args: selectors
|
|
171
|
-
.slice(0,
|
|
168
|
+
.slice(0, selectorIndex)
|
|
172
169
|
.flatMap((selector) => ("args" in selector ? selector.args : [])),
|
|
173
170
|
error: { location: formatRange(range), message },
|
|
174
171
|
});
|
|
175
|
-
|
|
172
|
+
isFailed = true;
|
|
176
173
|
return undefined;
|
|
177
174
|
};
|
|
178
175
|
|
|
179
176
|
const findDefinition = (local: Definition[] | undefined) => {
|
|
180
177
|
const names: string[] = [];
|
|
181
178
|
const args: Expression[] = [];
|
|
182
|
-
while (
|
|
183
|
-
const selector = selectors[
|
|
179
|
+
while (selectorIndex < selectors.length) {
|
|
180
|
+
const selector = selectors[selectorIndex];
|
|
184
181
|
if (selector.kind !== "Name") throw createError("Expected an operator name", location);
|
|
185
182
|
names.push(selector.name);
|
|
186
183
|
args.push(...selector.args);
|
|
@@ -190,7 +187,7 @@ const selectSubexpression = (
|
|
|
190
187
|
: lookup(name);
|
|
191
188
|
if (definition)
|
|
192
189
|
return { definition, name, args, earlier: args.length - selector.args.length };
|
|
193
|
-
|
|
190
|
+
selectorIndex++;
|
|
194
191
|
}
|
|
195
192
|
throw createError(`Unknown operator ${names.join("!")}`, location);
|
|
196
193
|
};
|
|
@@ -199,10 +196,10 @@ const selectSubexpression = (
|
|
|
199
196
|
const found = findDefinition(local);
|
|
200
197
|
const definition = found.definition;
|
|
201
198
|
const arity = getArity(definition);
|
|
202
|
-
const isLast =
|
|
199
|
+
const isLast = selectorIndex === selectors.length - 1;
|
|
203
200
|
if (found.args.length !== arity && (!isOperator || found.args.length !== 0)) {
|
|
204
201
|
return report(
|
|
205
|
-
reference.argumentRanges?.[
|
|
202
|
+
reference.argumentRanges?.[selectorIndex] ?? location.range,
|
|
206
203
|
`The operator ${found.name} requires ${arity - found.earlier} arguments.`,
|
|
207
204
|
);
|
|
208
205
|
}
|
|
@@ -212,17 +209,17 @@ const selectSubexpression = (
|
|
|
212
209
|
}
|
|
213
210
|
selection.params.push(...definition.params);
|
|
214
211
|
selection.args.push(...found.args);
|
|
215
|
-
|
|
216
|
-
|
|
212
|
+
current = definition.body;
|
|
213
|
+
selectorIndex++;
|
|
217
214
|
return undefined;
|
|
218
215
|
};
|
|
219
216
|
|
|
220
217
|
const followLabels = () => {
|
|
221
|
-
while (
|
|
222
|
-
const selector = selectors[
|
|
218
|
+
while (selectorIndex < selectors.length && !isFailed) {
|
|
219
|
+
const selector = selectors[selectorIndex];
|
|
223
220
|
if (selector.kind !== "Name") return;
|
|
224
|
-
const range = reference.selectorRanges?.[
|
|
225
|
-
const found =
|
|
221
|
+
const range = reference.selectorRanges?.[selectorIndex];
|
|
222
|
+
const found = current && findLabel(current, selector.name, []);
|
|
226
223
|
if (!found) return report(range, `Cannot find label \`${selector.name}'.`);
|
|
227
224
|
const params = found.label.params;
|
|
228
225
|
if (!isOperator && selector.args.length !== params.length) {
|
|
@@ -231,17 +228,16 @@ const selectSubexpression = (
|
|
|
231
228
|
selection.lets.push(...found.lets);
|
|
232
229
|
selection.params.push(...params.map((name) => ({ name, arity: 0 })));
|
|
233
230
|
selection.args.push(...selector.args);
|
|
234
|
-
|
|
235
|
-
|
|
231
|
+
current = found.label.body;
|
|
232
|
+
selectorIndex++;
|
|
236
233
|
}
|
|
237
234
|
};
|
|
238
235
|
|
|
239
236
|
const selectOperand = (selector: Selector) => {
|
|
240
|
-
const current = state.current;
|
|
241
237
|
if (!current) throw createError("Subexpression selection failed", location);
|
|
242
238
|
if (selector.kind === "Colon") return;
|
|
243
239
|
if (current.kind === "Label") {
|
|
244
|
-
|
|
240
|
+
current = current.body;
|
|
245
241
|
selectOperand(selector);
|
|
246
242
|
return;
|
|
247
243
|
}
|
|
@@ -250,14 +246,14 @@ const selectSubexpression = (
|
|
|
250
246
|
throw createError("A LET/IN expression has only one operand", location);
|
|
251
247
|
}
|
|
252
248
|
selection.lets.push(current.definitions);
|
|
253
|
-
|
|
249
|
+
current = current.body;
|
|
254
250
|
return;
|
|
255
251
|
}
|
|
256
252
|
const binder = getBinder(current);
|
|
257
253
|
if (binder && (selector.kind === "Bound" || selector.kind === "At")) {
|
|
258
254
|
selection.params.push(...binder.names.map((name) => ({ name, arity: 0 })));
|
|
259
255
|
if (selector.kind === "Bound") selection.args.push(...selector.args);
|
|
260
|
-
|
|
256
|
+
current = binder.body;
|
|
261
257
|
return;
|
|
262
258
|
}
|
|
263
259
|
if (current.kind === "Case" && selector.kind === "Operand") {
|
|
@@ -266,15 +262,15 @@ const selectSubexpression = (
|
|
|
266
262
|
...(current.other ? [{ condition: undefined, body: current.other }] : []),
|
|
267
263
|
];
|
|
268
264
|
const arm = arms[getOperandIndex(selector.operand, arms.length)];
|
|
269
|
-
const next = selectors[
|
|
265
|
+
const next = selectors[selectorIndex + 1];
|
|
270
266
|
if (!arm || next?.kind !== "Operand") {
|
|
271
267
|
throw createError("A subexpression of CASE must have the form !i!j", location);
|
|
272
268
|
}
|
|
273
|
-
|
|
269
|
+
selectorIndex++;
|
|
274
270
|
const part = getOperandIndex(next.operand, 2);
|
|
275
271
|
const chosen = part === 0 ? arm.condition : part === 1 ? arm.body : undefined;
|
|
276
272
|
if (!chosen) throw createError("Nonexistent CASE operand", location);
|
|
277
|
-
|
|
273
|
+
current = chosen;
|
|
278
274
|
return;
|
|
279
275
|
}
|
|
280
276
|
if (selector.kind !== "Operand")
|
|
@@ -282,23 +278,23 @@ const selectSubexpression = (
|
|
|
282
278
|
const operands = binder ? binder.sets : getOperands(current);
|
|
283
279
|
const operand = operands?.[getOperandIndex(selector.operand, operands.length)];
|
|
284
280
|
if (!operand) throw createError("Nonexistent operand specified by the selector", location);
|
|
285
|
-
|
|
281
|
+
current = operand;
|
|
286
282
|
};
|
|
287
283
|
|
|
288
284
|
const first = enterDefinition(undefined);
|
|
289
|
-
if (
|
|
285
|
+
if (isFailed) return reference;
|
|
290
286
|
if (first) return applyDefinition(first.definition, { ...selection, args: first.args });
|
|
291
287
|
followLabels();
|
|
292
|
-
while (
|
|
293
|
-
const selector = selectors[
|
|
288
|
+
while (selectorIndex < selectors.length && !isFailed) {
|
|
289
|
+
const selector = selectors[selectorIndex];
|
|
294
290
|
if (selector.kind === "Name") {
|
|
295
|
-
while (
|
|
296
|
-
if (
|
|
291
|
+
while (current?.kind === "Label") current = current.body;
|
|
292
|
+
if (current?.kind !== "Let") {
|
|
297
293
|
throw createError("A name selector here must be from a LET clause", location);
|
|
298
294
|
}
|
|
299
|
-
selection.lets.push(
|
|
300
|
-
const last = enterDefinition(
|
|
301
|
-
if (
|
|
295
|
+
selection.lets.push(current.definitions);
|
|
296
|
+
const last = enterDefinition(current.definitions);
|
|
297
|
+
if (isFailed) return reference;
|
|
302
298
|
if (last) {
|
|
303
299
|
return applyDefinition(last.definition, {
|
|
304
300
|
...selection,
|
|
@@ -309,14 +305,13 @@ const selectSubexpression = (
|
|
|
309
305
|
continue;
|
|
310
306
|
}
|
|
311
307
|
selectOperand(selector);
|
|
312
|
-
|
|
308
|
+
selectorIndex++;
|
|
313
309
|
}
|
|
314
|
-
if (
|
|
315
|
-
if (!
|
|
316
|
-
return createApplication(selection,
|
|
310
|
+
if (isFailed) return reference;
|
|
311
|
+
if (!current) throw createError("Subexpression selection failed", location);
|
|
312
|
+
return createApplication(selection, current);
|
|
317
313
|
};
|
|
318
314
|
|
|
319
|
-
// A name such as Op(1)!lab(2) whose first parts name a definition selects part of it.
|
|
320
315
|
const getQualifiedSelectors = (
|
|
321
316
|
name: string,
|
|
322
317
|
args: Expression[],
|
|
@@ -325,7 +320,7 @@ const getQualifiedSelectors = (
|
|
|
325
320
|
) => {
|
|
326
321
|
if (!name.includes("!") || lookup(name)) return undefined;
|
|
327
322
|
const parts = name.split("!");
|
|
328
|
-
if (!parts.some((
|
|
323
|
+
if (!parts.some((_part, index) => lookup(parts.slice(0, index + 1).join("!")))) return undefined;
|
|
329
324
|
return getNameSelectors(name, args, counts);
|
|
330
325
|
};
|
|
331
326
|
|
|
@@ -335,9 +330,6 @@ const containsReference = (expression: Expression): boolean =>
|
|
|
335
330
|
(expression.kind === "Apply" && expression.operator.includes("!")) ||
|
|
336
331
|
getChildren(expression).some(containsReference);
|
|
337
332
|
|
|
338
|
-
// A reference that starts with a name isGoal holds for, such as a theorem whose statement is an
|
|
339
|
-
// ASSUME/PROVE, stays for name resolution to check. isOperator holds where an operator may be given,
|
|
340
|
-
// as the argument of an operator that may take one.
|
|
341
333
|
const resolveSubexpressions = (
|
|
342
334
|
expression: Expression,
|
|
343
335
|
lookup: Lookup,
|
|
@@ -406,18 +398,44 @@ const createLookup = (definitions: Definition[]): Lookup => {
|
|
|
406
398
|
export const resolveInstanceSubexpressions = (instance: Instance, module: Module): Instance =>
|
|
407
399
|
resolveInstance(instance, createLookup(module.definitions), () => false);
|
|
408
400
|
|
|
409
|
-
// Generator.selectorToNode resolves a name in a theorem, a proof, or a fact as it does in a definition.
|
|
410
401
|
export const resolveModuleSubexpressions = (module: Module, available: Definition[]): Module => {
|
|
411
|
-
const lookup = createLookup([...available, ...module.definitions]);
|
|
412
402
|
const goals = new Set(
|
|
413
403
|
module.theorems.flatMap((theorem) =>
|
|
414
404
|
theorem.name !== undefined && theorem.statement.kind === "AssumeProve" ? [theorem.name] : [],
|
|
415
405
|
),
|
|
416
406
|
);
|
|
407
|
+
const clauses = module.theorems.flatMap((theorem): Definition[] => {
|
|
408
|
+
const statement = theorem.statement;
|
|
409
|
+
if (theorem.name === undefined || statement.kind !== "AssumeProve") return [];
|
|
410
|
+
const assumptions = statement.assumptions.filter(
|
|
411
|
+
(assumption) => assumption.kind !== "NewSymbol" && assumption.kind !== "AssumeProve",
|
|
412
|
+
);
|
|
413
|
+
if (assumptions.length !== statement.assumptions.length) return [];
|
|
414
|
+
return [
|
|
415
|
+
{
|
|
416
|
+
kind: "Operator",
|
|
417
|
+
name: theorem.name,
|
|
418
|
+
params: [],
|
|
419
|
+
body: {
|
|
420
|
+
kind: "Tuple",
|
|
421
|
+
elements: [...assumptions, statement.conclusion],
|
|
422
|
+
location: statement.location,
|
|
423
|
+
},
|
|
424
|
+
isLocal: true,
|
|
425
|
+
isRecursive: false,
|
|
426
|
+
location: theorem.location,
|
|
427
|
+
},
|
|
428
|
+
];
|
|
429
|
+
});
|
|
430
|
+
const lookup = createLookup([...available, ...module.definitions]);
|
|
417
431
|
const isGoal = (name: string) => goals.has(name);
|
|
418
|
-
const
|
|
419
|
-
|
|
420
|
-
|
|
432
|
+
const definitionLookup = createLookup([...available, ...module.definitions, ...clauses]);
|
|
433
|
+
const resolve = (expression: Expression) =>
|
|
434
|
+
resolveSubexpressions(
|
|
435
|
+
expression,
|
|
436
|
+
definitionLookup,
|
|
437
|
+
(name) => isGoal(name) && clauses.every((clause) => clause.name !== name),
|
|
438
|
+
);
|
|
421
439
|
const isProofGoal = (name: string) => isGoal(name) || !lookup(name);
|
|
422
440
|
const resolveInProof = (expression: Expression) =>
|
|
423
441
|
resolveSubexpressions(expression, lookup, isProofGoal);
|
|
@@ -483,7 +501,6 @@ export const resolveModuleSubexpressions = (module: Module, available: Definitio
|
|
|
483
501
|
: proof;
|
|
484
502
|
const resolved = {
|
|
485
503
|
...module,
|
|
486
|
-
// A named theorem's statement is resolved as its definition.
|
|
487
504
|
theorems: module.theorems.map((theorem) => ({
|
|
488
505
|
...theorem,
|
|
489
506
|
statement:
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Declaration, Definition, Expression, SourceLocation, Theorem } from "./ast";
|
|
2
|
-
import { createSanyError, formatRange } from "./errors";
|
|
2
|
+
import { createSanyError, formatRange, type SanyError } from "./errors";
|
|
3
3
|
import {
|
|
4
4
|
ACTION_LEVEL,
|
|
5
5
|
analyzeAssumeProve,
|
|
@@ -122,8 +122,7 @@ export const createInstanceChecker = (getModule: (name: string) => ModuleContext
|
|
|
122
122
|
};
|
|
123
123
|
|
|
124
124
|
return (check: InstanceCheck) => {
|
|
125
|
-
const errors = new Map<string,
|
|
126
|
-
// SANY reports each error at the whole instance.
|
|
125
|
+
const errors = new Map<string, SanyError>();
|
|
127
126
|
const location = formatRange(
|
|
128
127
|
check.location.range ?? {
|
|
129
128
|
module: check.instancer,
|
|
@@ -152,12 +151,13 @@ export const createInstanceChecker = (getModule: (name: string) => ModuleContext
|
|
|
152
151
|
return [{ ...declaration, level: data.level, operator: undefined, isLeibniz: true }];
|
|
153
152
|
}
|
|
154
153
|
const operand = analyzer.toOperand(expression, scope);
|
|
154
|
+
const operator = operand.kind === "Operator" ? operand.data : undefined;
|
|
155
155
|
return [
|
|
156
156
|
{
|
|
157
157
|
...declaration,
|
|
158
158
|
level: operand.data.level,
|
|
159
|
-
operator
|
|
160
|
-
isLeibniz:
|
|
159
|
+
operator,
|
|
160
|
+
isLeibniz: operator === undefined || operator.nonLeibniz.size === 0,
|
|
161
161
|
},
|
|
162
162
|
];
|
|
163
163
|
});
|
|
@@ -179,14 +179,14 @@ export const createInstanceChecker = (getModule: (name: string) => ModuleContext
|
|
|
179
179
|
addMessage(getLevelMessage(item.name, maximum));
|
|
180
180
|
const operator = item.operator;
|
|
181
181
|
if (!operator) return;
|
|
182
|
-
|
|
182
|
+
for (let index = 0; index < item.arity; index++) {
|
|
183
183
|
const minimum = levels.argConstraints.get(getArgumentKey(item.name, index));
|
|
184
184
|
if (minimum !== undefined && getMaxLevel(operator, index) < minimum) {
|
|
185
185
|
addMessage(
|
|
186
186
|
`Level error in instantiating module '${check.module}':\nThe level of the argument ${index + 1} of the operator ${operator.name} \nmust be at least ${minimum}.`,
|
|
187
187
|
);
|
|
188
188
|
}
|
|
189
|
-
}
|
|
189
|
+
}
|
|
190
190
|
});
|
|
191
191
|
levels.argParams.forEach((key) => {
|
|
192
192
|
const parameter = parseArgumentParamKey(key);
|