tla-ts 0.0.4-dev.a0009b7 → 0.0.4-dev.c4929d7
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 +27 -141
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +37 -1
- package/dist/index.d.ts +37 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -4
- package/dist/parallel-worker.js +1 -4
- package/dist/prove-worker.cjs +9 -0
- package/dist/prove-worker.d.cts +9 -0
- package/dist/prove-worker.d.ts +9 -0
- package/dist/prove-worker.js +9 -0
- package/dist/prove.cjs +996 -0
- package/dist/prove.js +996 -0
- package/dist/run-cli.cjs +37 -47
- package/dist/run-cli.js +37 -47
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +38 -44
- package/dist/transfer.js +38 -44
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +21 -12
- package/src/check.ts +1 -0
- package/src/codegen.ts +26 -7
- package/src/errors.ts +86 -0
- package/src/evaluate.ts +63 -20
- package/src/index.ts +10 -0
- package/src/{obligation-action.ts → obligations/action.ts} +265 -55
- package/src/{obligation-anon.ts → obligations/anon.ts} +47 -37
- package/src/obligations/ctx.ts +64 -0
- package/src/{obligation-deref.ts → obligations/deref.ts} +38 -61
- package/src/{obligation-expression.ts → obligations/expression.ts} +78 -45
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/{obligation-generate.ts → obligations/generate.ts} +147 -74
- package/src/{obligations.ts → obligations/index.ts} +29 -13
- package/src/{obligation-levels.ts → obligations/levels.ts} +14 -5
- package/src/{obligation-module.ts → obligations/module.ts} +56 -33
- package/src/obligations/pickle.ts +98 -0
- package/src/obligations/pragma.ts +189 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +22 -80
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -1
- package/src/{obligation-source.ts → obligations/source.ts} +159 -97
- package/src/obligations/temporal.ts +319 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +1 -1
- package/src/ocaml-marshal.ts +166 -0
- package/src/parallel-worker.ts +2 -18
- package/src/parallel.ts +10 -43
- package/src/prove/decide-pool.ts +100 -0
- package/src/prove/deciders.ts +33 -0
- package/src/prove/isabelle/LICENSE +36 -0
- package/src/prove/isabelle/LICENSE-tlapm +26 -0
- package/src/prove/isabelle/decide.ts +47 -0
- package/src/prove/isabelle/encode.ts +503 -0
- package/src/prove/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prove/isabelle/isar/method.ts +367 -0
- package/src/prove/isabelle/isar/proof.ts +28 -0
- package/src/prove/isabelle/isar/statement.ts +57 -0
- package/src/prove/isabelle/isar/theory.ts +192 -0
- package/src/prove/isabelle/isar/type-check.ts +278 -0
- package/src/prove/isabelle/provers/blast/blast.ts +258 -0
- package/src/prove/isabelle/provers/blast/branch.ts +322 -0
- package/src/prove/isabelle/provers/blast/prove.ts +347 -0
- package/src/prove/isabelle/provers/blast/rules.ts +330 -0
- package/src/prove/isabelle/provers/blast/state.ts +180 -0
- package/src/prove/isabelle/provers/blast/term.ts +547 -0
- package/src/prove/isabelle/provers/clasimp.ts +150 -0
- package/src/prove/isabelle/provers/classical.ts +389 -0
- package/src/prove/isabelle/provers/hypsubst.ts +441 -0
- package/src/prove/isabelle/pure/bicompose.ts +174 -0
- package/src/prove/isabelle/pure/consts.ts +32 -0
- package/src/prove/isabelle/pure/conv.ts +79 -0
- package/src/prove/isabelle/pure/drule.ts +264 -0
- package/src/prove/isabelle/pure/envir.ts +363 -0
- package/src/prove/isabelle/pure/goal.ts +53 -0
- package/src/prove/isabelle/pure/interrupt.ts +16 -0
- package/src/prove/isabelle/pure/list.ts +12 -0
- package/src/prove/isabelle/pure/logic.ts +402 -0
- package/src/prove/isabelle/pure/name.ts +110 -0
- package/src/prove/isabelle/pure/net.ts +262 -0
- package/src/prove/isabelle/pure/object-logic.ts +41 -0
- package/src/prove/isabelle/pure/pattern.ts +650 -0
- package/src/prove/isabelle/pure/raw-simplifier.ts +353 -0
- package/src/prove/isabelle/pure/rewriter.ts +602 -0
- package/src/prove/isabelle/pure/search.ts +68 -0
- package/src/prove/isabelle/pure/seq.ts +156 -0
- package/src/prove/isabelle/pure/simplifier.ts +112 -0
- package/src/prove/isabelle/pure/table.ts +208 -0
- package/src/prove/isabelle/pure/tactic.ts +276 -0
- package/src/prove/isabelle/pure/tactical.ts +347 -0
- package/src/prove/isabelle/pure/term-ord.ts +159 -0
- package/src/prove/isabelle/pure/term.ts +808 -0
- package/src/prove/isabelle/pure/thm.ts +806 -0
- package/src/prove/isabelle/pure/type.ts +133 -0
- package/src/prove/isabelle/pure/unify.ts +753 -0
- package/src/prove/isabelle/pure/variable.ts +25 -0
- package/src/prove/isabelle/tla/classical-setup.ts +101 -0
- package/src/prove/isabelle/tla/context.ts +74 -0
- package/src/prove/isabelle/tla/logic-data.ts +5 -0
- package/src/prove/isabelle/tla/logic.ts +215 -0
- package/src/prove/isabelle/tla/simpdata.ts +241 -0
- package/src/prove/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prove/ocaml.ts +22 -0
- package/src/prove/prep/action.ts +521 -0
- package/src/prove/prep/defs.ts +33 -0
- package/src/prove/prep/elab.ts +156 -0
- package/src/prove/prep/enabled-axioms.ts +189 -0
- package/src/prove/prep/enabled.ts +43 -0
- package/src/prove/prep/fingerprint.ts +388 -0
- package/src/prove/prep/flatten.ts +70 -0
- package/src/prove/prep/level-comparison.ts +557 -0
- package/src/prove/prep/md5.ts +67 -0
- package/src/prove/prep/pragma.ts +221 -0
- package/src/prove/prep/trivial.ts +22 -0
- package/src/prove/prove-worker.ts +25 -0
- package/src/prove/prove.ts +505 -0
- package/src/prove/ptl/decide.ts +68 -0
- package/src/prove/ptl/encode.ts +256 -0
- package/src/prove/ptl/sat.ts +151 -0
- package/src/prove/ptl/tableau.ts +276 -0
- package/src/prove/smt/axiomatize.ts +69 -0
- package/src/prove/smt/axioms.ts +222 -0
- package/src/prove/smt/context.ts +108 -0
- package/src/prove/smt/data.ts +636 -0
- package/src/prove/smt/encode.ts +166 -0
- package/src/prove/smt/extensionality.ts +65 -0
- package/src/prove/smt/flatten.ts +112 -0
- package/src/prove/smt/format.ts +154 -0
- package/src/prove/smt/instances.ts +182 -0
- package/src/prove/smt/rewrite.ts +773 -0
- package/src/prove/smt/simplify.ts +57 -0
- package/src/prove/smt/solver/act-cache.ts +265 -0
- package/src/prove/smt/solver/arith-rewriter.ts +962 -0
- package/src/prove/smt/solver/array.ts +22 -0
- package/src/prove/smt/solver/asserted-formulas.ts +469 -0
- package/src/prove/smt/solver/ast-lt.ts +157 -0
- package/src/prove/smt/solver/ast-util.ts +147 -0
- package/src/prove/smt/solver/ast.ts +1315 -0
- package/src/prove/smt/solver/auf-solver.ts +572 -0
- package/src/prove/smt/solver/case-split-queue.ts +178 -0
- package/src/prove/smt/solver/cg-table.ts +175 -0
- package/src/prove/smt/solver/clause.ts +276 -0
- package/src/prove/smt/solver/conflict-resolution.ts +343 -0
- package/src/prove/smt/solver/context.ts +1292 -0
- package/src/prove/smt/solver/ctx-simplify.ts +334 -0
- package/src/prove/smt/solver/der.ts +224 -0
- package/src/prove/smt/solver/dyn-ack.ts +141 -0
- package/src/prove/smt/solver/e-matching.ts +659 -0
- package/src/prove/smt/solver/enode.ts +259 -0
- package/src/prove/smt/solver/expr-ref.ts +21 -0
- package/src/prove/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prove/smt/solver/fingerprints.ts +92 -0
- package/src/prove/smt/solver/flat-literals.ts +51 -0
- package/src/prove/smt/solver/goal.ts +138 -0
- package/src/prove/smt/solver/hash.ts +173 -0
- package/src/prove/smt/solver/hashtable.ts +166 -0
- package/src/prove/smt/solver/internalizer.ts +1381 -0
- package/src/prove/smt/solver/lbool.ts +5 -0
- package/src/prove/smt/solver/literal.ts +24 -0
- package/src/prove/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prove/smt/solver/lp/constraints.ts +78 -0
- package/src/prove/smt/solver/lp/containers.ts +296 -0
- package/src/prove/smt/solver/lp/core-solver.ts +504 -0
- package/src/prove/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prove/smt/solver/lp/dep-intervals.ts +656 -0
- package/src/prove/smt/solver/lp/dependency.ts +51 -0
- package/src/prove/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prove/smt/solver/lp/explanation.ts +46 -0
- package/src/prove/smt/solver/lp/gomory.ts +255 -0
- package/src/prove/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prove/smt/solver/lp/hnf.ts +281 -0
- package/src/prove/smt/solver/lp/int-cube.ts +295 -0
- package/src/prove/smt/solver/lp/int-solver.ts +514 -0
- package/src/prove/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prove/smt/solver/lp/lar-term.ts +62 -0
- package/src/prove/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prove/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prove/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prove/smt/solver/lp/nex.ts +120 -0
- package/src/prove/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prove/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prove/smt/solver/lp/nla-core.ts +968 -0
- package/src/prove/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prove/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prove/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prove/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prove/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prove/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prove/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prove/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prove/smt/solver/lp/nla-order.ts +307 -0
- package/src/prove/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prove/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prove/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prove/smt/solver/lp/nla-types.ts +124 -0
- package/src/prove/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prove/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prove/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prove/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prove/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prove/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prove/smt/solver/lp/pdd.ts +971 -0
- package/src/prove/smt/solver/lp/random-updater.ts +138 -0
- package/src/prove/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prove/smt/solver/lp/union-find.ts +96 -0
- package/src/prove/smt/solver/mam-compiler.ts +847 -0
- package/src/prove/smt/solver/mam-interpreter.ts +400 -0
- package/src/prove/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prove/smt/solver/model-checker.ts +347 -0
- package/src/prove/smt/solver/model-evaluator.ts +262 -0
- package/src/prove/smt/solver/model-finder.ts +155 -0
- package/src/prove/smt/solver/model-generator.ts +97 -0
- package/src/prove/smt/solver/model-macro-solver.ts +728 -0
- package/src/prove/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prove/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prove/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prove/smt/solver/nlsat/explain.ts +607 -0
- package/src/prove/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prove/smt/solver/nlsat/levelwise.ts +740 -0
- package/src/prove/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prove/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prove/smt/solver/nlsat/solver.ts +911 -0
- package/src/prove/smt/solver/nlsat/types.ts +43 -0
- package/src/prove/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prove/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prove/smt/solver/nnf.ts +469 -0
- package/src/prove/smt/solver/pattern-inference.ts +351 -0
- package/src/prove/smt/solver/poly-rewriter.ts +477 -0
- package/src/prove/smt/solver/propagate-values.ts +83 -0
- package/src/prove/smt/solver/proto-model.ts +551 -0
- package/src/prove/smt/solver/pull-quant.ts +139 -0
- package/src/prove/smt/solver/qe-lite-der.ts +526 -0
- package/src/prove/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prove/smt/solver/qe-lite.ts +381 -0
- package/src/prove/smt/solver/qi-queue.ts +362 -0
- package/src/prove/smt/solver/quant-tactics.ts +117 -0
- package/src/prove/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prove/smt/solver/quantifier-manager.ts +186 -0
- package/src/prove/smt/solver/random-gen.ts +10 -0
- package/src/prove/smt/solver/rational.ts +165 -0
- package/src/prove/smt/solver/ref-vector.ts +62 -0
- package/src/prove/smt/solver/relevancy.ts +247 -0
- package/src/prove/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prove/smt/solver/rewriter.ts +843 -0
- package/src/prove/smt/solver/rlimit.ts +79 -0
- package/src/prove/smt/solver/smtlib-parser.ts +526 -0
- package/src/prove/smt/solver/solver.ts +71 -0
- package/src/prove/smt/solver/sort.ts +35 -0
- package/src/prove/smt/solver/sticky-generations.ts +69 -0
- package/src/prove/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prove/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prove/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prove/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prove/smt/solver/theory-lra-model.ts +243 -0
- package/src/prove/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prove/smt/solver/theory-lra-state.ts +43 -0
- package/src/prove/smt/solver/theory-lra.ts +56 -0
- package/src/prove/smt/solver/var-subst.ts +258 -0
- package/src/prove/smt/solver/z3-license.txt +10 -0
- package/src/prove/smt/table.ts +170 -0
- package/src/prove/tlapm/tlapm.ts +96 -0
- package/src/prove/tlaps-module.ts +510 -0
- package/src/prove/verdict.ts +18 -0
- package/src/prove/zenon/LICENSE +32 -0
- package/src/prove/zenon/check/check.ts +105 -0
- package/src/prove/zenon/check/definitions.ts +144 -0
- package/src/prove/zenon/check/equality.ts +182 -0
- package/src/prove/zenon/check/functions.ts +62 -0
- package/src/prove/zenon/check/keys.ts +125 -0
- package/src/prove/zenon/check/propositional.ts +104 -0
- package/src/prove/zenon/check/records.ts +188 -0
- package/src/prove/zenon/check/relations.ts +121 -0
- package/src/prove/zenon/check/rewrites.ts +224 -0
- package/src/prove/zenon/check/sets.ts +302 -0
- package/src/prove/zenon/check/terms.ts +127 -0
- package/src/prove/zenon/check/tla.ts +126 -0
- package/src/prove/zenon/decide.ts +113 -0
- package/src/prove/zenon/encode.ts +437 -0
- package/src/prove/zenon/eqrel.ts +300 -0
- package/src/prove/zenon/equality-rules.ts +435 -0
- package/src/prove/zenon/expr.ts +551 -0
- package/src/prove/zenon/index-table.ts +350 -0
- package/src/prove/zenon/isar-case.ts +513 -0
- package/src/prove/zenon/isar.ts +1249 -0
- package/src/prove/zenon/limits.ts +15 -0
- package/src/prove/zenon/llproof.ts +173 -0
- package/src/prove/zenon/mltoll.ts +1566 -0
- package/src/prove/zenon/node.ts +297 -0
- package/src/prove/zenon/ocaml.ts +169 -0
- package/src/prove/zenon/parse.ts +247 -0
- package/src/prove/zenon/phrase.ts +191 -0
- package/src/prove/zenon/proof.ts +198 -0
- package/src/prove/zenon/propositional-rules.ts +387 -0
- package/src/prove/zenon/rules.ts +94 -0
- package/src/prove/zenon/search.ts +288 -0
- package/src/prove/zenon/tla/functions.ts +151 -0
- package/src/prove/zenon/tla/llproof.ts +480 -0
- package/src/prove/zenon/tla/records.ts +225 -0
- package/src/prove/zenon/tla/rewrites.ts +447 -0
- package/src/prove/zenon/tla/sets.ts +304 -0
- package/src/prove/zenon/tla/terms.ts +181 -0
- package/src/prove/zenon/tla/tla.ts +506 -0
- package/src/run-cli.ts +334 -75
- package/src/standard-modules.ts +5 -2
- package/src/successors.ts +24 -5
- package/src/tlapm-cache.ts +236 -0
- package/src/tlc-random.ts +55 -32
- package/src/tlc-version.ts +8 -7
- package/src/values.ts +97 -47
- package/src/worker.ts +65 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
// tlapm's expression IR (E_t) with de Bruijn indices, and its substitutions (E_subst) and
|
|
2
2
|
// alpha-equivalence (E_eq).
|
|
3
3
|
|
|
4
|
-
import { TlaProofError } from "
|
|
4
|
+
import { TlaProofError } from "../errors";
|
|
5
|
+
import type { OldMethod, PragmaSetting } from "./pragma";
|
|
5
6
|
|
|
6
7
|
export interface Locus {
|
|
7
8
|
file: string;
|
|
@@ -171,7 +172,7 @@ export type ExprCore =
|
|
|
171
172
|
| { kind: "Sequent"; sequent: Sequent }
|
|
172
173
|
| { kind: "Bang"; expression: Expr; selectors: Selector[] }
|
|
173
174
|
| { kind: "Apply"; operator: Expr; args: Expr[] }
|
|
174
|
-
| { kind: "With"; expression: Expr; method:
|
|
175
|
+
| { kind: "With"; expression: Expr; method: OldMethod }
|
|
175
176
|
| { kind: "If"; condition: Expr; consequent: Expr; alternative: Expr }
|
|
176
177
|
| { kind: "List"; bullet: "And" | "Or" | "Refs"; items: Expr[] }
|
|
177
178
|
| { kind: "Let"; definitions: Defn[]; body: Expr }
|
|
@@ -217,12 +218,16 @@ type DefnCore =
|
|
|
217
218
|
| { kind: "Recursive"; name: string; shape: Shape }
|
|
218
219
|
| { kind: "Operator"; name: string; body: Expr }
|
|
219
220
|
| { kind: "Instance"; name: string; instance: InstanceDefinition }
|
|
220
|
-
| { kind: "Bpragma"; name: string; body: Expr };
|
|
221
|
-
|
|
222
|
-
export type WhereDefined = "Builtin" | "Proof" | "User";
|
|
221
|
+
| { kind: "Bpragma"; name: string; body: Expr; methods: PragmaSetting[][] };
|
|
223
222
|
|
|
224
223
|
export type Visibility = "Visible" | "Hidden";
|
|
225
224
|
|
|
225
|
+
// When a fact holds: at every point of a behavior, or only at the current one.
|
|
226
|
+
export type Time = "Now" | "Always";
|
|
227
|
+
|
|
228
|
+
// A step or a DEFINE in a proof keeps the time of the scope it is made in.
|
|
229
|
+
export type WhereDefined = "Builtin" | "User" | { kind: "Proof"; time: Time };
|
|
230
|
+
|
|
226
231
|
export type Hyp = HypCore & { location?: Locus };
|
|
227
232
|
|
|
228
233
|
type HypCore =
|
|
@@ -241,8 +246,11 @@ type HypCore =
|
|
|
241
246
|
whereDefined: WhereDefined;
|
|
242
247
|
visibility: Visibility;
|
|
243
248
|
isLocal: boolean;
|
|
249
|
+
// Module.Elab judges whether each module definition is constant. One that anonymization meets
|
|
250
|
+
// in a proof, such as a step or a DEFINE, has no judgment, so tlapm never counts it constant.
|
|
251
|
+
isConstnessUnset?: boolean;
|
|
244
252
|
}
|
|
245
|
-
| { kind: "Fact"; expression: Expr; visibility: Visibility };
|
|
253
|
+
| { kind: "Fact"; expression: Expr; visibility: Visibility; time: Time; useLocation?: Locus };
|
|
246
254
|
|
|
247
255
|
export interface Sequent {
|
|
248
256
|
context: Hyp[];
|
|
@@ -333,7 +341,6 @@ export const getScopeAt = (scope: Scope | undefined, depth: number) => {
|
|
|
333
341
|
return current;
|
|
334
342
|
};
|
|
335
343
|
|
|
336
|
-
// Maps the items in order, threading a state from each item to the next.
|
|
337
344
|
export const mapAccumulate = <State, Item, Result>(
|
|
338
345
|
state: State,
|
|
339
346
|
items: Item[],
|
|
@@ -348,6 +355,44 @@ export const mapAccumulate = <State, Item, Result>(
|
|
|
348
355
|
return [final, results];
|
|
349
356
|
};
|
|
350
357
|
|
|
358
|
+
// A mapped context prefix: the hypothesis its last key maps to, if any, and the state after it.
|
|
359
|
+
interface MappedPrefix<State> {
|
|
360
|
+
state: State;
|
|
361
|
+
hyp: Hyp | undefined;
|
|
362
|
+
parent: MappedPrefix<State> | undefined;
|
|
363
|
+
next: WeakMap<Hyp, MappedPrefix<State>>;
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
// mapAccumulate over a context that maps each prefix of keys once, as the obligations of a module
|
|
367
|
+
// share most of their context by identity. The input at each position must depend on the keys up
|
|
368
|
+
// to it alone, and the step on the input, its key, and the state.
|
|
369
|
+
export const createContextMap = <State>(
|
|
370
|
+
initial: State,
|
|
371
|
+
step: (state: State, input: Hyp, key: Hyp) => [State, Hyp | undefined],
|
|
372
|
+
) => {
|
|
373
|
+
const empty: MappedPrefix<State> = {
|
|
374
|
+
state: initial,
|
|
375
|
+
hyp: undefined,
|
|
376
|
+
parent: undefined,
|
|
377
|
+
next: new WeakMap(),
|
|
378
|
+
};
|
|
379
|
+
return (keys: Hyp[], inputs = keys) => {
|
|
380
|
+
const last = keys.reduce((prefix, key, index) => {
|
|
381
|
+
const known = prefix.next.get(key);
|
|
382
|
+
if (known) return known;
|
|
383
|
+
const [state, hyp] = step(prefix.state, inputs[index], key);
|
|
384
|
+
const mapped: MappedPrefix<State> = { state, hyp, parent: prefix, next: new WeakMap() };
|
|
385
|
+
prefix.next.set(key, mapped);
|
|
386
|
+
return mapped;
|
|
387
|
+
}, empty);
|
|
388
|
+
const context: Hyp[] = [];
|
|
389
|
+
for (let prefix: MappedPrefix<State> | undefined = last; prefix; prefix = prefix.parent) {
|
|
390
|
+
if (prefix.hyp) context.push(prefix.hyp);
|
|
391
|
+
}
|
|
392
|
+
return { state: last.state, context: context.reverse() };
|
|
393
|
+
};
|
|
394
|
+
};
|
|
395
|
+
|
|
351
396
|
export const getFresh = (name: string, level: Level, shape = 0): Hyp => ({
|
|
352
397
|
kind: "Fresh",
|
|
353
398
|
name,
|
|
@@ -500,6 +545,8 @@ export const substituteExpr = (substitution: Substitution, expression: Expr): Ex
|
|
|
500
545
|
case "Sequent":
|
|
501
546
|
return { ...expression, sequent: substituteSequent(substitution, expression.sequent) };
|
|
502
547
|
case "With":
|
|
548
|
+
case "Dot":
|
|
549
|
+
case "Parens":
|
|
503
550
|
return { ...expression, expression: recurse(expression.expression) };
|
|
504
551
|
case "If":
|
|
505
552
|
return {
|
|
@@ -510,7 +557,8 @@ export const substituteExpr = (substitution: Substitution, expression: Expr): Ex
|
|
|
510
557
|
};
|
|
511
558
|
case "List":
|
|
512
559
|
return { ...expression, items: substituteExprs(substitution, expression.items) };
|
|
513
|
-
case "Quant":
|
|
560
|
+
case "Quant":
|
|
561
|
+
case "Fcn": {
|
|
514
562
|
const [inner, bounds] = substituteBounds(substitution, expression.bounds);
|
|
515
563
|
return { ...expression, bounds, body: substituteExpr(inner, expression.body) };
|
|
516
564
|
}
|
|
@@ -536,6 +584,7 @@ export const substituteExpr = (substitution: Substitution, expression: Expr): Ex
|
|
|
536
584
|
return { ...expression, bounds, element: substituteExpr(inner, expression.element) };
|
|
537
585
|
}
|
|
538
586
|
case "SetEnum":
|
|
587
|
+
case "Tuple":
|
|
539
588
|
return { ...expression, elements: substituteExprs(substitution, expression.elements) };
|
|
540
589
|
case "Arrow":
|
|
541
590
|
return {
|
|
@@ -543,10 +592,6 @@ export const substituteExpr = (substitution: Substitution, expression: Expr): Ex
|
|
|
543
592
|
domain: recurse(expression.domain),
|
|
544
593
|
range: recurse(expression.range),
|
|
545
594
|
};
|
|
546
|
-
case "Fcn": {
|
|
547
|
-
const [inner, bounds] = substituteBounds(substitution, expression.bounds);
|
|
548
|
-
return { ...expression, bounds, body: substituteExpr(inner, expression.body) };
|
|
549
|
-
}
|
|
550
595
|
case "FcnApp":
|
|
551
596
|
return {
|
|
552
597
|
...expression,
|
|
@@ -555,8 +600,6 @@ export const substituteExpr = (substitution: Substitution, expression: Expr): Ex
|
|
|
555
600
|
};
|
|
556
601
|
case "Product":
|
|
557
602
|
return { ...expression, factors: substituteExprs(substitution, expression.factors) };
|
|
558
|
-
case "Tuple":
|
|
559
|
-
return { ...expression, elements: substituteExprs(substitution, expression.elements) };
|
|
560
603
|
case "Rect":
|
|
561
604
|
case "Record":
|
|
562
605
|
return {
|
|
@@ -572,20 +615,13 @@ export const substituteExpr = (substitution: Substitution, expression: Expr): Ex
|
|
|
572
615
|
function: recurse(expression.function),
|
|
573
616
|
specs: mapExceptSpecs(expression.specs, recurse),
|
|
574
617
|
};
|
|
575
|
-
case "Dot":
|
|
576
|
-
return { ...expression, expression: recurse(expression.expression) };
|
|
577
618
|
case "Sub":
|
|
578
619
|
case "Tsub":
|
|
579
|
-
return {
|
|
580
|
-
...expression,
|
|
581
|
-
action: recurse(expression.action),
|
|
582
|
-
subscript: recurse(expression.subscript),
|
|
583
|
-
};
|
|
584
620
|
case "Fair":
|
|
585
621
|
return {
|
|
586
622
|
...expression,
|
|
587
|
-
subscript: recurse(expression.subscript),
|
|
588
623
|
action: recurse(expression.action),
|
|
624
|
+
subscript: recurse(expression.subscript),
|
|
589
625
|
};
|
|
590
626
|
case "Case":
|
|
591
627
|
return {
|
|
@@ -596,8 +632,6 @@ export const substituteExpr = (substitution: Substitution, expression: Expr): Ex
|
|
|
596
632
|
})),
|
|
597
633
|
other: expression.other && recurse(expression.other),
|
|
598
634
|
};
|
|
599
|
-
case "Parens":
|
|
600
|
-
return { ...expression, expression: recurse(expression.expression) };
|
|
601
635
|
}
|
|
602
636
|
};
|
|
603
637
|
|
|
@@ -610,6 +644,9 @@ const isEqualList = <Item>(
|
|
|
610
644
|
isEqual: (left: Item, right: Item) => boolean,
|
|
611
645
|
) => left.length === right.length && left.every((item, index) => isEqual(item, right[index]));
|
|
612
646
|
|
|
647
|
+
const isEqualOptional = (left: Expr | undefined, right: Expr | undefined) =>
|
|
648
|
+
left && right ? isEqualExpr(left, right) : !left && !right;
|
|
649
|
+
|
|
613
650
|
const isEqualFields = (left: Field[], right: Field[]) => {
|
|
614
651
|
const leftMap = new Map(left.map((field) => [field.name, field.value]));
|
|
615
652
|
const rightMap = new Map(right.map((field) => [field.name, field.value]));
|
|
@@ -647,9 +684,7 @@ const isEqualSelector = (left: Selector, right: Selector) => {
|
|
|
647
684
|
};
|
|
648
685
|
|
|
649
686
|
const isEqualDefn = (left: Defn, right: Defn): boolean => {
|
|
650
|
-
if (left.kind === "Operator"
|
|
651
|
-
return isEqualExpr(left.body, right.body);
|
|
652
|
-
if (left.kind === "Bpragma" && right.kind === "Bpragma")
|
|
687
|
+
if ((left.kind === "Operator" || left.kind === "Bpragma") && right.kind === left.kind)
|
|
653
688
|
return isEqualExpr(left.body, right.body);
|
|
654
689
|
if (left.kind === "Instance" && right.kind === "Instance") {
|
|
655
690
|
const leftSubstitutions = left.instance.substitutions.map((entry): Field => ({
|
|
@@ -675,9 +710,11 @@ const isEqualDefn = (left: Defn, right: Defn): boolean => {
|
|
|
675
710
|
|
|
676
711
|
export const isEqualHyp = (left: Hyp, right: Hyp): boolean => {
|
|
677
712
|
if (left.kind === "Fresh" && right.kind === "Fresh") {
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
713
|
+
return (
|
|
714
|
+
left.level === right.level &&
|
|
715
|
+
left.shape === right.shape &&
|
|
716
|
+
isEqualOptional(left.domain, right.domain)
|
|
717
|
+
);
|
|
681
718
|
}
|
|
682
719
|
if (left.kind === "Flex" && right.kind === "Flex") return true;
|
|
683
720
|
if (left.kind === "Defn" && right.kind === "Defn") {
|
|
@@ -759,11 +796,11 @@ export const isEqualExpr = (left: Expr, right: Expr): boolean => {
|
|
|
759
796
|
isEqualExpr(left.body, right.body)
|
|
760
797
|
);
|
|
761
798
|
case "Choose":
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
|
|
799
|
+
return (
|
|
800
|
+
right.kind === "Choose" &&
|
|
801
|
+
isEqualOptional(left.domain, right.domain) &&
|
|
802
|
+
isEqualExpr(left.body, right.body)
|
|
803
|
+
);
|
|
767
804
|
case "SetSt":
|
|
768
805
|
return (
|
|
769
806
|
right.kind === "SetSt" &&
|
|
@@ -777,7 +814,8 @@ export const isEqualExpr = (left: Expr, right: Expr): boolean => {
|
|
|
777
814
|
isEqualList(left.bounds, right.bounds, isEqualBound)
|
|
778
815
|
);
|
|
779
816
|
case "SetEnum":
|
|
780
|
-
|
|
817
|
+
case "Tuple":
|
|
818
|
+
return right.kind === left.kind && isEqualList(left.elements, right.elements, isEqualExpr);
|
|
781
819
|
case "Arrow":
|
|
782
820
|
return (
|
|
783
821
|
right.kind === "Arrow" &&
|
|
@@ -795,14 +833,11 @@ export const isEqualExpr = (left: Expr, right: Expr): boolean => {
|
|
|
795
833
|
right.kind === "FcnApp" &&
|
|
796
834
|
isEqualList([left.function, ...left.args], [right.function, ...right.args], isEqualExpr)
|
|
797
835
|
);
|
|
798
|
-
case "Tuple":
|
|
799
|
-
return right.kind === "Tuple" && isEqualList(left.elements, right.elements, isEqualExpr);
|
|
800
836
|
case "Product":
|
|
801
837
|
return right.kind === "Product" && isEqualList(left.factors, right.factors, isEqualExpr);
|
|
802
838
|
case "Rect":
|
|
803
|
-
return right.kind === "Rect" && isEqualFields(left.fields, right.fields);
|
|
804
839
|
case "Record":
|
|
805
|
-
return right.kind ===
|
|
840
|
+
return right.kind === left.kind && isEqualFields(left.fields, right.fields);
|
|
806
841
|
case "Except":
|
|
807
842
|
return (
|
|
808
843
|
right.kind === "Except" &&
|
|
@@ -847,9 +882,7 @@ export const isEqualExpr = (left: Expr, right: Expr): boolean => {
|
|
|
847
882
|
? left.arms.length === right.arms.length
|
|
848
883
|
: isEqualExpr(left.arms[0].condition, right.arms[0].condition) &&
|
|
849
884
|
isEqualExpr(left.arms[0].body, right.arms[0].body);
|
|
850
|
-
|
|
851
|
-
if (left.other && right.other) return isEqualExpr(left.other, right.other);
|
|
852
|
-
return !left.other && !right.other;
|
|
885
|
+
return isArmsEqual && isEqualOptional(left.other, right.other);
|
|
853
886
|
}
|
|
854
887
|
case "String":
|
|
855
888
|
return right.kind === "String" && left.value === right.value;
|
|
@@ -874,7 +907,7 @@ export const mapSelectorArgs = (selector: Selector, map: (arg: Expr) => Expr): S
|
|
|
874
907
|
? { ...selector, args: selector.args.map(map) }
|
|
875
908
|
: selector;
|
|
876
909
|
|
|
877
|
-
const mapExceptSpecs = (specs: ExceptSpec[], map: (inner: Expr) => Expr): ExceptSpec[] =>
|
|
910
|
+
export const mapExceptSpecs = (specs: ExceptSpec[], map: (inner: Expr) => Expr): ExceptSpec[] =>
|
|
878
911
|
specs.map((spec) => {
|
|
879
912
|
const value = map(spec.value);
|
|
880
913
|
const trail = spec.trail.map((point): ExceptPoint =>
|
|
@@ -888,7 +921,7 @@ const mapDefnBody = (definition: Defn, map: (body: Expr) => Expr): Defn =>
|
|
|
888
921
|
? { ...definition, body: map(definition.body) }
|
|
889
922
|
: definition;
|
|
890
923
|
|
|
891
|
-
const mapHyp = (hyp: Hyp, map: (inner: Expr) => Expr, hyps: "visible" | "all"): Hyp => {
|
|
924
|
+
export const mapHyp = (hyp: Hyp, map: (inner: Expr) => Expr, hyps: "visible" | "all"): Hyp => {
|
|
892
925
|
if (hyp.kind === "Fresh") return hyp.domain ? { ...hyp, domain: map(hyp.domain) } : hyp;
|
|
893
926
|
if (hyp.kind === "Flex" || (hyps === "visible" && hyp.visibility === "Hidden")) return hyp;
|
|
894
927
|
if (hyp.kind === "Defn") return { ...hyp, definition: mapDefnBody(hyp.definition, map) };
|
|
@@ -60,7 +60,7 @@ const getSentinel = (): ScanElement => ({
|
|
|
60
60
|
element: { size: UNKNOWN, token: { kind: "Text", text: "" }, length: 0 },
|
|
61
61
|
});
|
|
62
62
|
|
|
63
|
-
const createFormatter = (): Formatter => {
|
|
63
|
+
const createFormatter = (maxIndent: number): Formatter => {
|
|
64
64
|
const systemBox: QueueElement = {
|
|
65
65
|
size: UNKNOWN,
|
|
66
66
|
token: { kind: "Begin", indent: 0, box: "hov" },
|
|
@@ -72,7 +72,7 @@ const createFormatter = (): Formatter => {
|
|
|
72
72
|
scanStack: [getSentinel(), { leftTotal: 1, element: systemBox }],
|
|
73
73
|
formatStack: [],
|
|
74
74
|
margin: 78,
|
|
75
|
-
maxIndent
|
|
75
|
+
maxIndent,
|
|
76
76
|
spaceLeft: 78,
|
|
77
77
|
currentIndent: 0,
|
|
78
78
|
isNewLine: true,
|
|
@@ -242,7 +242,7 @@ const flush = (formatter: Formatter) => {
|
|
|
242
242
|
const flushNewline = (formatter: Formatter) => {
|
|
243
243
|
flush(formatter);
|
|
244
244
|
const output = [...formatter.output, "\n"];
|
|
245
|
-
Object.assign(formatter, createFormatter());
|
|
245
|
+
Object.assign(formatter, createFormatter(formatter.maxIndent));
|
|
246
246
|
formatter.output = output;
|
|
247
247
|
};
|
|
248
248
|
|
|
@@ -258,8 +258,6 @@ type Command =
|
|
|
258
258
|
|
|
259
259
|
export type Doc = (Command | Doc)[];
|
|
260
260
|
|
|
261
|
-
type FormatArgument = string | Doc;
|
|
262
|
-
|
|
263
261
|
const BOX_KINDS: Record<string, BoxKind> = { h: "h", v: "v", hv: "hv", hov: "hov", b: "b" };
|
|
264
262
|
|
|
265
263
|
const getText = (value: string): Command => ({ kind: "Text", text: value, size: getLength(value) });
|
|
@@ -282,7 +280,7 @@ const parseOpen = (directive: string): Command => {
|
|
|
282
280
|
|
|
283
281
|
// Interprets the subset of OCaml format strings that tlapm's printers use, so ported printers read
|
|
284
282
|
// like the OCaml they come from. Each %s or %a consumes one argument.
|
|
285
|
-
export const format = (pattern: string, ...args:
|
|
283
|
+
export const format = (pattern: string, ...args: (string | Doc)[]): Doc => {
|
|
286
284
|
const doc: Doc = [];
|
|
287
285
|
let argumentIndex = 0;
|
|
288
286
|
let pending = "";
|
|
@@ -399,8 +397,9 @@ const renderInto = (formatter: Formatter, doc: Doc) => {
|
|
|
399
397
|
}
|
|
400
398
|
};
|
|
401
399
|
|
|
402
|
-
|
|
403
|
-
|
|
400
|
+
// 68 is Format's default maximum indent; tlapm's stderr formatter allows 35.
|
|
401
|
+
export const renderDoc = (doc: Doc, maxIndent = 68) => {
|
|
402
|
+
const formatter = createFormatter(maxIndent);
|
|
404
403
|
renderInto(formatter, doc);
|
|
405
404
|
return flush(formatter);
|
|
406
405
|
};
|