tla-ts 0.0.10-dev.f16792fed → 0.0.10-dev.fdc173479
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 +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +41 -37
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +21 -4
- package/dist/index.d.ts +21 -4
- 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 +2681 -425
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +41 -42
- package/dist/run.js +41 -42
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -89
- package/dist/transfer.js +97 -89
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +72 -39
- package/src/bags.ts +50 -29
- package/src/builtins.ts +8 -16
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +321 -0
- package/src/check.ts +828 -770
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +65 -712
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +28 -20
- package/src/coverage.ts +255 -20
- package/src/dependencies.ts +96 -27
- package/src/dfid.ts +115 -50
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +175 -373
- package/src/errors.ts +40 -5
- package/src/evaluate.ts +429 -139
- package/src/exit-codes.ts +28 -12
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +178 -17
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/json.ts +4 -7
- package/src/levels.ts +708 -272
- package/src/lexer.ts +17 -5
- package/src/liveness-checker.ts +707 -249
- package/src/liveness.ts +148 -95
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +39 -9
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +27 -18
- 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 +55 -50
- package/src/obligations/source.ts +120 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +757 -326
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- 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 +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- 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 +19 -30
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- 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 +1 -3
- 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 +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +9 -20
- 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 +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- 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 +14 -13
- 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 +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- 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 +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- 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 +1016 -618
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +62 -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 +624 -9
- 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 +319 -0
- package/src/prover/smt/solver/asserted-formulas.ts +240 -56
- 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 +1483 -45
- package/src/prover/smt/solver/auf-solver.ts +25 -18
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -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 +127 -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 +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +598 -128
- package/src/prover/smt/solver/ctx-simplify.ts +29 -14
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -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 +93 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +207 -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 +298 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +548 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- package/src/prover/smt/solver/eq2bv-tactic.ts +227 -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 +734 -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 +886 -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 +178 -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 +34 -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 +111 -39
- 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 +355 -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 +30 -11
- 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 +1 -10
- 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 +1 -2
- 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 +41 -5
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -3
- 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 +68 -17
- 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 +122 -90
- 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 +310 -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 +106 -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 +19 -28
- package/src/prover/smt/solver/model-evaluator.ts +190 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +104 -35
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- 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 +382 -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 +495 -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 +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -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 +485 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +315 -98
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2376 -684
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- 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 +9 -8
- 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 +110 -24
- 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 +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -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 +546 -0
- package/src/prover/smt/solver/poly-rewriter.ts +259 -57
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +634 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -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 +39 -19
- 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 +829 -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 +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- 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 +82 -14
- package/src/prover/smt/solver/rewriter.ts +505 -60
- package/src/prover/smt/solver/rlimit.ts +45 -5
- 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 +589 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +480 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +72 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +190 -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 +2107 -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 +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3535 -360
- package/src/prover/smt/solver/smtlib-script.ts +2136 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +128 -23
- 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 +2176 -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 +1210 -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 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +57 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +35 -28
- package/src/prover/smt/solver/theory-lra-state.ts +7 -23
- package/src/prover/smt/solver/theory-lra.ts +189 -2
- package/src/prover/smt/solver/theory-pb.ts +951 -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-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +495 -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 +57 -26
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +16 -23
- package/src/prover/zenon/isar-case.ts +1 -3
- package/src/prover/zenon/isar.ts +37 -39
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- 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 +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +1327 -328
- package/src/runtime.ts +25 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +384 -0
- package/src/sany/generator-def-entries.ts +297 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1123 -0
- package/src/sany/generator-proofs.ts +668 -0
- package/src/sany/generator.ts +161 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +32 -23
- package/src/sany/linter.ts +0 -2
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +3 -4
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +46 -44
- package/src/sany/xml.ts +25 -58
- package/src/search.ts +513 -165
- package/src/simulate.ts +340 -251
- package/src/spec-description.ts +48 -55
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +72 -54
- package/src/state-graph.ts +0 -2
- package/src/subexpressions.ts +564 -138
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +56 -28
- package/src/symmetry.ts +4 -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 +23 -18
- package/src/tlc/order.ts +14 -3
- package/src/tlc/random.ts +6 -5
- package/src/tlc/replay.ts +152 -58
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +12 -11
- package/src/tlc/tlcext-operators.ts +87 -26
- package/src/tlc/trace-spec.ts +27 -60
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +208 -227
- 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/sany/levels.ts
CHANGED
package/src/sany/lexer.ts
CHANGED
|
@@ -290,34 +290,35 @@ const getMatchLength = (pattern: RegExp, source: string, offset: number) => {
|
|
|
290
290
|
return pattern.exec(source)?.[0].length ?? 0;
|
|
291
291
|
};
|
|
292
292
|
|
|
293
|
+
interface TokenMatch {
|
|
294
|
+
kind: number;
|
|
295
|
+
length: number;
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
const getLongerMatch = (best: TokenMatch, match: TokenMatch) =>
|
|
299
|
+
match.length > best.length || (match.length === best.length && match.kind < best.kind)
|
|
300
|
+
? match
|
|
301
|
+
: best;
|
|
302
|
+
|
|
293
303
|
const matchPatterns = (patterns: [string, RegExp[]][], source: string, offset: number) =>
|
|
294
304
|
patterns
|
|
295
|
-
.map((
|
|
296
|
-
kind: getKind(
|
|
297
|
-
length: Math.max(...
|
|
305
|
+
.map((pattern) => ({
|
|
306
|
+
kind: getKind(pattern[0]),
|
|
307
|
+
length: Math.max(...pattern[1].map((regex) => getMatchLength(regex, source, offset))),
|
|
298
308
|
}))
|
|
299
|
-
.reduce(
|
|
300
|
-
(best, match) =>
|
|
301
|
-
match.length > best.length || (match.length === best.length && match.kind < best.kind)
|
|
302
|
-
? match
|
|
303
|
-
: best,
|
|
304
|
-
{ kind: -1, length: 0 },
|
|
305
|
-
);
|
|
309
|
+
.reduce(getLongerMatch, { kind: -1, length: 0 });
|
|
306
310
|
|
|
307
311
|
const matchSpecToken = (source: string, offset: number) => {
|
|
308
312
|
const literalLength = LITERAL_LENGTHS.find((length) =>
|
|
309
313
|
LITERALS.has(source.slice(offset, offset + length)),
|
|
310
314
|
);
|
|
311
315
|
const pattern = matchPatterns(SPEC_PATTERNS, source, offset);
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
(literal.length === pattern.length && literal.kind < pattern.kind)
|
|
319
|
-
? literal
|
|
320
|
-
: pattern;
|
|
316
|
+
return literalLength === undefined
|
|
317
|
+
? pattern
|
|
318
|
+
: getLongerMatch(pattern, {
|
|
319
|
+
kind: LITERALS.get(source.slice(offset, offset + literalLength)) ?? -1,
|
|
320
|
+
length: literalLength,
|
|
321
|
+
});
|
|
321
322
|
};
|
|
322
323
|
|
|
323
324
|
export const getTabStop = (column: number) => column + 8 - (column % 8);
|
|
@@ -354,6 +355,15 @@ const getPositions = (source: string) => {
|
|
|
354
355
|
return { lines, columns };
|
|
355
356
|
};
|
|
356
357
|
|
|
358
|
+
// JavaCC places the end of the file at the file's last character.
|
|
359
|
+
export const getEndOfFile = (source: string) => {
|
|
360
|
+
const positions = getPositions(source);
|
|
361
|
+
return {
|
|
362
|
+
line: positions.lines[source.length - 1] ?? 0,
|
|
363
|
+
column: positions.columns[source.length - 1] ?? 0,
|
|
364
|
+
};
|
|
365
|
+
};
|
|
366
|
+
|
|
357
367
|
const STRING_PREFIX = /"(?:[^"\n\r\\]|\\[ntrf\\"])*\\?/y;
|
|
358
368
|
const LITERAL_PREFIXES = new Set(
|
|
359
369
|
[...LITERALS.keys()].flatMap((image) =>
|
|
@@ -381,8 +391,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
381
391
|
beginColumn: positions.columns[start] ?? 0,
|
|
382
392
|
next: undefined,
|
|
383
393
|
});
|
|
384
|
-
|
|
385
|
-
const getEndOfFile = () => createToken(getKind("EOF"), source.length - 1, 0);
|
|
394
|
+
const createEndOfFile = () => createToken(getKind("EOF"), source.length - 1, 0);
|
|
386
395
|
const getLexicalError = (start: number, end: number, after: string) => {
|
|
387
396
|
const index = end - 1;
|
|
388
397
|
const line = positions.lines[index];
|
|
@@ -436,7 +445,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
436
445
|
}
|
|
437
446
|
nextOffset++;
|
|
438
447
|
}
|
|
439
|
-
return
|
|
448
|
+
return createEndOfFile();
|
|
440
449
|
};
|
|
441
450
|
const getNextToken = (): SanyToken | string => {
|
|
442
451
|
if (mode === "DEFAULT") return getSkippingToken(DEFAULT_PATTERNS);
|
|
@@ -461,7 +470,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
461
470
|
return token;
|
|
462
471
|
}
|
|
463
472
|
}
|
|
464
|
-
return
|
|
473
|
+
return createEndOfFile();
|
|
465
474
|
};
|
|
466
475
|
return getNextToken;
|
|
467
476
|
};
|
package/src/sany/linter.ts
CHANGED
package/src/sany/modules.ts
CHANGED
|
@@ -1289,8 +1289,10 @@ _TLCTrace ==
|
|
|
1289
1289
|
]);
|
|
1290
1290
|
|
|
1291
1291
|
export const SANY_174_STANDARD_MODULES = new Map([
|
|
1292
|
-
...[...SANY_STANDARD_MODULES].filter((
|
|
1293
|
-
["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(
|
|
1292
|
+
...[...SANY_STANDARD_MODULES].filter((entry) =>
|
|
1293
|
+
["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(
|
|
1294
|
+
entry[0],
|
|
1295
|
+
),
|
|
1294
1296
|
),
|
|
1295
1297
|
["Bags", BAGS.replace("\nLOCAL INSTANCE Naturals\n", "\nEXTENDS TLC\nLOCAL INSTANCE Naturals\n")],
|
|
1296
1298
|
[
|
package/src/sany/nodes.ts
CHANGED
|
@@ -153,12 +153,11 @@ export interface OpApplNode extends LevelFields {
|
|
|
153
153
|
tupleOrs: boolean[] | undefined;
|
|
154
154
|
ranges: ExprNode[];
|
|
155
155
|
location: SanyLocation;
|
|
156
|
-
|
|
157
|
-
isAbsent?: boolean;
|
|
156
|
+
nullKind?: "null" | "absent";
|
|
158
157
|
}
|
|
159
158
|
|
|
160
|
-
export const isAbsent = (node: LevelNode | undefined) =>
|
|
161
|
-
node?.kind === "OpAppl" && node.
|
|
159
|
+
export const isAbsent = (node: LevelNode | SymbolNode | undefined) =>
|
|
160
|
+
node?.kind === "OpAppl" && node.nullKind === "absent";
|
|
162
161
|
|
|
163
162
|
export interface NumeralNode extends LevelFields {
|
|
164
163
|
kind: "Numeral";
|
package/src/sany/report.ts
CHANGED
|
@@ -109,9 +109,8 @@ export const getSanyReport = (
|
|
|
109
109
|
const rootName = basename(rootPath, ".tla");
|
|
110
110
|
const standardModules = getSanyStandardModules(options.version);
|
|
111
111
|
const name = options.fileName ?? rootName;
|
|
112
|
-
const
|
|
113
|
-
|
|
114
|
-
: standardModules.get(rootName);
|
|
112
|
+
const isRootFile = existsSync(rootPath);
|
|
113
|
+
const source = isRootFile ? readFileSync(rootPath, "utf8") : standardModules.get(rootName);
|
|
115
114
|
const lines: string[] = [];
|
|
116
115
|
const write = (text: string) => {
|
|
117
116
|
lines.push(text);
|
|
@@ -124,9 +123,7 @@ export const getSanyReport = (
|
|
|
124
123
|
if (!options.isXmlExport) log(text);
|
|
125
124
|
};
|
|
126
125
|
const describeFile = options.describeFile;
|
|
127
|
-
const origins = new Map<string, SanyModuleOrigin>([
|
|
128
|
-
[rootName, existsSync(rootPath) ? "file" : "standard"],
|
|
129
|
-
]);
|
|
126
|
+
const origins = new Map<string, SanyModuleOrigin>([[rootName, isRootFile ? "file" : "standard"]]);
|
|
130
127
|
let isFailed = false;
|
|
131
128
|
const parseMessages: SanyMessage[] = [];
|
|
132
129
|
let isParseReported = false;
|
package/src/sany/selectors.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
CONSTANT_DECL_KIND,
|
|
5
5
|
getContextSymbol,
|
|
6
6
|
getSymbolArity,
|
|
7
|
+
isAbsent,
|
|
7
8
|
type AssumeProveNode,
|
|
8
9
|
type Context,
|
|
9
10
|
type ExprNode,
|
|
@@ -176,7 +177,6 @@ export const createSelectorResolver =
|
|
|
176
177
|
const substInPrefix: SubstInNode[] = [];
|
|
177
178
|
const params: FormalParamNode[] = [];
|
|
178
179
|
const allArgs: ExprOrOpArgNode[] = [];
|
|
179
|
-
const getItemLocation = (itemIndex: number) => items[itemIndex].location ?? location;
|
|
180
180
|
const walk: SelectorWalk = {
|
|
181
181
|
name: undefined,
|
|
182
182
|
nameLocation: undefined,
|
|
@@ -189,6 +189,7 @@ export const createSelectorResolver =
|
|
|
189
189
|
definitionArgs: [],
|
|
190
190
|
isInSuffices: false,
|
|
191
191
|
};
|
|
192
|
+
const getItemLocation = () => items[walk.index].location ?? location;
|
|
192
193
|
const getArgs = (item: SelectorItem) => item.args ?? [];
|
|
193
194
|
|
|
194
195
|
while (walk.index < items.length) {
|
|
@@ -198,7 +199,7 @@ export const createSelectorResolver =
|
|
|
198
199
|
item.args !== undefined
|
|
199
200
|
) {
|
|
200
201
|
return generator.addError(
|
|
201
|
-
getItemLocation(
|
|
202
|
+
getItemLocation(),
|
|
202
203
|
`Selector \`${item.name}' should not have argument(s).`,
|
|
203
204
|
);
|
|
204
205
|
}
|
|
@@ -217,7 +218,7 @@ export const createSelectorResolver =
|
|
|
217
218
|
: undefined;
|
|
218
219
|
if (walk.name === undefined && current.op !== "Name") {
|
|
219
220
|
return generator.addError(
|
|
220
|
-
getItemLocation(
|
|
221
|
+
getItemLocation(),
|
|
221
222
|
`Need name or step number here, not \`${current.name}'.`,
|
|
222
223
|
);
|
|
223
224
|
}
|
|
@@ -230,7 +231,7 @@ export const createSelectorResolver =
|
|
|
230
231
|
if (symbol === undefined) {
|
|
231
232
|
if (newName !== undefined) {
|
|
232
233
|
walk.name = newName;
|
|
233
|
-
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation(
|
|
234
|
+
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation());
|
|
234
235
|
}
|
|
235
236
|
collectedArgs.push(...getArgs(current));
|
|
236
237
|
walk.index++;
|
|
@@ -239,7 +240,7 @@ export const createSelectorResolver =
|
|
|
239
240
|
if (symbol === undefined && generator.version === "1.7.4") {
|
|
240
241
|
const lastIndex = items.length - 1;
|
|
241
242
|
return generator.addError(
|
|
242
|
-
|
|
243
|
+
items[lastIndex].location ?? location,
|
|
243
244
|
`Unknown operator: \`${getSelectorItemName(items[lastIndex])}'.`,
|
|
244
245
|
);
|
|
245
246
|
}
|
|
@@ -251,16 +252,16 @@ export const createSelectorResolver =
|
|
|
251
252
|
}
|
|
252
253
|
if (symbol.kind === "Module") {
|
|
253
254
|
return generator.addError(
|
|
254
|
-
getItemLocation(
|
|
255
|
+
getItemLocation(),
|
|
255
256
|
`Module name (${items[walk.index].name}) not allowed here.`,
|
|
256
257
|
);
|
|
257
258
|
}
|
|
258
259
|
walk.node = symbol;
|
|
259
|
-
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation(
|
|
260
|
+
walk.nameLocation = extendLocation(walk.nameLocation, getItemLocation());
|
|
260
261
|
walk.name = newName;
|
|
261
262
|
if (isDeclarationLike(symbol) && items.length !== 1) {
|
|
262
263
|
return generator.addError(
|
|
263
|
-
getItemLocation(
|
|
264
|
+
getItemLocation(),
|
|
264
265
|
`Cannot take subexpression of \`${walk.name}'.`,
|
|
265
266
|
);
|
|
266
267
|
}
|
|
@@ -279,7 +280,7 @@ export const createSelectorResolver =
|
|
|
279
280
|
symbol,
|
|
280
281
|
argumentIndex + walk.definitionArityFound,
|
|
281
282
|
argument,
|
|
282
|
-
getItemLocation(
|
|
283
|
+
getItemLocation(),
|
|
283
284
|
),
|
|
284
285
|
),
|
|
285
286
|
);
|
|
@@ -288,7 +289,7 @@ export const createSelectorResolver =
|
|
|
288
289
|
if (symbol.kind === "OpDef" && symbol.defKind === "ModuleInstance") {
|
|
289
290
|
if (walk.index === items.length - 1 && !(isDef || isFact)) {
|
|
290
291
|
return generator.addError(
|
|
291
|
-
getItemLocation(
|
|
292
|
+
getItemLocation(),
|
|
292
293
|
`Operator name ${walk.name} is incomplete.`,
|
|
293
294
|
);
|
|
294
295
|
}
|
|
@@ -305,7 +306,7 @@ export const createSelectorResolver =
|
|
|
305
306
|
items.length !== 1
|
|
306
307
|
) {
|
|
307
308
|
return generator.addError(
|
|
308
|
-
getItemLocation(
|
|
309
|
+
getItemLocation(),
|
|
309
310
|
`Subexpression of \`${walk.name}' used inside the operator's definition.`,
|
|
310
311
|
);
|
|
311
312
|
}
|
|
@@ -340,21 +341,18 @@ export const createSelectorResolver =
|
|
|
340
341
|
? owner.labels.get(item.name)
|
|
341
342
|
: undefined;
|
|
342
343
|
if (label === undefined)
|
|
343
|
-
return generator.addError(
|
|
344
|
-
getItemLocation(walk.index),
|
|
345
|
-
`Cannot find label \`${item.name}'.`,
|
|
346
|
-
);
|
|
344
|
+
return generator.addError(getItemLocation(), `Cannot find label \`${item.name}'.`);
|
|
347
345
|
walk.node = label;
|
|
348
346
|
if (generator.isOutOfLabelScope(label)) {
|
|
349
347
|
return generator.addError(
|
|
350
|
-
getItemLocation(
|
|
348
|
+
getItemLocation(),
|
|
351
349
|
`Accessing subexpression labeled \`${item.name}' of ASSUME/PROVE clause within the scope of a declaration\n from outside that declaration's scope.`,
|
|
352
350
|
);
|
|
353
351
|
}
|
|
354
352
|
if (expectedArity === 0) {
|
|
355
353
|
if (label.params.length !== getArgs(item).length) {
|
|
356
354
|
return generator.addError(
|
|
357
|
-
getItemLocation(
|
|
355
|
+
getItemLocation(),
|
|
358
356
|
`Label \`${item.name}' used with wrong number of arguments.`,
|
|
359
357
|
);
|
|
360
358
|
}
|
|
@@ -371,7 +369,7 @@ export const createSelectorResolver =
|
|
|
371
369
|
const node = walk.node;
|
|
372
370
|
const addNonexistentError = () =>
|
|
373
371
|
generator.addError(
|
|
374
|
-
getItemLocation(
|
|
372
|
+
getItemLocation(),
|
|
375
373
|
`Nonexistent operand specified by \`${getSelectorItemName(item)}'.`,
|
|
376
374
|
);
|
|
377
375
|
if (item.op === ":") {
|
|
@@ -381,19 +379,19 @@ export const createSelectorResolver =
|
|
|
381
379
|
(walk.index < items.length - 1 && items[walk.index + 1].op === "Name"));
|
|
382
380
|
if (!isAllowed) {
|
|
383
381
|
return generator.addError(
|
|
384
|
-
getItemLocation(
|
|
382
|
+
getItemLocation(),
|
|
385
383
|
"`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
|
|
386
384
|
);
|
|
387
385
|
}
|
|
388
|
-
} else if (node === undefined) {
|
|
386
|
+
} else if (node === undefined || isAbsent(node)) {
|
|
389
387
|
return generator.addError(
|
|
390
|
-
getItemLocation(
|
|
388
|
+
getItemLocation(),
|
|
391
389
|
"Subexpression selection failed, probably due to an error in the selected expression.",
|
|
392
390
|
);
|
|
393
391
|
} else if (node.kind === "LetIn") {
|
|
394
392
|
if (getArgNumber(item.op, 1) !== 1)
|
|
395
393
|
return generator.addError(
|
|
396
|
-
getItemLocation(
|
|
394
|
+
getItemLocation(),
|
|
397
395
|
"A LET/IN expression has only one operand.",
|
|
398
396
|
);
|
|
399
397
|
walk.node = node.body;
|
|
@@ -406,7 +404,7 @@ export const createSelectorResolver =
|
|
|
406
404
|
(operator.kind === "OpDef" && operator.defKind === "UserDefined");
|
|
407
405
|
const addNotPairError = () =>
|
|
408
406
|
generator.addError(
|
|
409
|
-
getItemLocation(
|
|
407
|
+
getItemLocation(),
|
|
410
408
|
"Internal error: Expecting $Pair and didn't find it.",
|
|
411
409
|
);
|
|
412
410
|
const isPair = (pair: ExprOrOpArgNode | undefined): pair is OpApplNode =>
|
|
@@ -416,7 +414,11 @@ export const createSelectorResolver =
|
|
|
416
414
|
const number = getArgNumber(item.op, operator.arity);
|
|
417
415
|
if (number === -1) return addNonexistentError();
|
|
418
416
|
walk.node = operands[number - 1];
|
|
419
|
-
} else if (
|
|
417
|
+
} else if (
|
|
418
|
+
operator.kind === "OpDef" &&
|
|
419
|
+
operator.defKind === "BuiltIn" &&
|
|
420
|
+
node.nullKind !== "null"
|
|
421
|
+
) {
|
|
420
422
|
if (operator.name === "$RcdConstructor" || operator.name === "$SetOfRcds") {
|
|
421
423
|
if (operandNumber === -1) return addNonexistentError();
|
|
422
424
|
const pair = operands[operandNumber - 1];
|
|
@@ -425,7 +427,7 @@ export const createSelectorResolver =
|
|
|
425
427
|
} else if (operator.name === "$Case") {
|
|
426
428
|
if (walk.index === items.length - 1) {
|
|
427
429
|
return generator.addError(
|
|
428
|
-
getItemLocation(
|
|
430
|
+
getItemLocation(),
|
|
429
431
|
"Subexpression of CASE must have form !i!j.",
|
|
430
432
|
);
|
|
431
433
|
}
|
|
@@ -436,20 +438,20 @@ export const createSelectorResolver =
|
|
|
436
438
|
const number = getArgNumber(items[walk.index].op, 2);
|
|
437
439
|
if (number === -1) {
|
|
438
440
|
return generator.addError(
|
|
439
|
-
getItemLocation(
|
|
441
|
+
getItemLocation(),
|
|
440
442
|
"Second selector for CASE subexpression must specify one of two operands.",
|
|
441
443
|
);
|
|
442
444
|
}
|
|
443
445
|
walk.node = pair.operands[number - 1];
|
|
444
|
-
if (walk.node === undefined)
|
|
446
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
445
447
|
return generator.addError(
|
|
446
|
-
getItemLocation(
|
|
448
|
+
getItemLocation(),
|
|
447
449
|
"Selecting OTHER in a CASE statement.",
|
|
448
450
|
);
|
|
449
451
|
} else if (operator.name === "$Except") {
|
|
450
452
|
if (operandNumber > 1) {
|
|
451
453
|
return generator.addError(
|
|
452
|
-
getItemLocation(
|
|
454
|
+
getItemLocation(),
|
|
453
455
|
"Selecting subexpression of an EXCEPT not yet implemented.",
|
|
454
456
|
);
|
|
455
457
|
}
|
|
@@ -464,7 +466,7 @@ export const createSelectorResolver =
|
|
|
464
466
|
if (item.op === "Null") {
|
|
465
467
|
if (getArgs(item).length !== symbols.length) {
|
|
466
468
|
return generator.addError(
|
|
467
|
-
getItemLocation(
|
|
469
|
+
getItemLocation(),
|
|
468
470
|
`Selector with ${getArgs(item).length} argument(s) used for quantifier with ${symbols.length} bound identifier(s).`,
|
|
469
471
|
);
|
|
470
472
|
}
|
|
@@ -478,15 +480,15 @@ export const createSelectorResolver =
|
|
|
478
480
|
}
|
|
479
481
|
} else {
|
|
480
482
|
return generator.addError(
|
|
481
|
-
getItemLocation(
|
|
482
|
-
`Choosing operand \`${item
|
|
483
|
+
getItemLocation(),
|
|
484
|
+
`Choosing operand \`${getSelectorItemName(item)}' of subexpression with no operands.`,
|
|
483
485
|
);
|
|
484
486
|
}
|
|
485
487
|
} else if (node.kind === "AssumeProve") {
|
|
486
488
|
if (node.isSuffices && !walk.isInSuffices) {
|
|
487
489
|
if (getArgNumber(item.op, 1) !== 1) {
|
|
488
490
|
return generator.addError(
|
|
489
|
-
getItemLocation(
|
|
491
|
+
getItemLocation(),
|
|
490
492
|
"Accessing non-existent subexpression of a SUFFICES",
|
|
491
493
|
);
|
|
492
494
|
}
|
|
@@ -497,7 +499,7 @@ export const createSelectorResolver =
|
|
|
497
499
|
if (number === -1) return addNonexistentError();
|
|
498
500
|
if (generator.isOutOfClauseScope(node, number)) {
|
|
499
501
|
return generator.addError(
|
|
500
|
-
getItemLocation(
|
|
502
|
+
getItemLocation(),
|
|
501
503
|
"Accessing ASSUME/PROVE clause within the scope of a declaration\n from outside that declaration's scope.",
|
|
502
504
|
);
|
|
503
505
|
}
|
|
@@ -505,7 +507,7 @@ export const createSelectorResolver =
|
|
|
505
507
|
walk.node = node.assumptions[number - 1];
|
|
506
508
|
if (walk.node.kind === "NewSymb" && walk.index !== items.length - 1) {
|
|
507
509
|
return generator.addError(
|
|
508
|
-
getItemLocation(
|
|
510
|
+
getItemLocation(),
|
|
509
511
|
"Selected a subexpression of a NEW clause of an ASSUME.",
|
|
510
512
|
);
|
|
511
513
|
}
|
|
@@ -515,20 +517,20 @@ export const createSelectorResolver =
|
|
|
515
517
|
const lambda = node.op;
|
|
516
518
|
if (lambda.kind !== "OpDef" || lambda.name !== "LAMBDA") {
|
|
517
519
|
return generator.addError(
|
|
518
|
-
getItemLocation(
|
|
520
|
+
getItemLocation(),
|
|
519
521
|
"Trying to select subexpression of an operator argument.",
|
|
520
522
|
);
|
|
521
523
|
}
|
|
522
524
|
if (item.op !== "Null" && item.op !== "@") {
|
|
523
525
|
return generator.addError(
|
|
524
|
-
getItemLocation(
|
|
526
|
+
getItemLocation(),
|
|
525
527
|
`Cannot use !${item.name} to select subexpression of a LAMBDA.`,
|
|
526
528
|
);
|
|
527
529
|
}
|
|
528
530
|
if (item.op === "Null") {
|
|
529
531
|
if (lambda.arity !== getArgs(item).length) {
|
|
530
532
|
return generator.addError(
|
|
531
|
-
getItemLocation(
|
|
533
|
+
getItemLocation(),
|
|
532
534
|
`Selector with ${getArgs(item).length} arguments used for LAMBDA expression taking ${lambda.arity} arguments.`,
|
|
533
535
|
);
|
|
534
536
|
}
|
|
@@ -541,14 +543,14 @@ export const createSelectorResolver =
|
|
|
541
543
|
walk.index--;
|
|
542
544
|
} else {
|
|
543
545
|
return generator.addError(
|
|
544
|
-
getItemLocation(
|
|
546
|
+
getItemLocation(),
|
|
545
547
|
"Selecting subexpression of expression that has none.",
|
|
546
548
|
);
|
|
547
549
|
}
|
|
548
|
-
if (walk.node === undefined)
|
|
550
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
549
551
|
return generator.addError(
|
|
550
|
-
getItemLocation(
|
|
551
|
-
`An unexpected null node specified by '${item
|
|
552
|
+
getItemLocation(),
|
|
553
|
+
`An unexpected null node specified by '${getSelectorItemName(item)}'.\nThis is probably due to a previous error.`,
|
|
552
554
|
);
|
|
553
555
|
if (walk.index !== items.length - 1) {
|
|
554
556
|
const next = items[walk.index + 1];
|
|
@@ -556,7 +558,7 @@ export const createSelectorResolver =
|
|
|
556
558
|
while (walk.node?.kind === "Label") walk.node = walk.node.body;
|
|
557
559
|
if (walk.node?.kind !== "LetIn") {
|
|
558
560
|
return generator.addError(
|
|
559
|
-
getItemLocation(
|
|
561
|
+
getItemLocation(),
|
|
560
562
|
"A name selector here must be from a LET clause.",
|
|
561
563
|
);
|
|
562
564
|
}
|
|
@@ -564,7 +566,7 @@ export const createSelectorResolver =
|
|
|
564
566
|
walk.mode = "FindingOpName";
|
|
565
567
|
} else if (next.op === ":") {
|
|
566
568
|
return generator.addError(
|
|
567
|
-
getItemLocation(
|
|
569
|
+
getItemLocation(),
|
|
568
570
|
"!: should not follow an operand selector.",
|
|
569
571
|
);
|
|
570
572
|
}
|