tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e5c8dc315
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/dist/compile.cjs +3 -3
- package/dist/compile.js +1 -1
- package/dist/deciders.cjs +36 -36
- package/dist/deciders.js +53 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +18 -4
- package/dist/index.d.ts +18 -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 +56 -56
- package/dist/prove.js +78 -78
- package/dist/run.cjs +40 -44
- package/dist/run.js +42 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +97 -92
- package/dist/transfer.js +97 -92
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +31 -3
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +146 -93
- package/src/check.ts +518 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +18 -4
- package/src/cli/tlc.ts +18 -12
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +23 -10
- package/src/coverage.ts +255 -18
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +155 -66
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +152 -25
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +675 -236
- package/src/lexer.ts +12 -2
- package/src/liveness-checker.ts +179 -60
- package/src/liveness.ts +55 -10
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/obligations/source.ts +2 -0
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +180 -149
- package/src/prover/isabelle/isar/attrib.ts +4 -4
- package/src/prover/isabelle/isar/rule-cases.ts +8 -6
- package/src/prover/isabelle/provers/clasimp.ts +1 -1
- package/src/prover/isabelle/provers/hypsubst.ts +2 -2
- package/src/prover/isabelle/pure/rewriter.ts +3 -3
- package/src/prover/isabelle/pure/term.ts +3 -3
- package/src/prover/prep/md5.ts +26 -29
- package/src/prover/smt/rewrite.ts +2 -7
- package/src/prover/smt/simplify.ts +1 -1
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +3 -2
- package/src/prover/smt/solver/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +171 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +66 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +28 -2
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-simplifier.ts +11 -13
- package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
- package/src/prover/smt/solver/bv-rewriter.ts +1 -1
- package/src/prover/smt/solver/bv1-blast.ts +1 -1
- package/src/prover/smt/solver/card2bv.ts +35 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +84 -15
- package/src/prover/smt/solver/ctx-simplify.ts +9 -4
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +28 -16
- package/src/prover/smt/solver/diff-neq.ts +9 -8
- package/src/prover/smt/solver/dt2bv-tactic.ts +66 -28
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +31 -28
- package/src/prover/smt/solver/eq2bv-tactic.ts +15 -6
- package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
- package/src/prover/smt/solver/euf/egraph.ts +4 -11
- package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
- package/src/prover/smt/solver/euf/mam.ts +1 -5
- package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
- package/src/prover/smt/solver/euf/th-solver.ts +0 -7
- package/src/prover/smt/solver/expr2polynomial.ts +204 -79
- package/src/prover/smt/solver/factor.ts +36 -14
- package/src/prover/smt/solver/fd-solver.ts +608 -139
- package/src/prover/smt/solver/fix-dl-var.ts +2 -3
- package/src/prover/smt/solver/fm-tactic.ts +9 -7
- package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
- package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +1 -1
- package/src/prover/smt/solver/goal.ts +6 -3
- package/src/prover/smt/solver/goal2nlsat.ts +57 -30
- package/src/prover/smt/solver/hashtable.ts +4 -0
- package/src/prover/smt/solver/internalizer.ts +1 -1
- package/src/prover/smt/solver/lia2pb.ts +1 -1
- package/src/prover/smt/solver/logic-tactics.ts +15 -5
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/lar-solver.ts +1 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -2
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
- package/src/prover/smt/solver/lp/pdd.ts +725 -290
- package/src/prover/smt/solver/lp/union-find.ts +1 -1
- package/src/prover/smt/solver/mam-compiler.ts +1 -1
- package/src/prover/smt/solver/maxcore.ts +2 -1
- package/src/prover/smt/solver/maxsmt-base.ts +1 -0
- package/src/prover/smt/solver/model-based-opt.ts +1 -1
- package/src/prover/smt/solver/model-checker.ts +1 -1
- package/src/prover/smt/solver/model-evaluator.ts +2 -0
- package/src/prover/smt/solver/model-generator.ts +85 -43
- package/src/prover/smt/solver/mpf.ts +2 -4
- package/src/prover/smt/solver/mus.ts +2 -3
- package/src/prover/smt/solver/muz/dl-context.ts +22 -44
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
- package/src/prover/smt/solver/muz/hnf.ts +2 -2
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
- package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
- package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
- package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
- package/src/prover/smt/solver/nlqsat.ts +2 -1
- package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
- package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
- package/src/prover/smt/solver/nlsat/explain.ts +375 -217
- package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
- package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
- package/src/prover/smt/solver/nlsat/solver.ts +74 -64
- package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
- package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
- package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
- package/src/prover/smt/solver/nnf.ts +6 -2
- package/src/prover/smt/solver/normalize-bounds.ts +2 -2
- package/src/prover/smt/solver/occf.ts +1 -1
- package/src/prover/smt/solver/opt-context.ts +21 -7
- package/src/prover/smt/solver/opt-nlsat.ts +29 -18
- package/src/prover/smt/solver/opt-pareto.ts +19 -0
- package/src/prover/smt/solver/opt-preprocess.ts +1 -1
- package/src/prover/smt/solver/opt-solver.ts +10 -6
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/parallel-tactic.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- package/src/prover/smt/solver/pb2bv-tactic.ts +9 -3
- package/src/prover/smt/solver/poly-rewriter.ts +75 -18
- package/src/prover/smt/solver/probes.ts +88 -23
- package/src/prover/smt/solver/proto-model.ts +8 -8
- package/src/prover/smt/solver/purify-arith.ts +51 -49
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
- package/src/prover/smt/solver/qe-lite.ts +2 -2
- package/src/prover/smt/solver/qe.ts +3 -2
- package/src/prover/smt/solver/qsat.ts +23 -8
- package/src/prover/smt/solver/quantifier-manager.ts +14 -9
- package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
- package/src/prover/smt/solver/reduce-args.ts +2 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
- package/src/prover/smt/solver/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +7 -3
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +75 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +149 -47
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-constraint.ts +7 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +26 -7
- package/src/prover/smt/solver/sat/sat-tactic.ts +54 -25
- package/src/prover/smt/solver/sat/sat2goal.ts +75 -50
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +27 -47
- package/src/prover/smt/solver/seq-axioms.ts +20 -35
- package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
- package/src/prover/smt/solver/seq-derive.ts +2 -2
- package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
- package/src/prover/smt/solver/seq-monadic.ts +7 -5
- package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
- package/src/prover/smt/solver/seq-re-util.ts +1 -1
- package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
- package/src/prover/smt/solver/seq-regex-live.ts +2 -2
- package/src/prover/smt/solver/seq-rewriter.ts +31 -29
- package/src/prover/smt/solver/seq-skolem.ts +0 -23
- package/src/prover/smt/solver/seq-view-witness.ts +4 -4
- package/src/prover/smt/solver/smt-consequences.ts +1 -1
- package/src/prover/smt/solver/smt-kernel.ts +48 -7
- package/src/prover/smt/solver/smt-setup.ts +106 -13
- package/src/prover/smt/solver/smtlib-parser.ts +589 -224
- package/src/prover/smt/solver/smtlib-script.ts +718 -213
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -4
- package/src/prover/smt/solver/tactic.ts +389 -199
- package/src/prover/smt/solver/theory-bv.ts +13 -3
- package/src/prover/smt/solver/theory-fpa.ts +1 -1
- package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +12 -3
- package/src/prover/smt/solver/theory-lra-state.ts +1 -1
- package/src/prover/smt/solver/theory-lra.ts +1 -1
- package/src/prover/smt/solver/theory-pb.ts +24 -7
- package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
- package/src/prover/smt/solver/theory-seq-state.ts +2 -21
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +15 -5
- package/src/prover/tlapm/cache.ts +8 -8
- package/src/prover/zenon/index-table.ts +5 -2
- package/src/prover/zenon/isar-case.ts +1 -1
- package/src/prover/zenon/isar.ts +2 -2
- package/src/prover/zenon/phrase.ts +1 -1
- package/src/resolve.ts +1311 -268
- package/src/runtime.ts +21 -2
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +5 -15
- package/src/sany/generator-def-entries.ts +123 -36
- package/src/sany/generator-definitions.ts +5 -3
- package/src/sany/generator-expressions.ts +60 -37
- package/src/sany/generator-proofs.ts +19 -12
- package/src/sany/generator.ts +12 -6
- package/src/sany/lexer.ts +15 -7
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +12 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +321 -135
- package/src/simulate.ts +247 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +666 -147
- package/src/successors.ts +50 -20
- package/src/symmetry.ts +2 -1
- 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/random.ts +2 -1
- package/src/tlc/replay.ts +147 -46
- package/src/tlc/tlc-operators.ts +10 -8
- package/src/tlc/tlcext-operators.ts +44 -15
- package/src/tlc/trace-spec.ts +9 -22
- package/src/trace-liveness.ts +529 -0
- package/src/typed-tier.ts +52 -31
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +150 -79
package/src/parser.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type {
|
|
2
2
|
AssumeProve,
|
|
3
3
|
Assumption,
|
|
4
|
-
Bound,
|
|
5
4
|
BoundPattern,
|
|
6
5
|
CaseArm,
|
|
7
6
|
Declaration,
|
|
@@ -22,9 +21,11 @@ import type {
|
|
|
22
21
|
StepBody,
|
|
23
22
|
UseOrHide,
|
|
24
23
|
} from "./ast";
|
|
25
|
-
import {
|
|
24
|
+
import { TlaSyntaxError } from "./errors";
|
|
26
25
|
import { getNumeralValue, readAtAsIdentifier, tokenize, type Token } from "./lexer";
|
|
26
|
+
import { getDefEntryErrors, type DefEntryError } from "./sany/generator-def-entries";
|
|
27
27
|
import { getSanyParseError } from "./sany/parse-error";
|
|
28
|
+
import { createSourceFile } from "./sany/source";
|
|
28
29
|
|
|
29
30
|
interface Precedence {
|
|
30
31
|
low: number;
|
|
@@ -252,6 +253,7 @@ const OPERATOR_ARGUMENTS = new Set([
|
|
|
252
253
|
|
|
253
254
|
const SELECTOR_SYMBOLS = new Set(["<<", ">>", ":", "@", "("]);
|
|
254
255
|
|
|
256
|
+
// Deviation from SANY: TLAplusParser#OpOrExpr's lookahead omits PROPOSITION, LEMMA and COROLLARY, so SANY parses an operator argument before them as an expression.
|
|
255
257
|
const UNIT_KEYWORDS = new Set([
|
|
256
258
|
"ASSUME",
|
|
257
259
|
"ASSUMPTION",
|
|
@@ -478,6 +480,26 @@ const getOperatorApplication = (
|
|
|
478
480
|
}
|
|
479
481
|
};
|
|
480
482
|
|
|
483
|
+
export const parenthesizedRanges = new WeakMap<Expression, SourceRange>();
|
|
484
|
+
|
|
485
|
+
export const defEntryErrors = new WeakMap<Expression, DefEntryError[]>();
|
|
486
|
+
|
|
487
|
+
export const getDefEntryBinder = (expression: Expression): Expression | undefined => {
|
|
488
|
+
if (parenthesizedRanges.has(expression)) return undefined;
|
|
489
|
+
const binder =
|
|
490
|
+
expression.kind === "UnboundedQuantifier"
|
|
491
|
+
? { name: expression.names[0], range: expression.nameRanges?.[0] }
|
|
492
|
+
: expression.kind === "Choose" && expression.pattern.kind === "Name"
|
|
493
|
+
? { name: expression.pattern.name, range: expression.pattern.ranges?.[0] }
|
|
494
|
+
: expression.kind === "SetFilter" && expression.bound.pattern.kind === "Name"
|
|
495
|
+
? { name: expression.bound.pattern.name, range: expression.bound.pattern.ranges?.[0] }
|
|
496
|
+
: undefined;
|
|
497
|
+
const range = binder?.range;
|
|
498
|
+
return binder && range
|
|
499
|
+
? { kind: "Identifier", name: binder.name, location: { ...range.start, range } }
|
|
500
|
+
: undefined;
|
|
501
|
+
};
|
|
502
|
+
|
|
481
503
|
export const extractModule = (source: string, name: string) => {
|
|
482
504
|
const header = new RegExp(`^-{4,}\\s*MODULE\\s+${name}\\s*-{3,}$`);
|
|
483
505
|
const lines = source.replace(/\r?\n$/, "").split(/\r?\n/);
|
|
@@ -501,8 +523,6 @@ const parse = (
|
|
|
501
523
|
let lastOperator: Precedence | undefined;
|
|
502
524
|
let precedingOperator: Precedence | undefined;
|
|
503
525
|
const recursiveScopes: Set<string>[] = [];
|
|
504
|
-
const factNames = new Set<string>();
|
|
505
|
-
const proofScopes: Set<string>[] = [];
|
|
506
526
|
const openModules: Module[] = [];
|
|
507
527
|
// Pco's backtracking: a failure not past a commit rewinds to its attempt's frame.
|
|
508
528
|
let attemptFrame: number | undefined;
|
|
@@ -653,6 +673,7 @@ const parse = (
|
|
|
653
673
|
return result;
|
|
654
674
|
};
|
|
655
675
|
|
|
676
|
+
// Deviation from SANY: TLAplusParser#belchDEF reads a field named THEOREM, AXIOM, DOMAIN or a like keyword as that keyword, so SANY rejects the definition after it.
|
|
656
677
|
const isFieldName = (token: Token) =>
|
|
657
678
|
(token.kind === "Identifier" ||
|
|
658
679
|
token.kind === "Keyword" ||
|
|
@@ -1031,22 +1052,45 @@ const parse = (
|
|
|
1031
1052
|
}
|
|
1032
1053
|
if (accept("EXCEPT")) {
|
|
1033
1054
|
const updates = parseSeparated(() => {
|
|
1055
|
+
const heirStarts = [cursor];
|
|
1034
1056
|
expect("!");
|
|
1035
|
-
const
|
|
1057
|
+
const components: (string | Expression[])[] = [];
|
|
1036
1058
|
while (isAt(".") || isAt("[")) {
|
|
1059
|
+
heirStarts.push(cursor);
|
|
1037
1060
|
if (accept(".")) {
|
|
1038
1061
|
if (!isFieldName(peek()))
|
|
1039
1062
|
throw createUnexpected(`Expected a field name but found ${describeToken(peek())}`);
|
|
1040
1063
|
if (!isTlapm && isAt("@")) throw createUnexpected("@ used in !.@");
|
|
1041
|
-
|
|
1064
|
+
components.push(advance().text);
|
|
1042
1065
|
continue;
|
|
1043
1066
|
}
|
|
1044
1067
|
expect("[");
|
|
1045
|
-
|
|
1068
|
+
components.push(parseSeparated(() => parseExpression()));
|
|
1046
1069
|
expect("]");
|
|
1047
1070
|
}
|
|
1071
|
+
heirStarts.push(cursor, cursor + 1);
|
|
1048
1072
|
expect("=");
|
|
1049
|
-
|
|
1073
|
+
const value = parseExpression();
|
|
1074
|
+
heirStarts.push(cursor);
|
|
1075
|
+
const getHeirRange = (index: number) =>
|
|
1076
|
+
getRange(heirStarts[index], heirStarts[index + 1] - 1);
|
|
1077
|
+
return {
|
|
1078
|
+
path: components.map((component, index): ExceptPathStep =>
|
|
1079
|
+
typeof component === "string"
|
|
1080
|
+
? { kind: "Field", name: component }
|
|
1081
|
+
: {
|
|
1082
|
+
kind: "Index",
|
|
1083
|
+
args: component,
|
|
1084
|
+
// SANY's Generator locates the $Tuple of component i at heir 2i + 1 of its ExceptSpec, not i + 1.
|
|
1085
|
+
// Deviation from SANY: past the last heir, that throws ArrayIndexOutOfBoundsException; tla-ts locates it at the component.
|
|
1086
|
+
tupleRange: getHeirRange(
|
|
1087
|
+
2 * index + 1 < heirStarts.length - 1 ? 2 * index + 1 : index + 1,
|
|
1088
|
+
),
|
|
1089
|
+
},
|
|
1090
|
+
),
|
|
1091
|
+
value,
|
|
1092
|
+
range: getRange(heirStarts[0]),
|
|
1093
|
+
};
|
|
1050
1094
|
});
|
|
1051
1095
|
expect("]");
|
|
1052
1096
|
return { kind: "Except", function: expression, updates, location };
|
|
@@ -1201,6 +1245,55 @@ const parse = (
|
|
|
1201
1245
|
return { kind: "Name", name: token.text, args: isAt("(") ? parseArguments() : [] };
|
|
1202
1246
|
};
|
|
1203
1247
|
|
|
1248
|
+
const parseSelections = (
|
|
1249
|
+
name: string,
|
|
1250
|
+
args: Expression[],
|
|
1251
|
+
argumentsRange: SourceRange | undefined,
|
|
1252
|
+
start: number,
|
|
1253
|
+
location: SourceLocation,
|
|
1254
|
+
): Expression => {
|
|
1255
|
+
const selectors: Selector[] = [{ kind: "Name", name, args }];
|
|
1256
|
+
const selectorRanges = [getRange(start, start)];
|
|
1257
|
+
const argumentRanges = [argumentsRange];
|
|
1258
|
+
while (isSelectorAhead()) {
|
|
1259
|
+
advance();
|
|
1260
|
+
const selectorStart = cursor;
|
|
1261
|
+
lastArgumentsRange = undefined;
|
|
1262
|
+
const selector = parseSelector();
|
|
1263
|
+
selectorRanges.push(
|
|
1264
|
+
selector.kind === "Bound"
|
|
1265
|
+
? getRange(selectorStart)
|
|
1266
|
+
: getRange(selectorStart, selectorStart),
|
|
1267
|
+
);
|
|
1268
|
+
selectors.push(selector);
|
|
1269
|
+
argumentRanges.push(lastArgumentsRange);
|
|
1270
|
+
}
|
|
1271
|
+
const names = selectors.flatMap((selector) =>
|
|
1272
|
+
selector.kind === "Name" ? [selector.name] : [],
|
|
1273
|
+
);
|
|
1274
|
+
const operator = names.join("!");
|
|
1275
|
+
const qualifiedArgs = selectors.flatMap((selector) =>
|
|
1276
|
+
"args" in selector ? selector.args : [],
|
|
1277
|
+
);
|
|
1278
|
+
const argumentCounts = selectors.map((selector) =>
|
|
1279
|
+
"args" in selector ? selector.args.length : 0,
|
|
1280
|
+
);
|
|
1281
|
+
return names.length < selectors.length
|
|
1282
|
+
? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
|
|
1283
|
+
: qualifiedArgs.length === 0
|
|
1284
|
+
? { kind: "Identifier", name: operator, selectorRanges, location }
|
|
1285
|
+
: {
|
|
1286
|
+
kind: "Apply",
|
|
1287
|
+
operator,
|
|
1288
|
+
args: qualifiedArgs,
|
|
1289
|
+
...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
|
|
1290
|
+
argumentsRange: argumentRanges.at(-1) ?? getRange(start),
|
|
1291
|
+
selectorRanges,
|
|
1292
|
+
argumentRanges,
|
|
1293
|
+
location,
|
|
1294
|
+
};
|
|
1295
|
+
};
|
|
1296
|
+
|
|
1204
1297
|
const parsePrimary = (preceding?: Precedence): Expression => {
|
|
1205
1298
|
const start = cursor;
|
|
1206
1299
|
const token = advance();
|
|
@@ -1252,61 +1345,51 @@ const parse = (
|
|
|
1252
1345
|
if (name === "@" && !hasArguments && !isSelectorAhead())
|
|
1253
1346
|
return { kind: "ExceptAt", location };
|
|
1254
1347
|
const args = hasArguments ? parseArguments() : [];
|
|
1255
|
-
const argumentRanges = [hasArguments ? lastArgumentsRange : undefined];
|
|
1256
1348
|
if (!isSelectorAhead()) {
|
|
1257
1349
|
return hasArguments
|
|
1258
1350
|
? { kind: "Apply", operator: name, args, argumentsRange: lastArgumentsRange, location }
|
|
1259
1351
|
: { kind: "Identifier", name, location };
|
|
1260
1352
|
}
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
selectors.push(parseSelector());
|
|
1268
|
-
argumentRanges.push(lastArgumentsRange);
|
|
1269
|
-
}
|
|
1270
|
-
const names = selectors.flatMap((selector) =>
|
|
1271
|
-
selector.kind === "Name" ? [selector.name] : [],
|
|
1272
|
-
);
|
|
1273
|
-
const operator = names.join("!");
|
|
1274
|
-
const qualifiedArgs = selectors.flatMap((selector) =>
|
|
1275
|
-
"args" in selector ? selector.args : [],
|
|
1276
|
-
);
|
|
1277
|
-
const argumentCounts = selectors.map((selector) =>
|
|
1278
|
-
"args" in selector ? selector.args.length : 0,
|
|
1353
|
+
return parseSelections(
|
|
1354
|
+
name,
|
|
1355
|
+
args,
|
|
1356
|
+
hasArguments ? lastArgumentsRange : undefined,
|
|
1357
|
+
start,
|
|
1358
|
+
location,
|
|
1279
1359
|
);
|
|
1280
|
-
const argumentsRange = argumentRanges.at(-1) ?? getRange(start);
|
|
1281
|
-
return names.length < selectors.length
|
|
1282
|
-
? { kind: "Subexpression", selectors, selectorRanges, argumentRanges, location }
|
|
1283
|
-
: qualifiedArgs.length === 0
|
|
1284
|
-
? { kind: "Identifier", name: operator, selectorRanges, location }
|
|
1285
|
-
: {
|
|
1286
|
-
kind: "Apply",
|
|
1287
|
-
operator,
|
|
1288
|
-
args: qualifiedArgs,
|
|
1289
|
-
...(argumentCounts.slice(0, -1).some((count) => count > 0) && { argumentCounts }),
|
|
1290
|
-
argumentsRange,
|
|
1291
|
-
selectorRanges,
|
|
1292
|
-
argumentRanges,
|
|
1293
|
-
location,
|
|
1294
|
-
};
|
|
1295
1360
|
}
|
|
1296
|
-
|
|
1361
|
+
const isOperatorNamed =
|
|
1362
|
+
token.kind === "Operator" && (isOperatorName(token.text) || (token.text === "'" && !isTlapm));
|
|
1363
|
+
if (isOperatorNamed && isAt("(")) {
|
|
1297
1364
|
const args = parseArguments();
|
|
1365
|
+
if (!isTlapm && isSelectorAhead()) {
|
|
1366
|
+
return parseSelections(token.text, args, lastArgumentsRange, start, location);
|
|
1367
|
+
}
|
|
1298
1368
|
// Deviation from TLC: SANY's built-in \X has no definition for TLC to evaluate, a TLC bug.
|
|
1299
|
-
|
|
1300
|
-
|
|
1301
|
-
|
|
1369
|
+
if (mode === "tlc" && token.text === "\\X" && args.length === 2) {
|
|
1370
|
+
return { kind: "Product", factors: args, location };
|
|
1371
|
+
}
|
|
1372
|
+
return token.text === "'" && args.length === 1
|
|
1373
|
+
? { kind: "Prime", expression: args[0], location }
|
|
1374
|
+
: {
|
|
1375
|
+
kind: "Apply",
|
|
1376
|
+
operator: token.text,
|
|
1377
|
+
spelling: token.spelling,
|
|
1378
|
+
args,
|
|
1379
|
+
argumentsRange: lastArgumentsRange,
|
|
1380
|
+
location,
|
|
1381
|
+
};
|
|
1302
1382
|
}
|
|
1303
|
-
if (
|
|
1304
|
-
return
|
|
1383
|
+
if (isOperatorNamed && !isTlapm) {
|
|
1384
|
+
return isSelectorAhead()
|
|
1385
|
+
? parseSelections(token.text, [], undefined, start, location)
|
|
1386
|
+
: { kind: "Identifier", name: token.text, spelling: token.spelling, location };
|
|
1305
1387
|
}
|
|
1306
1388
|
switch (token.text) {
|
|
1307
1389
|
case "(": {
|
|
1308
1390
|
const expression = withBracketLayout(() => parseExpression());
|
|
1309
1391
|
expect(")");
|
|
1392
|
+
parenthesizedRanges.set(expression, getRange(start));
|
|
1310
1393
|
return expression;
|
|
1311
1394
|
}
|
|
1312
1395
|
case "[":
|
|
@@ -1334,11 +1417,13 @@ const parse = (
|
|
|
1334
1417
|
case "LET": {
|
|
1335
1418
|
const definitions: Definition[] = [];
|
|
1336
1419
|
const instances: Instance[] = [];
|
|
1420
|
+
const recursive: Declaration[] = [];
|
|
1337
1421
|
recursiveScopes.push(new Set());
|
|
1338
1422
|
while (!accept("IN")) {
|
|
1339
1423
|
if (isTlapm && isAt("RECURSIVE")) throw createUnexpected("Unexpected keyword RECURSIVE");
|
|
1340
1424
|
if (accept("RECURSIVE")) {
|
|
1341
|
-
declareRecursive();
|
|
1425
|
+
recursive.push(...declareRecursive());
|
|
1426
|
+
openModules[openModules.length - 1].hasRecursiveLet = true;
|
|
1342
1427
|
continue;
|
|
1343
1428
|
}
|
|
1344
1429
|
const unit = parseDefinition(!isTlapm && accept("LOCAL"));
|
|
@@ -1346,10 +1431,14 @@ const parse = (
|
|
|
1346
1431
|
else definitions.push(unit);
|
|
1347
1432
|
}
|
|
1348
1433
|
recursiveScopes.pop();
|
|
1349
|
-
|
|
1350
|
-
|
|
1351
|
-
|
|
1352
|
-
|
|
1434
|
+
return {
|
|
1435
|
+
kind: "Let",
|
|
1436
|
+
definitions,
|
|
1437
|
+
...(instances.length > 0 && { instances }),
|
|
1438
|
+
...(recursive.length > 0 && { recursive }),
|
|
1439
|
+
body: parseExpression(),
|
|
1440
|
+
location,
|
|
1441
|
+
};
|
|
1353
1442
|
}
|
|
1354
1443
|
case "CHOOSE": {
|
|
1355
1444
|
const pattern = parsePattern();
|
|
@@ -1915,7 +2004,11 @@ const parse = (
|
|
|
1915
2004
|
|
|
1916
2005
|
const parseDeclarationUnit = (): Declaration => {
|
|
1917
2006
|
const location = getLocation(peek());
|
|
1918
|
-
|
|
2007
|
+
const isOperatorDeclaration =
|
|
2008
|
+
isAt("_") &&
|
|
2009
|
+
peek(1).kind === "Operator" &&
|
|
2010
|
+
(INFIX_OPERATORS.has(peek(1).text) || DEFINABLE_POSTFIX_OPERATORS.has(peek(1).text));
|
|
2011
|
+
if (isOperatorDeclaration) {
|
|
1919
2012
|
advance();
|
|
1920
2013
|
const name = advance().text;
|
|
1921
2014
|
return { name, arity: accept("_") ? 2 : 1, location };
|
|
@@ -2028,23 +2121,6 @@ const parse = (
|
|
|
2028
2121
|
return isFirst ? level > outer : proofLevels[top] === level;
|
|
2029
2122
|
};
|
|
2030
2123
|
|
|
2031
|
-
const isDeclared = (name: string) =>
|
|
2032
|
-
!factNames.has(name) &&
|
|
2033
|
-
openModules.some(
|
|
2034
|
-
(module) =>
|
|
2035
|
-
module.constants.some((constant) => constant.name === name) ||
|
|
2036
|
-
module.variables.some((variable) => variable.name === name) ||
|
|
2037
|
-
module.definitions.some((definition) => definition.name === name),
|
|
2038
|
-
);
|
|
2039
|
-
|
|
2040
|
-
const isHideFact = (fact: Fact) => {
|
|
2041
|
-
if (fact.kind === "ModuleFact" || fact.kind === "Subexpression") return true;
|
|
2042
|
-
if (fact.kind === "Apply") return fact.operator.includes("!");
|
|
2043
|
-
if (fact.kind !== "Identifier") return false;
|
|
2044
|
-
if (fact.name.startsWith("<") || fact.name.includes("!")) return true;
|
|
2045
|
-
return !BUILTIN_CONSTANTS.has(fact.name) && !isDeclared(fact.name);
|
|
2046
|
-
};
|
|
2047
|
-
|
|
2048
2124
|
const isFactAhead = () => {
|
|
2049
2125
|
const token = peek();
|
|
2050
2126
|
if (token.kind === "Step") return isStepReference(token);
|
|
@@ -2081,23 +2157,6 @@ const parse = (
|
|
|
2081
2157
|
);
|
|
2082
2158
|
};
|
|
2083
2159
|
|
|
2084
|
-
const declareProofSymbol = (name: string) => proofScopes[proofScopes.length - 1]?.add(name);
|
|
2085
|
-
|
|
2086
|
-
const withProofScope = <Result>(parse: () => Result) => {
|
|
2087
|
-
proofScopes.push(new Set());
|
|
2088
|
-
const result = parse();
|
|
2089
|
-
proofScopes.pop();
|
|
2090
|
-
return result;
|
|
2091
|
-
};
|
|
2092
|
-
|
|
2093
|
-
const isDeclaredSymbol = (name: string) =>
|
|
2094
|
-
proofScopes.some((scope) => scope.has(name)) ||
|
|
2095
|
-
openModules.some(
|
|
2096
|
-
(module) =>
|
|
2097
|
-
module.constants.some((constant) => constant.name === name) ||
|
|
2098
|
-
module.variables.some((variable) => variable.name === name),
|
|
2099
|
-
);
|
|
2100
|
-
|
|
2101
2160
|
const parseDefinable = (): Fact => {
|
|
2102
2161
|
const start = cursor;
|
|
2103
2162
|
const token = peek();
|
|
@@ -2119,18 +2178,23 @@ const parse = (
|
|
|
2119
2178
|
);
|
|
2120
2179
|
};
|
|
2121
2180
|
|
|
2122
|
-
const parseDefs = () =>
|
|
2123
|
-
|
|
2124
|
-
|
|
2125
|
-
|
|
2126
|
-
|
|
2127
|
-
|
|
2128
|
-
|
|
2129
|
-
|
|
2130
|
-
|
|
2131
|
-
|
|
2132
|
-
|
|
2133
|
-
|
|
2181
|
+
const parseDefs = () =>
|
|
2182
|
+
parseSeparated(() => {
|
|
2183
|
+
if (isTlapm) return parseDefinable();
|
|
2184
|
+
const fact = parseFact();
|
|
2185
|
+
const isName =
|
|
2186
|
+
(fact.kind === "Identifier" ||
|
|
2187
|
+
fact.kind === "Subexpression" ||
|
|
2188
|
+
fact.kind === "OperatorReference") &&
|
|
2189
|
+
!parenthesizedRanges.has(fact);
|
|
2190
|
+
if (fact.kind !== "ModuleFact" && !isName) {
|
|
2191
|
+
defEntryErrors.set(
|
|
2192
|
+
fact,
|
|
2193
|
+
getDefEntryErrors(createSourceFile(openModules[0].name, source), fact),
|
|
2194
|
+
);
|
|
2195
|
+
}
|
|
2196
|
+
return fact;
|
|
2197
|
+
});
|
|
2134
2198
|
|
|
2135
2199
|
// tlapm's usebody reads facts while an expression starts after the comma.
|
|
2136
2200
|
const parseTlapmFacts = (): Fact[] => {
|
|
@@ -2162,25 +2226,16 @@ const parse = (
|
|
|
2162
2226
|
const keyword = advance();
|
|
2163
2227
|
const isOnly = keyword.text === "USE" && accept("ONLY");
|
|
2164
2228
|
const keywordRange = getRange(start);
|
|
2165
|
-
|
|
2166
|
-
|
|
2167
|
-
|
|
2168
|
-
|
|
2169
|
-
|
|
2170
|
-
|
|
2171
|
-
|
|
2172
|
-
|
|
2173
|
-
|
|
2174
|
-
|
|
2175
|
-
throw createSanyError(
|
|
2176
|
-
invalid.map((fact) => ({
|
|
2177
|
-
location: formatRange(fact.location.range ?? getRange(start)),
|
|
2178
|
-
message:
|
|
2179
|
-
"The only expression allowed as a fact in a HIDE is \nthe name of a theorem, assumption, or step.",
|
|
2180
|
-
})),
|
|
2181
|
-
);
|
|
2182
|
-
}
|
|
2183
|
-
return withRange(use, start);
|
|
2229
|
+
return withRange(
|
|
2230
|
+
{
|
|
2231
|
+
kind: keyword.text === "USE" ? "Use" : "Hide",
|
|
2232
|
+
isOnly,
|
|
2233
|
+
...parseFacts(),
|
|
2234
|
+
keyword: keywordRange,
|
|
2235
|
+
location: getLocation(keyword),
|
|
2236
|
+
},
|
|
2237
|
+
start,
|
|
2238
|
+
);
|
|
2184
2239
|
};
|
|
2185
2240
|
|
|
2186
2241
|
const parseNewSymbol = (): NewSymbol => {
|
|
@@ -2196,7 +2251,6 @@ const parse = (
|
|
|
2196
2251
|
if (level !== undefined) advance();
|
|
2197
2252
|
if (level === "Variable") {
|
|
2198
2253
|
const named = expectName();
|
|
2199
|
-
declareProofSymbol(named.name);
|
|
2200
2254
|
return withRange(
|
|
2201
2255
|
{
|
|
2202
2256
|
kind: "NewSymbol",
|
|
@@ -2211,7 +2265,6 @@ const parse = (
|
|
|
2211
2265
|
);
|
|
2212
2266
|
}
|
|
2213
2267
|
const declaration = parseDeclaration();
|
|
2214
|
-
declareProofSymbol(declaration.name);
|
|
2215
2268
|
const isBounded = (level ?? "Constant") === "Constant" && isAt("\\in");
|
|
2216
2269
|
if (isBounded && declaration.arity > 0) {
|
|
2217
2270
|
throw createError("declared symbol with arguments before \\in");
|
|
@@ -2236,7 +2289,7 @@ const parse = (
|
|
|
2236
2289
|
advance();
|
|
2237
2290
|
advance();
|
|
2238
2291
|
}
|
|
2239
|
-
if (isAt("ASSUME")) return
|
|
2292
|
+
if (isAt("ASSUME")) return parseAssumeProve();
|
|
2240
2293
|
if (peek().kind === "Keyword" && NEW_SYMBOL_STARTS.has(peek().text))
|
|
2241
2294
|
return isTlapm ? commit(parseNewSymbol) : parseNewSymbol();
|
|
2242
2295
|
if (!isTlapm) return parseExpression();
|
|
@@ -2285,15 +2338,6 @@ const parse = (
|
|
|
2285
2338
|
return peek(offset).kind === "Identifier" && isAt(terminator, offset + 1);
|
|
2286
2339
|
};
|
|
2287
2340
|
|
|
2288
|
-
const declareProofSymbols = (names: string[], bounds: Bound[]) => {
|
|
2289
|
-
names.forEach(declareProofSymbol);
|
|
2290
|
-
bounds.forEach((bound) =>
|
|
2291
|
-
(bound.pattern.kind === "Name" ? [bound.pattern.name] : bound.pattern.names).forEach(
|
|
2292
|
-
declareProofSymbol,
|
|
2293
|
-
),
|
|
2294
|
-
);
|
|
2295
|
-
};
|
|
2296
|
-
|
|
2297
2341
|
const parseStepBody = (): StepBody => {
|
|
2298
2342
|
const token = peek();
|
|
2299
2343
|
if (isAt("USE") || isAt("HIDE")) return parseUseOrHide();
|
|
@@ -2314,7 +2358,6 @@ const parse = (
|
|
|
2314
2358
|
const isBounded = isBoundAhead();
|
|
2315
2359
|
const names = getNames(isBounded ? [] : parseSeparated(expectName));
|
|
2316
2360
|
const bounds = isBounded ? parseBounds() : [];
|
|
2317
|
-
declareProofSymbols(names.names, bounds);
|
|
2318
2361
|
return { kind: "Take", names: names.names, nameRanges: names.ranges, bounds };
|
|
2319
2362
|
}
|
|
2320
2363
|
if (accept("WITNESS")) {
|
|
@@ -2324,7 +2367,6 @@ const parse = (
|
|
|
2324
2367
|
const isNames = isNameListAhead(":");
|
|
2325
2368
|
const names = getNames(isNames ? parseSeparated(expectName) : []);
|
|
2326
2369
|
const bounds = isNames ? [] : parseBounds();
|
|
2327
|
-
declareProofSymbols(names.names, bounds);
|
|
2328
2370
|
expect(":");
|
|
2329
2371
|
return {
|
|
2330
2372
|
kind: "Pick",
|
|
@@ -2361,8 +2403,6 @@ const parse = (
|
|
|
2361
2403
|
const start = cursor;
|
|
2362
2404
|
const step = parseStepStart(isAt("QED", 1));
|
|
2363
2405
|
const statementStart = cursor;
|
|
2364
|
-
const scope = new Set<string>();
|
|
2365
|
-
proofScopes.push(scope);
|
|
2366
2406
|
const body: StepBody = accept("QED") ? { kind: "Qed" } : parseStepBody();
|
|
2367
2407
|
const head = getRange(start);
|
|
2368
2408
|
const statement = getRange(statementStart);
|
|
@@ -2371,8 +2411,6 @@ const parse = (
|
|
|
2371
2411
|
throw createError("Proof of a step that does not take a proof");
|
|
2372
2412
|
}
|
|
2373
2413
|
const proof = hasProof ? parseProof() : undefined;
|
|
2374
|
-
proofScopes.pop();
|
|
2375
|
-
if (body.kind !== "Assert" || body.isSuffices) scope.forEach(declareProofSymbol);
|
|
2376
2414
|
return withRange({ ...step, body, head, statement, proof }, start);
|
|
2377
2415
|
};
|
|
2378
2416
|
|
|
@@ -2404,7 +2442,7 @@ const parse = (
|
|
|
2404
2442
|
const parseProof = (): Proof => {
|
|
2405
2443
|
const start = cursor;
|
|
2406
2444
|
proofLevels.push(-1);
|
|
2407
|
-
const proof =
|
|
2445
|
+
const proof = parseProofBody();
|
|
2408
2446
|
proofLevels.pop();
|
|
2409
2447
|
return withRange(proof, start);
|
|
2410
2448
|
};
|
|
@@ -2588,7 +2626,6 @@ const parse = (
|
|
|
2588
2626
|
const parseFactName = () => {
|
|
2589
2627
|
if (peek().kind !== "Identifier" || !isAt("==", 1)) return undefined;
|
|
2590
2628
|
const name = expectIdentifier();
|
|
2591
|
-
factNames.add(name);
|
|
2592
2629
|
advance();
|
|
2593
2630
|
return name;
|
|
2594
2631
|
};
|
|
@@ -2606,16 +2643,9 @@ const parse = (
|
|
|
2606
2643
|
const start = cursor;
|
|
2607
2644
|
const keyword = advance();
|
|
2608
2645
|
const name = parseFactName();
|
|
2609
|
-
const
|
|
2610
|
-
|
|
2611
|
-
|
|
2612
|
-
return { statement, proof: isProofStart(peek()) ? parseProof() : undefined };
|
|
2613
|
-
});
|
|
2614
|
-
const statement = parsed.statement;
|
|
2615
|
-
const theorem = withRange(
|
|
2616
|
-
{ name, statement, proof: parsed.proof, location: getLocation(keyword) },
|
|
2617
|
-
start,
|
|
2618
|
-
);
|
|
2646
|
+
const statement = isAt("ASSUME") ? parseAssumeProve() : parseTheoremExpression();
|
|
2647
|
+
const proof = isTlapm ? parseTlapmProof() : isProofStart(peek()) ? parseProof() : undefined;
|
|
2648
|
+
const theorem = withRange({ name, statement, proof, location: getLocation(keyword) }, start);
|
|
2619
2649
|
module.theorems.push(theorem);
|
|
2620
2650
|
module.units.push({ kind: "Theorem", theorem });
|
|
2621
2651
|
if (name === undefined || statement.kind === "AssumeProve") return;
|
|
@@ -2656,6 +2686,7 @@ const parse = (
|
|
|
2656
2686
|
theorems: [],
|
|
2657
2687
|
uses: [],
|
|
2658
2688
|
units: [],
|
|
2689
|
+
hasRecursiveLet: false,
|
|
2659
2690
|
};
|
|
2660
2691
|
openModules.push(module);
|
|
2661
2692
|
recursiveScopes.push(new Set());
|
|
@@ -226,12 +226,12 @@ export const applyAttributes = (
|
|
|
226
226
|
thms: readonly Thm[],
|
|
227
227
|
): [IsarContext, Thm[]] =>
|
|
228
228
|
thms.reduce<[IsarContext, Thm[]]>(
|
|
229
|
-
(
|
|
229
|
+
(accumulated, thm) => {
|
|
230
230
|
const [declared, result] = attributes.reduce<[IsarContext, Thm]>(
|
|
231
|
-
(
|
|
232
|
-
[
|
|
231
|
+
(state, attribute) => applyAttribute(state[0], attribute, state[1]),
|
|
232
|
+
[accumulated[0], thm],
|
|
233
233
|
);
|
|
234
|
-
return [declared, [...
|
|
234
|
+
return [declared, [...accumulated[1], result]];
|
|
235
235
|
},
|
|
236
236
|
[context, []],
|
|
237
237
|
);
|
|
@@ -75,7 +75,7 @@ export const getCases = (rule: CasesRule): [CaseInfo, number] => {
|
|
|
75
75
|
const names = lookupTag(rule.tags, "case_names");
|
|
76
76
|
const cases =
|
|
77
77
|
names === undefined
|
|
78
|
-
? Array.from({ length: Math.max(nprems(rule.rule) - consumes, 0) }, (
|
|
78
|
+
? Array.from({ length: Math.max(nprems(rule.rule) - consumes, 0) }, (_value, index) => ({
|
|
79
79
|
name: String(index + 1),
|
|
80
80
|
concls: [] as string[],
|
|
81
81
|
}))
|
|
@@ -138,11 +138,13 @@ const extractCase = (
|
|
|
138
138
|
return {
|
|
139
139
|
fixes,
|
|
140
140
|
assumes: [{ name: "", props: stripAssumsHyp(prop).flatMap(destConjunctions).map(absFixes) }],
|
|
141
|
-
binds: [[CASE_CONCL, concl]
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
141
|
+
binds: [[CASE_CONCL, concl] satisfies [string, Term], ...destBinops(concls, concl)].map(
|
|
142
|
+
(bind) => ({
|
|
143
|
+
name: bind[0],
|
|
144
|
+
index: 0,
|
|
145
|
+
term: absFixes(bind[1]),
|
|
146
|
+
}),
|
|
147
|
+
),
|
|
146
148
|
cases: [],
|
|
147
149
|
};
|
|
148
150
|
};
|
|
@@ -91,7 +91,7 @@ const pruneParamsTac = (simp: SimpContext): Tactic => {
|
|
|
91
91
|
const empty = { ...simp, simpset: emptySimpset };
|
|
92
92
|
const context = { ...empty, simpset: addSimps(empty, [trivForallEquality]) };
|
|
93
93
|
return primitive((state) =>
|
|
94
|
-
Array.from({ length: nprems(state) }, (
|
|
94
|
+
Array.from({ length: nprems(state) }, (_value, offset) => offset + 1).reduce(
|
|
95
95
|
(current, index) =>
|
|
96
96
|
gconvRule(
|
|
97
97
|
(term) =>
|
|
@@ -245,9 +245,9 @@ const instSubstTac = (context: HypsubstContext, isLeft: boolean, rule: Thm): Goa
|
|
|
245
245
|
chosen.kind === "Bound"
|
|
246
246
|
? substBounds(
|
|
247
247
|
[
|
|
248
|
-
...Array.from({ length: chosen.index }, (
|
|
248
|
+
...Array.from({ length: chosen.index }, (_value, position) => mkBound(position + 1)),
|
|
249
249
|
mkBound(0),
|
|
250
|
-
...Array.from({ length: params.length - chosen.index - 1 }, (
|
|
250
|
+
...Array.from({ length: params.length - chosen.index - 1 }, (_value, position) =>
|
|
251
251
|
mkBound(chosen.index + 2 + position),
|
|
252
252
|
),
|
|
253
253
|
],
|
|
@@ -83,9 +83,9 @@ const rhsOf = (thm: Thm) => destEquals(thm.prop)[1];
|
|
|
83
83
|
|
|
84
84
|
const instantiateMatch = (env: MatchEnv, rule: Thm): Thm => {
|
|
85
85
|
const typed = instantiateTypes(env.tyenv, rule);
|
|
86
|
-
const insts: Instantiation[] = tableEntries(env.tenv).map((
|
|
87
|
-
variable: mkVar(
|
|
88
|
-
term:
|
|
86
|
+
const insts: Instantiation[] = tableEntries(env.tenv).map((entry) => ({
|
|
87
|
+
variable: mkVar(entry[0].name, entry[0].index, substType(env.tyenv, entry[1].type)),
|
|
88
|
+
term: entry[1].term,
|
|
89
89
|
}));
|
|
90
90
|
return instantiate(insts, typed);
|
|
91
91
|
};
|
|
@@ -636,10 +636,10 @@ const mapAbsVars = (rename: (name: string) => string, term: Term): Term => {
|
|
|
636
636
|
|
|
637
637
|
export const renameAbs = (pattern: Term, object: Term, term: Term): Term | undefined => {
|
|
638
638
|
const renaming = new Map<string, string>();
|
|
639
|
-
matchBvs(pattern, object, []).forEach((
|
|
640
|
-
if (!renaming.has(
|
|
639
|
+
matchBvs(pattern, object, []).forEach((pair) => {
|
|
640
|
+
if (!renaming.has(pair[0])) renaming.set(pair[0], pair[1]);
|
|
641
641
|
});
|
|
642
|
-
if ([...renaming].every((
|
|
642
|
+
if ([...renaming].every((pair) => pair[0] === pair[1])) return undefined;
|
|
643
643
|
const renamed = mapAbsVars((name) => renaming.get(name) ?? name, term);
|
|
644
644
|
return renamed === term ? undefined : renamed;
|
|
645
645
|
};
|