tla-ts 0.0.10-dev.63a6693bd → 0.0.10-dev.6b2a6741a
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 +2 -1
- package/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +45 -41
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +5 -1
- package/dist/index.d.ts +5 -1
- 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 +2682 -426
- package/dist/prove.js +2679 -423
- package/dist/run.cjs +43 -42
- package/dist/run.js +44 -43
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +1 -1
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +43 -40
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +4 -3
- package/src/bags.ts +46 -28
- package/src/check-trace.ts +2 -16
- package/src/check.ts +349 -91
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlapm.ts +424 -62
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +4 -5
- package/src/cli/tlc-usage.ts +0 -1
- package/src/cli/tlc.ts +26 -7
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +9 -5
- package/src/dependencies.ts +72 -11
- package/src/dfid.ts +9 -2
- package/src/environment.ts +65 -36
- package/src/errors.ts +38 -3
- package/src/evaluate.ts +92 -32
- package/src/exit-codes.ts +5 -2
- package/src/instances.ts +5 -5
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +572 -204
- package/src/liveness.ts +47 -32
- package/src/obligations/action.ts +10 -6
- package/src/obligations/anonymize.ts +33 -14
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +18 -6
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +22 -17
- package/src/obligations/index.ts +37 -7
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +1 -3
- package/src/obligations/normalize.ts +25 -17
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +48 -18
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +17 -7
- package/src/obligations/source.ts +71 -17
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +0 -2
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +7 -2
- package/src/parser.ts +664 -287
- package/src/pretty-print.ts +1 -1
- package/src/prover/deciders.ts +11 -8
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +71 -41
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +149 -3
- package/src/prover/isabelle/isar/method.ts +506 -198
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +479 -69
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +83 -8
- package/src/prover/isabelle/provers/blast/blast.ts +0 -2
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +1 -3
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +2 -4
- package/src/prover/isabelle/pure/bicompose.ts +0 -2
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +0 -2
- package/src/prover/isabelle/pure/drule.ts +63 -4
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +0 -2
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +0 -2
- package/src/prover/isabelle/pure/rewriter.ts +4 -11
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +0 -2
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +0 -2
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +3 -5
- package/src/prover/isabelle/pure/thm.ts +0 -2
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +1 -2
- package/src/prover/isabelle/tla/context.ts +51 -9
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +40 -1
- package/src/prover/isabelle/tla/simpdata.ts +0 -2
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +19 -12
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +159 -50
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +343 -65
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +42 -6
- package/src/prover/smt/data.ts +191 -84
- package/src/prover/smt/encode.ts +122 -43
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +483 -116
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -1
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +613 -6
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +165 -11
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1449 -41
- package/src/prover/smt/solver/auf-solver.ts +0 -1
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +109 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +533 -114
- package/src/prover/smt/solver/ctx-simplify.ts +21 -12
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +6 -7
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +109 -36
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +0 -2
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +0 -1
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +66 -11
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +167 -85
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +118 -88
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +17 -26
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +0 -1
- package/src/prover/smt/solver/model-generator.ts +59 -30
- package/src/prover/smt/solver/model-macro-solver.ts +38 -27
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +496 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +305 -88
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -35
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +424 -211
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -241
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -683
- package/src/prover/smt/solver/nlsat/solver.ts +282 -69
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -7
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -20
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +511 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +650 -17
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +9 -10
- package/src/prover/smt/solver/quantifier-manager.ts +25 -24
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2105 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +544 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3228 -327
- package/src/prover/smt/solver/smtlib-script.ts +1843 -0
- package/src/prover/smt/solver/solve-eqs.ts +923 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +2012 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1200 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -5
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -71
- package/src/prover/smt/solver/theory-lra-internalize.ts +89 -11
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -28
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -2
- package/src/prover/smt/solver/theory-pb.ts +933 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +37 -16
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +2 -0
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +0 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +21 -2
- package/src/prover/zenon/index-table.ts +7 -4
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +2 -4
- package/src/prover/zenon/llproof.ts +0 -2
- package/src/prover/zenon/mltoll.ts +0 -2
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +6 -2
- package/src/prover/zenon/phrase.ts +1 -3
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +7 -5
- package/src/prover/zenon/tla/functions.ts +0 -2
- package/src/prover/zenon/tla/llproof.ts +0 -2
- package/src/prover/zenon/tla/records.ts +0 -2
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +7 -8
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +0 -2
- package/src/resolve.ts +625 -189
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +3 -3
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +209 -56
- package/src/simulate.ts +3 -0
- package/src/spec-description.ts +2 -2
- package/src/standard-definitions.ts +4 -0
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +265 -94
- package/src/successors.ts +2 -1
- package/src/symmetry.ts +3 -3
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +10 -0
- package/src/tlc/messages.ts +3 -3
- package/src/tlc/order.ts +14 -3
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +3 -1
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +5 -5
- package/src/typed-tier.ts +6541 -0
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +46 -27
- package/src/prover/isabelle/isar/statement.ts +0 -52
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
package/src/resolve.ts
CHANGED
|
@@ -19,8 +19,10 @@ import {
|
|
|
19
19
|
type SourceLocation,
|
|
20
20
|
type SourceRange,
|
|
21
21
|
type Theorem,
|
|
22
|
+
type UseOrHide,
|
|
22
23
|
} from "./ast";
|
|
23
24
|
import { formatRange, TlaSyntaxError, type SanyError } from "./errors";
|
|
25
|
+
import { resolveSynonym } from "./tlc/jar-data";
|
|
24
26
|
|
|
25
27
|
export type SymbolKind =
|
|
26
28
|
| "Builtin"
|
|
@@ -84,8 +86,15 @@ interface Unit {
|
|
|
84
86
|
isGenerated: boolean;
|
|
85
87
|
}
|
|
86
88
|
|
|
87
|
-
interface
|
|
89
|
+
export interface SelectionArguments {
|
|
90
|
+
operator: string;
|
|
91
|
+
range: SourceRange | undefined;
|
|
88
92
|
args: Expression[];
|
|
93
|
+
params: number[];
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
interface SelectionError {
|
|
97
|
+
applications: SelectionArguments[];
|
|
89
98
|
error: SanyError;
|
|
90
99
|
}
|
|
91
100
|
|
|
@@ -99,8 +108,15 @@ type Reference = Expression & { kind: "Identifier" | "Apply" | "Subexpression" }
|
|
|
99
108
|
|
|
100
109
|
export const LOCAL_RESOLUTION = { kind: "Local" } as const;
|
|
101
110
|
|
|
111
|
+
export interface NullSelection {
|
|
112
|
+
node: Expression;
|
|
113
|
+
error: SanyError;
|
|
114
|
+
}
|
|
115
|
+
|
|
102
116
|
export const selections = new WeakSet<Expression>();
|
|
103
117
|
export const selectionErrors = new WeakMap<Expression, SelectionError>();
|
|
118
|
+
export const nullSelections = new WeakMap<Expression, NullSelection[]>();
|
|
119
|
+
const unresolvedExpressions = new WeakSet<Expression>();
|
|
104
120
|
|
|
105
121
|
const renamedArities = new WeakMap<Expression, number>();
|
|
106
122
|
|
|
@@ -111,13 +127,20 @@ const isKey = (name: string) => {
|
|
|
111
127
|
return index > 0 && index < name.length - 1;
|
|
112
128
|
};
|
|
113
129
|
|
|
114
|
-
const CORE_SYMBOLS: Symbols = new Map(
|
|
115
|
-
["~>", "-+->", "\\cdot"].map((name)
|
|
116
|
-
|
|
130
|
+
const CORE_SYMBOLS: Symbols = new Map([
|
|
131
|
+
...["~>", "-+->", "\\cdot", "\\X"].map((name): [string, ModuleSymbol] => [
|
|
132
|
+
name,
|
|
133
|
+
{ key: name, arity: 2, kind: "Builtin" },
|
|
134
|
+
]),
|
|
135
|
+
["'", { key: "'", arity: 1, kind: "Builtin" }],
|
|
136
|
+
]);
|
|
117
137
|
|
|
118
138
|
export const isBefore = (left: SourceLocation, right: SourceLocation) =>
|
|
119
139
|
left.line < right.line || (left.line === right.line && left.column < right.column);
|
|
120
140
|
|
|
141
|
+
const compareLocations = (left: SourceLocation, right: SourceLocation) =>
|
|
142
|
+
isBefore(left, right) ? -1 : isBefore(right, left) ? 1 : 0;
|
|
143
|
+
|
|
121
144
|
export const getArity = (definition: Definition) =>
|
|
122
145
|
definition.kind === "Operator" ? definition.params.length : 0;
|
|
123
146
|
|
|
@@ -157,7 +180,7 @@ const isBindable = (name: string, current: Binding | undefined, added: Binding,
|
|
|
157
180
|
if (current.kind === "Builtin") {
|
|
158
181
|
unit.errors.push({
|
|
159
182
|
location,
|
|
160
|
-
message: `Symbol ${name} is a built-in operator, and cannot be redefined.`,
|
|
183
|
+
message: `Symbol ${resolveSynonym(name)} is a built-in operator, and cannot be redefined.`,
|
|
161
184
|
});
|
|
162
185
|
} else if (
|
|
163
186
|
added.kind === "Parameter" ||
|
|
@@ -166,12 +189,12 @@ const isBindable = (name: string, current: Binding | undefined, added: Binding,
|
|
|
166
189
|
) {
|
|
167
190
|
unit.errors.push({
|
|
168
191
|
location,
|
|
169
|
-
message: `Multiply-defined symbol '${name}': this definition or declaration conflicts \nwith the one at ${existing}.`,
|
|
192
|
+
message: `Multiply-defined symbol '${resolveSynonym(name)}': this definition or declaration conflicts \nwith the one at ${existing}.`,
|
|
170
193
|
});
|
|
171
194
|
} else {
|
|
172
195
|
unit.warnings.push({
|
|
173
196
|
location,
|
|
174
|
-
message: `Multiple declarations or definitions for symbol ${name}. \nThis duplicates the one at ${existing}.`,
|
|
197
|
+
message: `Multiple declarations or definitions for symbol ${resolveSynonym(name)}. \nThis duplicates the one at ${existing}.`,
|
|
175
198
|
});
|
|
176
199
|
}
|
|
177
200
|
return false;
|
|
@@ -233,23 +256,35 @@ const getVisibleDefinition = (name: string, unit: Unit) => {
|
|
|
233
256
|
const isVisible =
|
|
234
257
|
definition !== undefined &&
|
|
235
258
|
(definition === unit.self
|
|
236
|
-
? definition.
|
|
237
|
-
: definition.isRecursive
|
|
259
|
+
? definition.isRecursive
|
|
260
|
+
: definition.isRecursive
|
|
261
|
+
? getModuleBinding(name, unit, undefined) !== undefined
|
|
262
|
+
: isBefore(definition.location, unit.location));
|
|
238
263
|
return isVisible ? definition : undefined;
|
|
239
264
|
};
|
|
240
265
|
|
|
241
266
|
const findSymbol = (name: string, unit: Unit): ModuleSymbol | undefined => {
|
|
242
267
|
const definition = getVisibleDefinition(name, unit);
|
|
243
|
-
|
|
244
|
-
?
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
268
|
+
if (definition) {
|
|
269
|
+
const declared = definition.isRecursive ? unit.bindings.get(name) : undefined;
|
|
270
|
+
return {
|
|
271
|
+
key: unit.getKey(definition),
|
|
272
|
+
arity: declared?.arity ?? getArity(definition),
|
|
273
|
+
params: declared?.params ?? getParamArities(definition),
|
|
274
|
+
kind: "Definition",
|
|
275
|
+
};
|
|
276
|
+
}
|
|
277
|
+
const binding = getModuleBinding(name, unit, undefined);
|
|
278
|
+
if (binding?.isPending) return { key: name, arity: binding.arity, kind: binding.kind };
|
|
279
|
+
return binding ? unit.imported.get(name) : undefined;
|
|
251
280
|
};
|
|
252
281
|
|
|
282
|
+
const isFact = (name: string, unit: Unit) =>
|
|
283
|
+
unit.facts.has(name) || unit.bindings.get(name)?.kind === "Theorem";
|
|
284
|
+
|
|
285
|
+
const getGoal = (name: string, unit: Unit) =>
|
|
286
|
+
unit.bindings.get(name)?.kind === "Theorem" ? unit.goals.get(name) : undefined;
|
|
287
|
+
|
|
253
288
|
const findBinding = (name: string, scope: LocalName | undefined, unit: Unit): Binding | undefined =>
|
|
254
289
|
lookupLocal(scope, name) ?? findSymbol(name, unit);
|
|
255
290
|
|
|
@@ -271,12 +306,22 @@ const getSpelledNameRange = (
|
|
|
271
306
|
};
|
|
272
307
|
|
|
273
308
|
const getFixity = (expression: Expression) => {
|
|
274
|
-
if (expression.kind !== "Apply") return undefined;
|
|
309
|
+
if (expression.kind !== "Apply" || expression.argumentsRange) return undefined;
|
|
275
310
|
if (expression.args.length === 2) return "infix";
|
|
276
311
|
if (expression.args.length !== 1) return undefined;
|
|
277
312
|
return isBefore(expression.location, expression.args[0].location) ? "prefix" : "postfix";
|
|
278
313
|
};
|
|
279
314
|
|
|
315
|
+
const BUILTIN_LOCATION = "In module --TLA+ BUILTINS--";
|
|
316
|
+
|
|
317
|
+
const SELECTABLE_KINDS = new Set<SymbolKind>(["Definition", "Instance", "Theorem"]);
|
|
318
|
+
|
|
319
|
+
const reportUnselectable = (name: string, range: SourceRange, unit: Unit) =>
|
|
320
|
+
unit.errors.push({
|
|
321
|
+
location: formatRange(range),
|
|
322
|
+
message: `Cannot take subexpression of \`${resolveSynonym(name)}'.`,
|
|
323
|
+
});
|
|
324
|
+
|
|
280
325
|
const isOperatorSymbol = (name: string) => !/^[\p{L}\d_]/u.test(name);
|
|
281
326
|
|
|
282
327
|
const isStepName = (name: string) =>
|
|
@@ -519,10 +564,17 @@ const checkSelection = (
|
|
|
519
564
|
state.isSufficesOpen = false;
|
|
520
565
|
continue;
|
|
521
566
|
}
|
|
522
|
-
if (selector.kind
|
|
523
|
-
const operand =
|
|
567
|
+
if (selector.kind === "Colon") return;
|
|
568
|
+
const operand =
|
|
569
|
+
selector.kind === "Operand"
|
|
570
|
+
? getOperandName(selector.operand)
|
|
571
|
+
: selector.kind === "At"
|
|
572
|
+
? "@"
|
|
573
|
+
: "!(...)";
|
|
574
|
+
const getPosition = (count: number) =>
|
|
575
|
+
selector.kind === "Operand" ? getOperandIndex(selector.operand, count) : -1;
|
|
524
576
|
if (state.isSufficesOpen) {
|
|
525
|
-
if (
|
|
577
|
+
if (getPosition(1) !== 0) {
|
|
526
578
|
return report(
|
|
527
579
|
index,
|
|
528
580
|
node.kind === "AssumeProve"
|
|
@@ -547,6 +599,7 @@ const checkSelection = (
|
|
|
547
599
|
return report(index, `Choosing operand \`${operand}' of subexpression with no operands.`);
|
|
548
600
|
}
|
|
549
601
|
const sets = getBinder(expression)?.sets;
|
|
602
|
+
if (sets && selector.kind !== "Operand") return;
|
|
550
603
|
const operands =
|
|
551
604
|
expression.kind === "Identifier"
|
|
552
605
|
? []
|
|
@@ -558,14 +611,14 @@ const checkSelection = (
|
|
|
558
611
|
? undefined
|
|
559
612
|
: getOperands(expression);
|
|
560
613
|
if (!operands) return;
|
|
561
|
-
const position =
|
|
614
|
+
const position = getPosition(operands.length);
|
|
562
615
|
if (position === -1) return report(index, `Nonexistent operand specified by \`${operand}'.`);
|
|
563
616
|
state.node = operands[position];
|
|
564
617
|
state.isGoal = false;
|
|
565
618
|
continue;
|
|
566
619
|
}
|
|
567
620
|
const clauses = [...node.assumptions, node.conclusion];
|
|
568
|
-
const position =
|
|
621
|
+
const position = getPosition(clauses.length);
|
|
569
622
|
if (position === -1) return report(index, `Nonexistent operand specified by \`${operand}'.`);
|
|
570
623
|
if (isInScopeOfDeclaration(node, position) && (!state.isGoal || isOutOfScope)) {
|
|
571
624
|
return report(index, `Accessing ASSUME/PROVE clause ${SCOPE_MESSAGE}`);
|
|
@@ -659,7 +712,7 @@ const checkReference = (
|
|
|
659
712
|
const first = selectors[0];
|
|
660
713
|
const goal =
|
|
661
714
|
selectors.length > 1 && first.kind === "Name"
|
|
662
|
-
? (lookupLocal(scope, first.name)?.goal ??
|
|
715
|
+
? (lookupLocal(scope, first.name)?.goal ?? getGoal(first.name, unit))
|
|
663
716
|
: undefined;
|
|
664
717
|
if (goal) checkSelection(expression, selectors, goal, scope, unit, isFact);
|
|
665
718
|
return goal !== undefined;
|
|
@@ -697,29 +750,39 @@ const getSymbolArity = (
|
|
|
697
750
|
return symbol.arity;
|
|
698
751
|
}
|
|
699
752
|
const prefix = name.includes("!") ? name.slice(0, name.indexOf("!")) : "";
|
|
700
|
-
const
|
|
701
|
-
prefix
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
753
|
+
const selected =
|
|
754
|
+
prefix === "" ? undefined : (lookupLocal(scope, prefix) ?? findSymbol(prefix, unit));
|
|
755
|
+
if (selected && !SELECTABLE_KINDS.has(selected.kind)) {
|
|
756
|
+
reportUnselectable(
|
|
757
|
+
prefix,
|
|
758
|
+
(expression.kind !== "OperatorReference" && expression.selectorRanges?.[0]) ||
|
|
759
|
+
getSpelledNameRange(expression, name),
|
|
760
|
+
unit,
|
|
761
|
+
);
|
|
762
|
+
return undefined;
|
|
763
|
+
}
|
|
764
|
+
if (selected || (prefix !== "" && isFact(prefix, unit))) {
|
|
706
765
|
return expression.kind === "Apply" ? expression.args.length : 0;
|
|
707
766
|
}
|
|
708
|
-
const
|
|
709
|
-
const
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
: getSpelledNameRange(expression, name),
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
unit.errors.push({ location: range, message: `Unknown operator: \`${name}'.` });
|
|
767
|
+
const fixity = getFixity(expression);
|
|
768
|
+
const isOperatorApplication = expression.kind === "OperatorReference" || fixity !== undefined;
|
|
769
|
+
if (!isOperatorSymbol(name) || isStepName(name) || !isOperatorApplication) {
|
|
770
|
+
unit.errors.push({
|
|
771
|
+
location: formatRange(getSpelledNameRange(expression, name)),
|
|
772
|
+
message: `Unknown operator: \`${resolveSynonym(name)}'.`,
|
|
773
|
+
});
|
|
716
774
|
return undefined;
|
|
717
775
|
}
|
|
776
|
+
const spelling = expression.spelling ?? name;
|
|
718
777
|
unit.errors.push({
|
|
719
|
-
location:
|
|
778
|
+
location: formatRange(
|
|
779
|
+
fixity === "prefix" && spelling === "-."
|
|
780
|
+
? getNameRange(location, "-")
|
|
781
|
+
: getSpelledNameRange(expression, name),
|
|
782
|
+
),
|
|
720
783
|
message: `Could not find declaration or definition of symbol '${spelling}'.`,
|
|
721
784
|
});
|
|
722
|
-
|
|
785
|
+
if (fixity) unresolvedExpressions.add(expression);
|
|
723
786
|
if (fixity && location.range) {
|
|
724
787
|
unit.errors.push({
|
|
725
788
|
location: formatRange(location.range),
|
|
@@ -774,15 +837,30 @@ const resolveDefinition = (
|
|
|
774
837
|
const isDeclared = current?.isPending === true && recursive.has(current);
|
|
775
838
|
if (current?.isPending && !isDeclared) {
|
|
776
839
|
report(
|
|
777
|
-
`Recursive ${definition.kind === "Function" ? "function" : "operator"} ${name} defined at wrong LET/IN level.`,
|
|
840
|
+
`Recursive ${definition.kind === "Function" ? "function" : "operator"} ${resolveSynonym(name)} defined at wrong LET/IN level.`,
|
|
778
841
|
);
|
|
779
842
|
} else if (current && !isDeclared) {
|
|
780
843
|
report(
|
|
781
844
|
definition.kind === "Function"
|
|
782
845
|
? `Function name \`${name}' already defined or declared.`
|
|
783
|
-
: `Operator ${name} already defined or declared.`,
|
|
846
|
+
: `Operator ${resolveSynonym(name)} already defined or declared.`,
|
|
847
|
+
);
|
|
848
|
+
} else if (current && definition.kind === "Function" && current.arity > 0) {
|
|
849
|
+
report(`Function ${resolveSynonym(name)} has operator arguments in its RECURSIVE declaration.`);
|
|
850
|
+
} else if (
|
|
851
|
+
current &&
|
|
852
|
+
definition.kind === "Operator" &&
|
|
853
|
+
// Deviation from SANY: Generator#processOperator compares only the last parameter's arity with the RECURSIVE declaration's.
|
|
854
|
+
(current.arity !== definition.params.length ||
|
|
855
|
+
definition.params.some((param) => param.arity > 0))
|
|
856
|
+
) {
|
|
857
|
+
report(
|
|
858
|
+
`Definition of ${resolveSynonym(name)} has different arity than its RECURSIVE declaration.`,
|
|
784
859
|
);
|
|
785
860
|
}
|
|
861
|
+
if (current && isDeclared && definition.kind === "Operator") {
|
|
862
|
+
current.params = getParamArities(definition);
|
|
863
|
+
}
|
|
786
864
|
if (definition.kind === "Function") {
|
|
787
865
|
resolveExpression(
|
|
788
866
|
definition.body,
|
|
@@ -793,8 +871,10 @@ const resolveDefinition = (
|
|
|
793
871
|
definition.isSelfReferential = isReferenced(definition.body, name);
|
|
794
872
|
} else resolveExpression(definition.body, inner, unit);
|
|
795
873
|
if (current && isDeclared) {
|
|
796
|
-
current.
|
|
797
|
-
|
|
874
|
+
if (definition.kind === "Operator" || current.arity === 0) {
|
|
875
|
+
current.isPending = false;
|
|
876
|
+
current.range = range;
|
|
877
|
+
}
|
|
798
878
|
return false;
|
|
799
879
|
}
|
|
800
880
|
return definition.kind === "Function"
|
|
@@ -812,10 +892,15 @@ const resolveDefinitions = (
|
|
|
812
892
|
scope: LocalName | undefined,
|
|
813
893
|
unit: Unit,
|
|
814
894
|
instances: Instance[] = [],
|
|
895
|
+
declarations: Declaration[] = [],
|
|
815
896
|
) => {
|
|
816
897
|
const recursive = new Set<Binding>();
|
|
817
898
|
const declared = definitions
|
|
818
|
-
.filter(
|
|
899
|
+
.filter(
|
|
900
|
+
(definition) =>
|
|
901
|
+
definition.isRecursive &&
|
|
902
|
+
declarations.every((declaration) => declaration.name !== definition.name),
|
|
903
|
+
)
|
|
819
904
|
.reduce<LocalName | undefined>((parent, definition) => {
|
|
820
905
|
if (lookupLocal(parent, definition.name)?.isPending) return parent;
|
|
821
906
|
const local: LocalName = {
|
|
@@ -829,20 +914,47 @@ const resolveDefinitions = (
|
|
|
829
914
|
recursive.add(local);
|
|
830
915
|
return local;
|
|
831
916
|
}, scope);
|
|
832
|
-
const
|
|
833
|
-
const
|
|
917
|
+
const declaredLocals = new Map<Declaration, LocalName | undefined>();
|
|
918
|
+
const bindDeclaration = (parent: LocalName | undefined, declaration: Declaration) => {
|
|
919
|
+
const binding: Binding = {
|
|
920
|
+
kind: "Definition",
|
|
921
|
+
arity: declaration.arity,
|
|
922
|
+
params: Array(declaration.arity).fill(0),
|
|
923
|
+
range: declaration.location.range,
|
|
924
|
+
};
|
|
925
|
+
const local: LocalName | undefined = isBindable(
|
|
926
|
+
declaration.name,
|
|
927
|
+
lookupLocal(parent, declaration.name) ??
|
|
928
|
+
getModuleBinding(declaration.name, unit, binding.range),
|
|
929
|
+
binding,
|
|
930
|
+
unit,
|
|
931
|
+
)
|
|
932
|
+
? { ...binding, name: declaration.name, parent, isPending: true }
|
|
933
|
+
: undefined;
|
|
934
|
+
if (local) recursive.add(local);
|
|
935
|
+
declaredLocals.set(declaration, local);
|
|
936
|
+
return local ?? parent;
|
|
937
|
+
};
|
|
938
|
+
const pending = [...(unit.isGenerated ? [] : instances), ...declarations].toSorted(
|
|
939
|
+
(left, right) => compareLocations(left.location, right.location),
|
|
940
|
+
);
|
|
941
|
+
const resolvePending = (
|
|
834
942
|
current: LocalName | undefined,
|
|
835
|
-
isDue: (
|
|
943
|
+
isDue: (item: Instance | Declaration) => boolean,
|
|
836
944
|
) => {
|
|
837
|
-
const count = pending.findIndex((
|
|
945
|
+
const count = pending.findIndex((item) => !isDue(item));
|
|
838
946
|
return pending
|
|
839
947
|
.splice(0, count === -1 ? pending.length : count)
|
|
840
|
-
.reduce(
|
|
948
|
+
.reduce(
|
|
949
|
+
(parent, item) =>
|
|
950
|
+
"kind" in item ? resolveLocalInstance(item, parent, unit) : bindDeclaration(parent, item),
|
|
951
|
+
current,
|
|
952
|
+
);
|
|
841
953
|
};
|
|
842
954
|
const resolved = definitions.reduce<LocalName | undefined>((previous, definition) => {
|
|
843
955
|
const current = isKey(definition.name)
|
|
844
956
|
? previous
|
|
845
|
-
:
|
|
957
|
+
: resolvePending(previous, (item) => !isBefore(definition.location, item.location));
|
|
846
958
|
const local: LocalName = {
|
|
847
959
|
name: definition.name,
|
|
848
960
|
arity: getArity(definition),
|
|
@@ -850,7 +962,7 @@ const resolveDefinitions = (
|
|
|
850
962
|
range: definition.location.range,
|
|
851
963
|
parent: current,
|
|
852
964
|
};
|
|
853
|
-
if (isInstantiated(definition)) return local;
|
|
965
|
+
if (isInstantiated(definition)) return { ...local, params: getParamArities(definition) };
|
|
854
966
|
const isInstanced = instances.some((instance) => instance.location === definition.location);
|
|
855
967
|
const isGenerated = unit.isGenerated || definition.isLocal || isKey(definition.name);
|
|
856
968
|
const inner = isInstanced
|
|
@@ -862,7 +974,17 @@ const resolveDefinitions = (
|
|
|
862
974
|
? { ...local, params: getParamArities(definition) }
|
|
863
975
|
: current;
|
|
864
976
|
}, declared);
|
|
865
|
-
|
|
977
|
+
const resolvedScope = resolvePending(resolved, () => true);
|
|
978
|
+
declaredLocals.forEach((local, declaration) => {
|
|
979
|
+
const range = declaration.location.range;
|
|
980
|
+
if (range && !unit.isGenerated && (!local || local.isPending)) {
|
|
981
|
+
unit.errors.push({
|
|
982
|
+
location: formatRange(range),
|
|
983
|
+
message: `Symbol ${resolveSynonym(declaration.name)} declared in RECURSIVE statement but not defined.`,
|
|
984
|
+
});
|
|
985
|
+
}
|
|
986
|
+
});
|
|
987
|
+
return resolvedScope;
|
|
866
988
|
};
|
|
867
989
|
|
|
868
990
|
const findInstance = (name: string, scope: LocalName | undefined, unit: Unit) => {
|
|
@@ -899,7 +1021,100 @@ const isInstanceArityReported = (
|
|
|
899
1021
|
return true;
|
|
900
1022
|
};
|
|
901
1023
|
|
|
902
|
-
|
|
1024
|
+
const isArgumentCountReported = (
|
|
1025
|
+
callee: Binding | undefined,
|
|
1026
|
+
name: string,
|
|
1027
|
+
count: number,
|
|
1028
|
+
range: SourceRange | undefined,
|
|
1029
|
+
unit: Unit,
|
|
1030
|
+
) => {
|
|
1031
|
+
const params = callee?.kind === "Definition" ? callee.params : undefined;
|
|
1032
|
+
if (!callee || !params || params.length === callee.arity) return false;
|
|
1033
|
+
if (range) {
|
|
1034
|
+
unit.errors.push({
|
|
1035
|
+
location: formatRange(range),
|
|
1036
|
+
message: `Wrong number of arguments (${count}) given to operator '${resolveSynonym(name)}', \nwhich requires ${params.length} arguments.`,
|
|
1037
|
+
});
|
|
1038
|
+
}
|
|
1039
|
+
return true;
|
|
1040
|
+
};
|
|
1041
|
+
|
|
1042
|
+
const matchArgument = (
|
|
1043
|
+
arg: Expression,
|
|
1044
|
+
expected: number,
|
|
1045
|
+
index: number,
|
|
1046
|
+
operator: string,
|
|
1047
|
+
operatorRange: SourceRange | undefined,
|
|
1048
|
+
scope: LocalName | undefined,
|
|
1049
|
+
unit: Unit,
|
|
1050
|
+
) => {
|
|
1051
|
+
const report = (range: SourceRange | undefined, message: string) => {
|
|
1052
|
+
if (range) unit.errors.push({ location: formatRange(range), message });
|
|
1053
|
+
};
|
|
1054
|
+
const range = arg.location.range;
|
|
1055
|
+
if (expected === 0) {
|
|
1056
|
+
// Deviation from SANY: SANY names its internal node kind here, where tla-ts words it as for a name.
|
|
1057
|
+
if (arg.kind === "Lambda" && arg.operator !== undefined) {
|
|
1058
|
+
report(range, `The operator ${resolveSynonym(arg.operator)} requires 1 arguments.`);
|
|
1059
|
+
} else if (arg.kind === "Lambda" && range) {
|
|
1060
|
+
report(range, "LAMBDA expression used where an expression is required.");
|
|
1061
|
+
} else if (arg.kind === "OperatorReference") {
|
|
1062
|
+
const argArity = getSymbolArity(arg, arg.operator, scope, unit);
|
|
1063
|
+
if (argArity !== undefined) {
|
|
1064
|
+
report(
|
|
1065
|
+
range,
|
|
1066
|
+
`The operator ${resolveSynonym(arg.operator)} requires ${argArity} arguments.`,
|
|
1067
|
+
);
|
|
1068
|
+
}
|
|
1069
|
+
} else resolveExpression(arg, scope, unit);
|
|
1070
|
+
return true;
|
|
1071
|
+
}
|
|
1072
|
+
if (arg.kind === "Lambda") {
|
|
1073
|
+
if (selections.has(arg)) resolveExpression(arg, scope, unit);
|
|
1074
|
+
else resolveLambda(arg, scope, unit);
|
|
1075
|
+
const isMatched = arg.params.length === expected;
|
|
1076
|
+
if (!isMatched && selections.has(arg)) {
|
|
1077
|
+
report(range, `Expected arity ${expected} but found operator of arity ${arg.params.length}.`);
|
|
1078
|
+
} else if (!isMatched && range && arg.operator === undefined) {
|
|
1079
|
+
report(
|
|
1080
|
+
operatorRange,
|
|
1081
|
+
`Lambda expression with arity ${arg.params.length} used as argument ${index + 1} of operator \`${operator}', \nbut an operator of arity ${expected} is required.`,
|
|
1082
|
+
);
|
|
1083
|
+
}
|
|
1084
|
+
return isMatched;
|
|
1085
|
+
}
|
|
1086
|
+
if (arg.kind === "Subexpression") {
|
|
1087
|
+
resolveExpression(arg, scope, unit);
|
|
1088
|
+
return true;
|
|
1089
|
+
}
|
|
1090
|
+
if (arg.kind === "Apply" && arg.argumentCounts?.at(-1) === 0) {
|
|
1091
|
+
const selectorIndex = arg.argumentCounts.findIndex((count) => count > 0);
|
|
1092
|
+
report(
|
|
1093
|
+
arg.selectorRanges?.[selectorIndex],
|
|
1094
|
+
`Selector \`${arg.operator.split("!")[selectorIndex]}' should not have argument(s).`,
|
|
1095
|
+
);
|
|
1096
|
+
return false;
|
|
1097
|
+
}
|
|
1098
|
+
if (arg.kind !== "Identifier" && arg.kind !== "OperatorReference") {
|
|
1099
|
+
report(
|
|
1100
|
+
range,
|
|
1101
|
+
`An expression appears as argument number ${index + 1} (counting from 1) to operator '${operator}', in a position an operator is required.`,
|
|
1102
|
+
);
|
|
1103
|
+
return false;
|
|
1104
|
+
}
|
|
1105
|
+
const name = arg.kind === "Identifier" ? arg.name : arg.operator;
|
|
1106
|
+
const argParams = findBinding(name, scope, unit)?.params ?? [];
|
|
1107
|
+
const argArity = getSymbolArity(arg, name, scope, unit);
|
|
1108
|
+
if (arg.kind === "Identifier" && argArity !== undefined && argArity !== expected) {
|
|
1109
|
+
report(
|
|
1110
|
+
getSpelledNameRange(arg, name),
|
|
1111
|
+
`Expected arity ${expected} but found operator of arity ${argArity}.`,
|
|
1112
|
+
);
|
|
1113
|
+
}
|
|
1114
|
+
// Deviation from SANY: OpDefNode#matchingOpArgOperand reads as many parameters as a RECURSIVE declaration gives and crashes when the definition has fewer.
|
|
1115
|
+
return argArity === expected && argParams.every((param) => param === 0);
|
|
1116
|
+
};
|
|
1117
|
+
|
|
903
1118
|
const resolveApply = (
|
|
904
1119
|
expression: Expression & { kind: "Apply" },
|
|
905
1120
|
scope: LocalName | undefined,
|
|
@@ -913,90 +1128,42 @@ const resolveApply = (
|
|
|
913
1128
|
if (arity !== expression.args.length) {
|
|
914
1129
|
unit.errors.push({
|
|
915
1130
|
location: formatRange(expression.argumentsRange ?? getSpelledNameRange(expression, operator)),
|
|
916
|
-
message: `The operator ${operator} requires ${arity - (findInstance(operator, scope, unit)?.arity ?? 0)} arguments.`,
|
|
1131
|
+
message: `The operator ${resolveSynonym(operator)} requires ${arity - (findInstance(operator, scope, unit)?.arity ?? 0)} arguments.`,
|
|
917
1132
|
});
|
|
918
1133
|
return;
|
|
919
1134
|
}
|
|
920
|
-
const params =
|
|
1135
|
+
const params =
|
|
1136
|
+
callee && (callee.kind === "Definition" ? callee.params : expression.args.map(() => 0));
|
|
921
1137
|
if (params === undefined) {
|
|
922
1138
|
expression.args.forEach((arg) => resolveArgument(arg, scope, unit));
|
|
923
1139
|
return;
|
|
924
1140
|
}
|
|
925
|
-
const
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
.map((arg, index) =>
|
|
930
|
-
|
|
931
|
-
|
|
932
|
-
|
|
933
|
-
|
|
934
|
-
|
|
935
|
-
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
range,
|
|
952
|
-
`Expected arity ${expected} but found operator of arity ${arg.params.length}.`,
|
|
953
|
-
);
|
|
954
|
-
} else if (!isMatched && range && arg.operator === undefined) {
|
|
955
|
-
report(
|
|
956
|
-
expression.selectorRanges?.at(-1) ?? getSpelledNameRange(expression, operator),
|
|
957
|
-
`Lambda expression with arity ${arg.params.length} used as argument ${index + 1} of operator \`${operator}', \nbut an operator of arity ${expected} is required.`,
|
|
958
|
-
);
|
|
959
|
-
}
|
|
960
|
-
return isMatched;
|
|
961
|
-
}
|
|
962
|
-
if (arg.kind === "Subexpression") {
|
|
963
|
-
resolveExpression(arg, scope, unit);
|
|
964
|
-
return true;
|
|
965
|
-
}
|
|
966
|
-
if (arg.kind === "Apply" && arg.argumentCounts?.at(-1) === 0) {
|
|
967
|
-
const selectorIndex = arg.argumentCounts.findIndex((count) => count > 0);
|
|
968
|
-
report(
|
|
969
|
-
arg.selectorRanges?.[selectorIndex],
|
|
970
|
-
`Selector \`${arg.operator.split("!")[selectorIndex]}' should not have argument(s).`,
|
|
971
|
-
);
|
|
972
|
-
return false;
|
|
973
|
-
}
|
|
974
|
-
if (arg.kind !== "Identifier" && arg.kind !== "OperatorReference") {
|
|
975
|
-
report(
|
|
976
|
-
range,
|
|
977
|
-
`An expression appears as argument number ${index + 1} (counting from 1) to operator '${operator}', in a position an operator is required.`,
|
|
978
|
-
);
|
|
979
|
-
return false;
|
|
980
|
-
}
|
|
981
|
-
const name = arg.kind === "Identifier" ? arg.name : arg.operator;
|
|
982
|
-
const argParams = findBinding(name, scope, unit)?.params ?? [];
|
|
983
|
-
const argArity = getSymbolArity(arg, name, scope, unit);
|
|
984
|
-
if (arg.kind === "Identifier" && argArity !== undefined && argArity !== expected) {
|
|
985
|
-
report(
|
|
986
|
-
getSpelledNameRange(arg, name),
|
|
987
|
-
`Expected arity ${expected} but found operator of arity ${argArity}.`,
|
|
988
|
-
);
|
|
989
|
-
}
|
|
990
|
-
return argArity === expected && argParams.every((param) => param === 0);
|
|
991
|
-
})
|
|
992
|
-
.forEach((isMatched, index) => {
|
|
993
|
-
if (!isMatched) {
|
|
994
|
-
report(
|
|
995
|
-
expression.location.range,
|
|
996
|
-
`Argument number ${index + 1} to operator '${operator}' \nshould be a ${params[index]}-parameter operator.`,
|
|
997
|
-
);
|
|
998
|
-
}
|
|
999
|
-
});
|
|
1141
|
+
const operatorRange =
|
|
1142
|
+
expression.selectorRanges?.at(-1) ?? getSpelledNameRange(expression, operator);
|
|
1143
|
+
const matches = expression.args
|
|
1144
|
+
.slice(0, params.length)
|
|
1145
|
+
.map((arg, index) =>
|
|
1146
|
+
matchArgument(arg, params[index], index, operator, operatorRange, scope, unit),
|
|
1147
|
+
);
|
|
1148
|
+
if (
|
|
1149
|
+
isArgumentCountReported(
|
|
1150
|
+
callee,
|
|
1151
|
+
operator,
|
|
1152
|
+
expression.args.length,
|
|
1153
|
+
expression.location.range,
|
|
1154
|
+
unit,
|
|
1155
|
+
)
|
|
1156
|
+
) {
|
|
1157
|
+
return;
|
|
1158
|
+
}
|
|
1159
|
+
matches.forEach((isMatched, index) => {
|
|
1160
|
+
if (!isMatched && expression.location.range) {
|
|
1161
|
+
unit.errors.push({
|
|
1162
|
+
location: formatRange(expression.location.range),
|
|
1163
|
+
message: `Argument number ${index + 1} to operator '${operator}' \nshould be a ${params[index]}-parameter operator.`,
|
|
1164
|
+
});
|
|
1165
|
+
}
|
|
1166
|
+
});
|
|
1000
1167
|
};
|
|
1001
1168
|
|
|
1002
1169
|
const resolveArgument = (arg: Expression, scope: LocalName | undefined, unit: Unit) => {
|
|
@@ -1007,18 +1174,48 @@ const resolveArgument = (arg: Expression, scope: LocalName | undefined, unit: Un
|
|
|
1007
1174
|
const isSelectionReported = (expression: Expression, scope: LocalName | undefined, unit: Unit) => {
|
|
1008
1175
|
const failed = selectionErrors.get(expression);
|
|
1009
1176
|
if (!failed) return false;
|
|
1010
|
-
failed.
|
|
1177
|
+
failed.applications.forEach((application) =>
|
|
1178
|
+
application.args.forEach((arg, index) =>
|
|
1179
|
+
matchArgument(
|
|
1180
|
+
arg,
|
|
1181
|
+
application.params[index],
|
|
1182
|
+
index,
|
|
1183
|
+
application.operator,
|
|
1184
|
+
application.range,
|
|
1185
|
+
scope,
|
|
1186
|
+
unit,
|
|
1187
|
+
),
|
|
1188
|
+
),
|
|
1189
|
+
);
|
|
1011
1190
|
unit.errors.push(failed.error);
|
|
1012
1191
|
return true;
|
|
1013
1192
|
};
|
|
1014
1193
|
|
|
1194
|
+
const resolveLambda = (
|
|
1195
|
+
expression: Expression & { kind: "Lambda" },
|
|
1196
|
+
scope: LocalName | undefined,
|
|
1197
|
+
unit: Unit,
|
|
1198
|
+
) =>
|
|
1199
|
+
resolveExpression(
|
|
1200
|
+
expression.body,
|
|
1201
|
+
bindNames(scope, expression.params, expression.paramRanges, unit),
|
|
1202
|
+
{
|
|
1203
|
+
...unit,
|
|
1204
|
+
labelParams: [...unit.labelParams, ...expression.params],
|
|
1205
|
+
},
|
|
1206
|
+
);
|
|
1207
|
+
|
|
1015
1208
|
const resolveExpression = (
|
|
1016
1209
|
expression: Expression,
|
|
1017
1210
|
scope: LocalName | undefined,
|
|
1018
1211
|
unit: Unit,
|
|
1019
1212
|
): void => {
|
|
1020
1213
|
if (selections.has(expression) && !unit.isGenerated) {
|
|
1021
|
-
|
|
1214
|
+
const failed = nullSelections
|
|
1215
|
+
.get(expression)
|
|
1216
|
+
?.find((selection) => unresolvedExpressions.has(selection.node));
|
|
1217
|
+
if (failed) unit.errors.push(failed.error);
|
|
1218
|
+
else resolveExpression(expression, scope, { ...unit, isGenerated: true });
|
|
1022
1219
|
return;
|
|
1023
1220
|
}
|
|
1024
1221
|
const resolveAll = (expressions: Expression[]) =>
|
|
@@ -1031,16 +1228,31 @@ const resolveExpression = (
|
|
|
1031
1228
|
case "Number":
|
|
1032
1229
|
case "Decimal":
|
|
1033
1230
|
case "String":
|
|
1231
|
+
return;
|
|
1034
1232
|
case "ExceptAt":
|
|
1233
|
+
if (!unit.isInExcept && expression.location.range) {
|
|
1234
|
+
unit.errors.push({
|
|
1235
|
+
location: formatRange(expression.location.range),
|
|
1236
|
+
message: "@ used where its meaning is not defined.",
|
|
1237
|
+
});
|
|
1238
|
+
}
|
|
1035
1239
|
return;
|
|
1036
1240
|
case "Identifier": {
|
|
1037
1241
|
if (isInstanceArityReported(expression, scope, unit)) return;
|
|
1038
1242
|
const name = expression.name;
|
|
1039
1243
|
const arity = getSymbolArity(expression, name, scope, unit);
|
|
1040
|
-
if (arity
|
|
1244
|
+
if (arity === 0) {
|
|
1245
|
+
isArgumentCountReported(
|
|
1246
|
+
findBinding(name, scope, unit),
|
|
1247
|
+
name,
|
|
1248
|
+
0,
|
|
1249
|
+
getSpelledNameRange(expression, name),
|
|
1250
|
+
unit,
|
|
1251
|
+
);
|
|
1252
|
+
} else if (arity !== undefined) {
|
|
1041
1253
|
unit.errors.push({
|
|
1042
1254
|
location: formatRange(getSpelledNameRange(expression, name)),
|
|
1043
|
-
message: `The operator ${name} requires ${arity} arguments.`,
|
|
1255
|
+
message: `The operator ${resolveSynonym(name)} requires ${arity} arguments.`,
|
|
1044
1256
|
});
|
|
1045
1257
|
}
|
|
1046
1258
|
return;
|
|
@@ -1052,11 +1264,13 @@ const resolveExpression = (
|
|
|
1052
1264
|
resolveApply(expression, scope, unit);
|
|
1053
1265
|
return;
|
|
1054
1266
|
case "Lambda":
|
|
1055
|
-
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1267
|
+
if (selections.has(expression)) resolveLambda(expression, scope, unit);
|
|
1268
|
+
else if (expression.location.range) {
|
|
1269
|
+
unit.errors.push({
|
|
1270
|
+
location: formatRange(expression.location.range),
|
|
1271
|
+
message: "LAMBDA expression used where an expression is required.",
|
|
1272
|
+
});
|
|
1273
|
+
}
|
|
1060
1274
|
return;
|
|
1061
1275
|
case "And":
|
|
1062
1276
|
case "Or":
|
|
@@ -1079,7 +1293,13 @@ const resolveExpression = (
|
|
|
1079
1293
|
case "Let":
|
|
1080
1294
|
resolveExpression(
|
|
1081
1295
|
expression.body,
|
|
1082
|
-
resolveDefinitions(
|
|
1296
|
+
resolveDefinitions(
|
|
1297
|
+
expression.definitions,
|
|
1298
|
+
scope,
|
|
1299
|
+
unit,
|
|
1300
|
+
expression.instances,
|
|
1301
|
+
expression.recursive,
|
|
1302
|
+
),
|
|
1083
1303
|
unit,
|
|
1084
1304
|
);
|
|
1085
1305
|
return;
|
|
@@ -1174,13 +1394,64 @@ const resolveExpression = (
|
|
|
1174
1394
|
expression.selectors
|
|
1175
1395
|
.flatMap((selector) => ("args" in selector ? selector.args : []))
|
|
1176
1396
|
.forEach((arg) => resolveArgument(arg, scope, unit));
|
|
1177
|
-
checkReference(expression, scope, unit, false);
|
|
1397
|
+
if (checkReference(expression, scope, unit, false)) return;
|
|
1398
|
+
const head = expression.selectors[0];
|
|
1399
|
+
const range = expression.selectorRanges?.[0];
|
|
1400
|
+
const nameCount = expression.selectors.findIndex((selector) => selector.kind !== "Name");
|
|
1401
|
+
const names = expression.selectors
|
|
1402
|
+
.slice(0, nameCount)
|
|
1403
|
+
.flatMap((selector) => (selector.kind === "Name" ? [selector.name] : []));
|
|
1404
|
+
const symbolIndex = names.findIndex(
|
|
1405
|
+
(_name, index) => index > 0 && findSymbol(names.slice(0, index + 1).join("!"), unit),
|
|
1406
|
+
);
|
|
1407
|
+
const isInstance =
|
|
1408
|
+
names.length > 1 &&
|
|
1409
|
+
(lookupLocal(scope, names[0]) ?? getModuleBinding(names[0], unit, undefined))?.kind ===
|
|
1410
|
+
"Instance";
|
|
1411
|
+
const lastRange = expression.selectorRanges?.[nameCount - 1];
|
|
1412
|
+
if (isInstance && symbolIndex === -1 && range && lastRange) {
|
|
1413
|
+
unit.errors.push({
|
|
1414
|
+
location: formatRange({ module: range.module, start: range.start, end: lastRange.end }),
|
|
1415
|
+
message: `Unknown operator: \`${resolveSynonym(names.join("!"))}'.`,
|
|
1416
|
+
});
|
|
1417
|
+
return;
|
|
1418
|
+
}
|
|
1419
|
+
const name = names.slice(0, symbolIndex + 1).join("!");
|
|
1420
|
+
const symbol = symbolIndex > 0 ? findSymbol(name, unit) : undefined;
|
|
1421
|
+
const argumentCount = expression.selectors
|
|
1422
|
+
.slice(0, symbolIndex + 1)
|
|
1423
|
+
.flatMap((selector) => ("args" in selector ? selector.args : [])).length;
|
|
1424
|
+
const argumentRange = expression.argumentRanges?.[symbolIndex] ?? expression.location.range;
|
|
1425
|
+
if (symbol && symbol.arity !== argumentCount && argumentRange) {
|
|
1426
|
+
unit.errors.push({
|
|
1427
|
+
location: formatRange(argumentRange),
|
|
1428
|
+
message: `The operator ${resolveSynonym(name)} requires ${symbol.arity} arguments.`,
|
|
1429
|
+
});
|
|
1430
|
+
return;
|
|
1431
|
+
}
|
|
1432
|
+
if (head.kind !== "Name" || expression.selectors[1].kind === "Name" || !range) return;
|
|
1433
|
+
const binding = lookupLocal(scope, head.name) ?? findSymbol(head.name, unit);
|
|
1434
|
+
if ((binding === undefined && !isFact(head.name, unit)) || binding?.kind === "Instance") {
|
|
1435
|
+
unit.errors.push({
|
|
1436
|
+
location: formatRange(range),
|
|
1437
|
+
message: `Unknown operator: \`${resolveSynonym(head.name)}'.`,
|
|
1438
|
+
});
|
|
1439
|
+
} else if (binding && !SELECTABLE_KINDS.has(binding.kind)) {
|
|
1440
|
+
reportUnselectable(head.name, range, unit);
|
|
1441
|
+
}
|
|
1178
1442
|
}
|
|
1179
1443
|
}
|
|
1180
1444
|
};
|
|
1181
1445
|
|
|
1182
1446
|
const checkFacts = (facts: Fact[], scope: LocalName | undefined, unit: Unit) =>
|
|
1183
1447
|
facts.forEach((fact) => {
|
|
1448
|
+
if (fact.kind === "ExceptAt" && fact.location.range) {
|
|
1449
|
+
unit.errors.push({
|
|
1450
|
+
location: formatRange(fact.location.range),
|
|
1451
|
+
message: "Unknown operator: `@'.",
|
|
1452
|
+
});
|
|
1453
|
+
return;
|
|
1454
|
+
}
|
|
1184
1455
|
if (
|
|
1185
1456
|
fact.kind === "ModuleFact" ||
|
|
1186
1457
|
isInstanceArityReported(fact, scope, unit) ||
|
|
@@ -1195,8 +1466,89 @@ const checkFacts = (facts: Fact[], scope: LocalName | undefined, unit: Unit) =>
|
|
|
1195
1466
|
location: formatRange(getSpelledNameRange(fact, name)),
|
|
1196
1467
|
message: "Step number of non-fact used as a fact",
|
|
1197
1468
|
});
|
|
1198
|
-
} else if (!
|
|
1469
|
+
} else if (!isFact(name, unit)) resolveExpression(fact, scope, unit);
|
|
1470
|
+
});
|
|
1471
|
+
|
|
1472
|
+
const isDefinitionEntry = (def: Fact, scope: LocalName | undefined, unit: Unit) => {
|
|
1473
|
+
const range = def.location.range;
|
|
1474
|
+
const name =
|
|
1475
|
+
def.kind === "Identifier" ? def.name : def.kind === "OperatorReference" ? def.operator : "";
|
|
1476
|
+
if (name === "" || !range) return true;
|
|
1477
|
+
const binding =
|
|
1478
|
+
lookupLocal(scope, name) ?? findSymbol(name, unit) ?? getModuleBinding(name, unit, range);
|
|
1479
|
+
if (binding === undefined && (isFact(name, unit) || isStepName(name))) return true;
|
|
1480
|
+
if (binding === undefined) {
|
|
1481
|
+
unit.errors.push({
|
|
1482
|
+
location: formatRange(range),
|
|
1483
|
+
message: `Unknown operator: \`${resolveSynonym(name)}'.`,
|
|
1484
|
+
});
|
|
1485
|
+
}
|
|
1486
|
+
if (binding && SELECTABLE_KINDS.has(binding.kind) && !isStepName(name)) return true;
|
|
1487
|
+
unit.errors.push({
|
|
1488
|
+
location: formatRange(range),
|
|
1489
|
+
message: "DEF clause entry should describe a defined operator.",
|
|
1490
|
+
});
|
|
1491
|
+
return false;
|
|
1492
|
+
};
|
|
1493
|
+
|
|
1494
|
+
const getHiddenExpressionLocation = (fact: Fact, scope: LocalName | undefined, unit: Unit) => {
|
|
1495
|
+
const range = fact.location.range && formatRange(fact.location.range);
|
|
1496
|
+
if (fact.kind === "ModuleFact" || selections.has(fact)) return undefined;
|
|
1497
|
+
if (selectionErrors.has(fact) || fact.kind === "ExceptAt") return BUILTIN_LOCATION;
|
|
1498
|
+
switch (fact.kind) {
|
|
1499
|
+
case "Number":
|
|
1500
|
+
case "String":
|
|
1501
|
+
case "Decimal":
|
|
1502
|
+
case "Let":
|
|
1503
|
+
case "Label":
|
|
1504
|
+
return undefined;
|
|
1505
|
+
case "Identifier":
|
|
1506
|
+
case "Apply":
|
|
1507
|
+
case "Subexpression": {
|
|
1508
|
+
const first = getSelectors(fact)[0];
|
|
1509
|
+
if (fact.kind === "Subexpression" || first.kind !== "Name") return undefined;
|
|
1510
|
+
const name = fact.kind === "Identifier" ? fact.name : fact.operator;
|
|
1511
|
+
const goal = lookupLocal(scope, first.name)?.goal ?? getGoal(first.name, unit);
|
|
1512
|
+
if (isFact(name, unit) || goal || (isStepName(name) && lookupLocal(scope, name))) {
|
|
1513
|
+
return undefined;
|
|
1514
|
+
}
|
|
1515
|
+
const binding = findBinding(name, scope, unit);
|
|
1516
|
+
const count = fact.kind === "Apply" ? fact.args.length : 0;
|
|
1517
|
+
return binding?.arity === count ? range : BUILTIN_LOCATION;
|
|
1518
|
+
}
|
|
1519
|
+
default:
|
|
1520
|
+
return range;
|
|
1521
|
+
}
|
|
1522
|
+
};
|
|
1523
|
+
|
|
1524
|
+
const checkUseOrHide = (
|
|
1525
|
+
statement: UseOrHide | Extract<Proof, { kind: "By" }>,
|
|
1526
|
+
scope: LocalName | undefined,
|
|
1527
|
+
unit: Unit,
|
|
1528
|
+
) => {
|
|
1529
|
+
const hidden =
|
|
1530
|
+
statement.kind === "Hide"
|
|
1531
|
+
? statement.facts.map((fact) => getHiddenExpressionLocation(fact, scope, unit))
|
|
1532
|
+
: [];
|
|
1533
|
+
checkFacts(statement.facts, scope, unit);
|
|
1534
|
+
const defCount = statement.defs.filter((def) => isDefinitionEntry(def, scope, unit)).length;
|
|
1535
|
+
hidden.forEach((location) => {
|
|
1536
|
+
if (location) {
|
|
1537
|
+
unit.errors.push({
|
|
1538
|
+
location,
|
|
1539
|
+
message:
|
|
1540
|
+
"The only expression allowed as a fact in a HIDE is \nthe name of a theorem, assumption, or step.",
|
|
1541
|
+
});
|
|
1542
|
+
}
|
|
1199
1543
|
});
|
|
1544
|
+
const range = statement.location.range;
|
|
1545
|
+
if (statement.facts.length + defCount === 0 && range) {
|
|
1546
|
+
unit.errors.push({
|
|
1547
|
+
location: formatRange(range),
|
|
1548
|
+
message: statement.kind === "By" ? "Empty BY" : "Empty USE or HIDE statement.",
|
|
1549
|
+
});
|
|
1550
|
+
}
|
|
1551
|
+
};
|
|
1200
1552
|
|
|
1201
1553
|
const resolveNewSymbol = (symbol: NewSymbol, scope: LocalName | undefined, unit: Unit) => {
|
|
1202
1554
|
if (symbol.set) resolveExpression(symbol.set, scope, unit);
|
|
@@ -1245,7 +1597,7 @@ const resolveStatement = (
|
|
|
1245
1597
|
|
|
1246
1598
|
const resolveProof = (proof: Proof | undefined, scope: LocalName | undefined, outer: Unit) => {
|
|
1247
1599
|
const unit = outer.hasLabelScope ? { ...outer, hasLabelScope: false } : outer;
|
|
1248
|
-
if (proof?.kind === "By")
|
|
1600
|
+
if (proof?.kind === "By") checkUseOrHide(proof, scope, unit);
|
|
1249
1601
|
if (proof?.kind !== "Steps") return;
|
|
1250
1602
|
proof.steps.reduce((current, step) => resolveStep(step, current, unit), scope);
|
|
1251
1603
|
};
|
|
@@ -1294,7 +1646,7 @@ const resolveStep = (
|
|
|
1294
1646
|
}
|
|
1295
1647
|
case "Use":
|
|
1296
1648
|
case "Hide":
|
|
1297
|
-
|
|
1649
|
+
checkUseOrHide(body, scope, unit);
|
|
1298
1650
|
return bindNonFactStep(scope);
|
|
1299
1651
|
case "Instance":
|
|
1300
1652
|
return bindNonFactStep(resolveLocalInstance(body, scope, stepUnit));
|
|
@@ -1417,18 +1769,72 @@ const checkSubstitutions = (
|
|
|
1417
1769
|
(parent, param) => ({ name: param.name, arity: param.arity, kind: "Parameter", parent }),
|
|
1418
1770
|
outer,
|
|
1419
1771
|
);
|
|
1772
|
+
const reportArity = (declaration: Declaration, location: string) =>
|
|
1773
|
+
unit.errors.push({
|
|
1774
|
+
location,
|
|
1775
|
+
message: `An operator must be substituted for symbol '${resolveSynonym(declaration.name)}', and it must have arity ${declaration.arity}.`,
|
|
1776
|
+
});
|
|
1420
1777
|
const resolveSubstitute = (declaration: Declaration, expression: Expression) => {
|
|
1421
|
-
|
|
1778
|
+
const range = expression.location.range;
|
|
1779
|
+
if (declaration.arity === 0) {
|
|
1422
1780
|
resolveExpression(expression, scope, unit);
|
|
1423
1781
|
return;
|
|
1424
1782
|
}
|
|
1783
|
+
if (expression.kind === "Lambda") {
|
|
1784
|
+
resolveLambda(expression, scope, unit);
|
|
1785
|
+
if (expression.params.length !== declaration.arity && range) {
|
|
1786
|
+
reportArity(declaration, formatRange(range));
|
|
1787
|
+
}
|
|
1788
|
+
return;
|
|
1789
|
+
}
|
|
1790
|
+
if (expression.kind === "OperatorReference") {
|
|
1791
|
+
const arity = getSymbolArity(expression, expression.operator, scope, unit);
|
|
1792
|
+
if (arity === undefined) reportArity(declaration, BUILTIN_LOCATION);
|
|
1793
|
+
else if (arity !== declaration.arity && range) reportArity(declaration, formatRange(range));
|
|
1794
|
+
return;
|
|
1795
|
+
}
|
|
1796
|
+
if (expression.kind !== "Identifier") {
|
|
1797
|
+
if (range) {
|
|
1798
|
+
unit.errors.push({
|
|
1799
|
+
location: formatRange(range),
|
|
1800
|
+
message: `Arity ${declaration.arity} operator (not an expression) is expected \nto substitute for CONSTANT '${resolveSynonym(declaration.name)}'.`,
|
|
1801
|
+
});
|
|
1802
|
+
}
|
|
1803
|
+
reportArity(declaration, BUILTIN_LOCATION);
|
|
1804
|
+
return;
|
|
1805
|
+
}
|
|
1425
1806
|
const arity = getSymbolArity(expression, expression.name, scope, unit);
|
|
1426
1807
|
if (arity !== undefined && arity !== declaration.arity) {
|
|
1427
|
-
|
|
1428
|
-
|
|
1429
|
-
|
|
1808
|
+
unit.errors.push({
|
|
1809
|
+
location: formatRange(getSpelledNameRange(expression, expression.name)),
|
|
1810
|
+
message: `Expected arity ${declaration.arity} but found operator of arity ${arity}.`,
|
|
1811
|
+
});
|
|
1430
1812
|
}
|
|
1813
|
+
if (arity !== declaration.arity) reportArity(declaration, BUILTIN_LOCATION);
|
|
1431
1814
|
};
|
|
1815
|
+
const instanceRange = instance.location.range;
|
|
1816
|
+
const isFound = (declaration: Declaration) =>
|
|
1817
|
+
lookupLocal(scope, declaration.name) !== undefined ||
|
|
1818
|
+
findSymbol(declaration.name, unit) !== undefined;
|
|
1819
|
+
const implicit = declarations.filter(isFound).map((declaration) => {
|
|
1820
|
+
const expression: Expression & { kind: "Identifier" } = {
|
|
1821
|
+
kind: "Identifier",
|
|
1822
|
+
name: declaration.name,
|
|
1823
|
+
location: instance.location,
|
|
1824
|
+
};
|
|
1825
|
+
return { declaration, expression };
|
|
1826
|
+
});
|
|
1827
|
+
implicit
|
|
1828
|
+
.filter((item) => item.declaration.arity === 0)
|
|
1829
|
+
.forEach((item) => {
|
|
1830
|
+
const arity = getSymbolArity(item.expression, item.declaration.name, scope, unit);
|
|
1831
|
+
if (arity && instanceRange) {
|
|
1832
|
+
unit.errors.push({
|
|
1833
|
+
location: formatRange(instanceRange),
|
|
1834
|
+
message: `Wrong number of arguments (0) given to operator '${resolveSynonym(item.declaration.name)}', \nwhich requires ${arity} arguments.`,
|
|
1835
|
+
});
|
|
1836
|
+
}
|
|
1837
|
+
});
|
|
1432
1838
|
const substitutions = new Map<string, Expression>();
|
|
1433
1839
|
instance.substitutions.forEach((substitution) => {
|
|
1434
1840
|
const name = substitution.name;
|
|
@@ -1451,30 +1857,29 @@ const checkSubstitutions = (
|
|
|
1451
1857
|
});
|
|
1452
1858
|
}
|
|
1453
1859
|
});
|
|
1454
|
-
const implicit = declarations.filter((declaration) => !substitutions.has(declaration.name));
|
|
1455
|
-
const isMissing = (declaration: Declaration) =>
|
|
1456
|
-
!lookupLocal(scope, declaration.name) && !findSymbol(declaration.name, unit);
|
|
1457
1860
|
implicit
|
|
1458
|
-
.filter((
|
|
1861
|
+
.filter((item) => !substitutions.has(item.declaration.name))
|
|
1862
|
+
.forEach((item) => {
|
|
1863
|
+
const arity =
|
|
1864
|
+
item.declaration.arity === 0
|
|
1865
|
+
? 0
|
|
1866
|
+
: getSymbolArity(item.expression, item.declaration.name, scope, unit);
|
|
1867
|
+
if (arity !== item.declaration.arity && instanceRange) {
|
|
1868
|
+
reportArity(item.declaration, formatRange(instanceRange));
|
|
1869
|
+
}
|
|
1870
|
+
substitutions.set(item.declaration.name, item.expression);
|
|
1871
|
+
});
|
|
1872
|
+
declarations
|
|
1873
|
+
.filter((declaration) => !substitutions.has(declaration.name))
|
|
1459
1874
|
.forEach((declaration) => {
|
|
1460
|
-
const
|
|
1461
|
-
|
|
1462
|
-
|
|
1463
|
-
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1875
|
+
const declared = declaration.location.range;
|
|
1876
|
+
if (instanceRange && declared) {
|
|
1877
|
+
unit.errors.push({
|
|
1878
|
+
location: formatRange(instanceRange),
|
|
1879
|
+
message: `Substitution missing for symbol ${resolveSynonym(declaration.name)} declared at ${formatRange(declared)} \nand instantiated in module ${instancer}.`,
|
|
1880
|
+
});
|
|
1881
|
+
}
|
|
1467
1882
|
});
|
|
1468
|
-
implicit.filter(isMissing).forEach((declaration) => {
|
|
1469
|
-
const range = instance.location.range;
|
|
1470
|
-
const declared = declaration.location.range;
|
|
1471
|
-
if (range && declared) {
|
|
1472
|
-
unit.errors.push({
|
|
1473
|
-
location: formatRange(range),
|
|
1474
|
-
message: `Substitution missing for symbol ${declaration.name} declared at ${formatRange(declared)} \nand instantiated in module ${instancer}.`,
|
|
1475
|
-
});
|
|
1476
|
-
}
|
|
1477
|
-
});
|
|
1478
1883
|
return substitutions;
|
|
1479
1884
|
};
|
|
1480
1885
|
|
|
@@ -1482,7 +1887,7 @@ const resolveInstance = (instance: Instance, scope: LocalName | undefined, unit:
|
|
|
1482
1887
|
const instanced = unit.getInstance(instance);
|
|
1483
1888
|
checkSubstitutions(instance, instanced.declarations, instanced.instancer, scope, unit);
|
|
1484
1889
|
return [...instanced.symbols].reduce(
|
|
1485
|
-
(parent,
|
|
1890
|
+
(parent, entry) => bindName(parent, entry[0], entry[1], unit),
|
|
1486
1891
|
scope,
|
|
1487
1892
|
);
|
|
1488
1893
|
};
|
|
@@ -1494,6 +1899,12 @@ export const resolveSubstitutions = (
|
|
|
1494
1899
|
unit: ModuleUnit,
|
|
1495
1900
|
) => {
|
|
1496
1901
|
const imported = createSymbols(module, unit.imported);
|
|
1902
|
+
const positions = new Map(
|
|
1903
|
+
[...module.constants, ...module.variables].map((declaration) => [
|
|
1904
|
+
declaration.name,
|
|
1905
|
+
declaration.location,
|
|
1906
|
+
]),
|
|
1907
|
+
);
|
|
1497
1908
|
const report: ModuleReport = { location: instance.location, errors: [], warnings: [] };
|
|
1498
1909
|
unit.reports.push(report);
|
|
1499
1910
|
return checkSubstitutions(instance, declarations, module.name, undefined, {
|
|
@@ -1506,7 +1917,10 @@ export const resolveSubstitutions = (
|
|
|
1506
1917
|
facts: new Set(),
|
|
1507
1918
|
goals: new Map(),
|
|
1508
1919
|
bindings: new Map(
|
|
1509
|
-
[...imported].map((
|
|
1920
|
+
[...imported].map((entry) => [
|
|
1921
|
+
entry[0],
|
|
1922
|
+
{ ...entry[1], position: positions.get(entry[0]) ?? MODULE_START },
|
|
1923
|
+
]),
|
|
1510
1924
|
),
|
|
1511
1925
|
errors: report.errors,
|
|
1512
1926
|
warnings: report.warnings,
|
|
@@ -1536,13 +1950,7 @@ export const collectSemanticErrors = (units: SemanticUnit[], warnings: SanyError
|
|
|
1536
1950
|
}
|
|
1537
1951
|
};
|
|
1538
1952
|
units
|
|
1539
|
-
.toSorted((left, right) =>
|
|
1540
|
-
isBefore(left.location, right.location)
|
|
1541
|
-
? -1
|
|
1542
|
-
: isBefore(right.location, left.location)
|
|
1543
|
-
? 1
|
|
1544
|
-
: 0,
|
|
1545
|
-
)
|
|
1953
|
+
.toSorted((left, right) => compareLocations(left.location, right.location))
|
|
1546
1954
|
.forEach((unit) => {
|
|
1547
1955
|
const reported: SanyError[] = [];
|
|
1548
1956
|
const warned: SanyError[] = [];
|
|
@@ -1562,10 +1970,6 @@ export const collectSemanticErrors = (units: SemanticUnit[], warnings: SanyError
|
|
|
1562
1970
|
|
|
1563
1971
|
export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
1564
1972
|
const symbols = createSymbols(module, unit.imported);
|
|
1565
|
-
const facts = new Set([
|
|
1566
|
-
...unit.facts,
|
|
1567
|
-
...[...module.theorems, ...module.assumptions].flatMap((fact) => fact.name ?? []),
|
|
1568
|
-
]);
|
|
1569
1973
|
const goals = new Map(
|
|
1570
1974
|
module.theorems.flatMap((theorem): [string, Goal][] =>
|
|
1571
1975
|
theorem.name !== undefined && theorem.statement.kind === "AssumeProve"
|
|
@@ -1574,9 +1978,9 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1574
1978
|
),
|
|
1575
1979
|
);
|
|
1576
1980
|
const bindings = new Map<string, ModuleBinding>(
|
|
1577
|
-
[...CORE_SYMBOLS, ...unit.bound].map((
|
|
1578
|
-
|
|
1579
|
-
{ ...
|
|
1981
|
+
[...CORE_SYMBOLS, ...unit.bound].map((entry) => [
|
|
1982
|
+
entry[0],
|
|
1983
|
+
{ ...entry[1], position: MODULE_START },
|
|
1580
1984
|
]),
|
|
1581
1985
|
);
|
|
1582
1986
|
const recursive = new Set<Binding>();
|
|
@@ -1596,7 +2000,7 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1596
2000
|
getKey: unit.getKey,
|
|
1597
2001
|
location,
|
|
1598
2002
|
self,
|
|
1599
|
-
facts,
|
|
2003
|
+
facts: unit.facts,
|
|
1600
2004
|
goals,
|
|
1601
2005
|
bindings,
|
|
1602
2006
|
errors,
|
|
@@ -1621,6 +2025,37 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1621
2025
|
);
|
|
1622
2026
|
return collectSemanticErrors(
|
|
1623
2027
|
[
|
|
2028
|
+
...module.units.flatMap((item): SemanticUnit[] => {
|
|
2029
|
+
const section =
|
|
2030
|
+
item.kind === "Variables"
|
|
2031
|
+
? { type: "A VARIABLE declaration", location: item.location }
|
|
2032
|
+
: item.kind === "Constants"
|
|
2033
|
+
? { type: "A declaration", location: item.location }
|
|
2034
|
+
: item.kind === "Module"
|
|
2035
|
+
? { type: "A MODULE ", location: item.module.location }
|
|
2036
|
+
: item.kind === "Theorem"
|
|
2037
|
+
? { type: "A THEOREM", location: item.theorem.location }
|
|
2038
|
+
: item.kind === "Assumption"
|
|
2039
|
+
? { type: "An ASSUME", location: item.assumption.location }
|
|
2040
|
+
: item.kind === "Use"
|
|
2041
|
+
? { type: "A USE or HIDE", location: item.use.location }
|
|
2042
|
+
: undefined;
|
|
2043
|
+
const range = section?.location.range;
|
|
2044
|
+
if (!section || !range) return [];
|
|
2045
|
+
return [
|
|
2046
|
+
{
|
|
2047
|
+
location: section.location,
|
|
2048
|
+
check: (errors) => {
|
|
2049
|
+
if (declarations.some((declared) => declared.binding?.isPending)) {
|
|
2050
|
+
errors.push({
|
|
2051
|
+
location: formatRange(range),
|
|
2052
|
+
message: `${section.type} may not appear within a recursive definition section.`,
|
|
2053
|
+
});
|
|
2054
|
+
}
|
|
2055
|
+
},
|
|
2056
|
+
},
|
|
2057
|
+
];
|
|
2058
|
+
}),
|
|
1624
2059
|
...unit.reports.map((report) => ({
|
|
1625
2060
|
location: report.location,
|
|
1626
2061
|
check: (errors: SanyError[], warnings: SanyError[]) => {
|
|
@@ -1637,6 +2072,7 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1637
2072
|
const binding: ModuleBinding = {
|
|
1638
2073
|
kind: "Definition",
|
|
1639
2074
|
arity: declaration.arity,
|
|
2075
|
+
params: Array(declaration.arity).fill(0),
|
|
1640
2076
|
range: declaration.location.range,
|
|
1641
2077
|
position: declaration.location,
|
|
1642
2078
|
isPending: true,
|
|
@@ -1702,7 +2138,7 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1702
2138
|
),
|
|
1703
2139
|
...module.uses.map((use) =>
|
|
1704
2140
|
createCheck(use.location, undefined, false, (inner) =>
|
|
1705
|
-
|
|
2141
|
+
checkUseOrHide(use, undefined, inner),
|
|
1706
2142
|
),
|
|
1707
2143
|
),
|
|
1708
2144
|
{
|
|
@@ -1713,7 +2149,7 @@ export const resolveModule = (module: Module, unit: ModuleUnit) => {
|
|
|
1713
2149
|
if (range && (!item.binding || item.binding.isPending)) {
|
|
1714
2150
|
errors.push({
|
|
1715
2151
|
location: formatRange(range),
|
|
1716
|
-
message: `Symbol ${item.declaration.name} declared in RECURSIVE statement but not defined.`,
|
|
2152
|
+
message: `Symbol ${resolveSynonym(item.declaration.name)} declared in RECURSIVE statement but not defined.`,
|
|
1717
2153
|
});
|
|
1718
2154
|
}
|
|
1719
2155
|
}),
|