tla-ts 0.0.4-dev.b254db0 → 0.0.4-dev.ca40dfe
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 +31 -10
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +27 -27
- package/dist/deciders.js +34 -34
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +12 -14
- package/dist/index.d.ts +12 -14
- 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 +37 -27
- package/dist/prove.js +39 -29
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +76 -86
- package/dist/transfer.js +73 -83
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +2 -2
- package/src/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1154
- package/src/{cli-options.ts → cli/options.ts} +54 -9
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/cli/tlc.ts +941 -0
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +17 -15
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +12 -36
- package/src/evaluate.ts +81 -101
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/instances.ts +56 -46
- package/src/java-overrides.ts +79 -41
- package/src/json.ts +31 -36
- package/src/levels.ts +10 -13
- package/src/{live-check.ts → liveness-checker.ts} +169 -142
- package/src/liveness.ts +38 -34
- package/src/obligations/action.ts +9 -45
- package/src/obligations/{anon.ts → anonymize.ts} +13 -25
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +42 -517
- package/src/obligations/generate.ts +88 -778
- package/src/obligations/index.ts +20 -22
- package/src/obligations/levels.ts +36 -41
- package/src/obligations/module.ts +88 -708
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +21 -15
- package/src/obligations/printer.ts +81 -188
- package/src/obligations/proof.ts +0 -1
- package/src/obligations/regroup.ts +100 -0
- package/src/obligations/simplify.ts +668 -0
- package/src/obligations/source.ts +25 -131
- package/src/obligations/{deref.ts → subexpression.ts} +48 -56
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +28 -26
- package/src/obligations/tuples.ts +37 -53
- package/src/parallel-worker.ts +37 -33
- package/src/parallel.ts +30 -24
- package/src/parser.ts +67 -74
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
- package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
- package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
- package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
- package/src/prove/decide-pool.ts +7 -12
- package/src/{obligations/pickle.ts → prove/first-order.ts} +79 -2
- package/src/prove/isabelle/decide.ts +3 -6
- package/src/prove/isabelle/encode.ts +35 -93
- package/src/prove/isabelle/isar/inner-syntax.ts +1 -1
- package/src/prove/isabelle/isar/method.ts +3 -3
- package/src/prove/isabelle/isar/type-check.ts +1 -1
- package/src/prove/isabelle/provers/blast/blast.ts +1 -1
- package/src/prove/isabelle/provers/blast/branch.ts +1 -1
- package/src/prove/isabelle/provers/blast/term.ts +3 -4
- package/src/prove/isabelle/provers/clasimp.ts +1 -1
- package/src/prove/isabelle/provers/classical.ts +3 -3
- package/src/prove/isabelle/provers/hypsubst.ts +1 -9
- package/src/prove/isabelle/pure/conv.ts +1 -1
- package/src/prove/isabelle/pure/drule.ts +2 -2
- package/src/prove/isabelle/pure/envir.ts +3 -35
- package/src/prove/isabelle/pure/logic.ts +4 -76
- package/src/prove/isabelle/pure/name.ts +1 -13
- package/src/prove/isabelle/pure/net.ts +2 -49
- package/src/prove/isabelle/pure/pattern.ts +3 -22
- package/src/prove/isabelle/pure/raw-simplifier.ts +3 -18
- package/src/prove/isabelle/pure/seq.ts +0 -23
- package/src/prove/isabelle/pure/simplifier.ts +2 -8
- package/src/prove/isabelle/pure/table.ts +1 -8
- package/src/prove/isabelle/pure/tactic.ts +5 -113
- package/src/prove/isabelle/pure/tactical.ts +1 -84
- package/src/prove/isabelle/pure/term-ord.ts +1 -55
- package/src/prove/isabelle/pure/term.ts +8 -128
- package/src/prove/isabelle/pure/thm.ts +4 -27
- package/src/prove/isabelle/pure/type.ts +0 -12
- package/src/prove/isabelle/pure/unify.ts +1 -1
- package/src/prove/isabelle/tla/classical-setup.ts +1 -1
- package/src/prove/ocaml.ts +1 -1
- package/src/prove/prep/action.ts +23 -36
- package/src/prove/prep/enabled-axioms.ts +2 -2
- package/src/prove/prep/fingerprint.ts +3 -3
- package/src/prove/prep/level-comparison.ts +9 -37
- package/src/prove/prep/md5.ts +2 -9
- package/src/prove/prep/normalize.ts +309 -0
- package/src/prove/prove-worker.ts +2 -5
- package/src/prove/prove.ts +98 -111
- package/src/prove/ptl/encode.ts +19 -31
- package/src/prove/smt/axioms.ts +45 -58
- package/src/prove/smt/encode.ts +124 -15
- package/src/prove/smt/instances.ts +2 -3
- package/src/prove/smt/rewrite.ts +24 -31
- package/src/prove/smt/solver/ast-util.ts +0 -56
- package/src/prove/smt/solver/case-split-queue.ts +1 -1
- package/src/prove/smt/solver/enode.ts +1 -1
- package/src/prove/smt/solver/lp/dep-intervals.ts +0 -14
- package/src/prove/smt/solver/model-macro-solver.ts +1 -1
- package/src/prove/smt/solver/nlsat/algebraic.ts +3 -3
- package/src/prove/smt/solver/nlsat/atoms.ts +1 -1
- package/src/prove/smt/solver/nlsat/explain.ts +1 -1
- package/src/prove/smt/solver/nlsat/interval-set.ts +1 -1
- package/src/prove/smt/solver/nlsat/levelwise.ts +4 -7
- package/src/prove/smt/solver/nlsat/polynomial.ts +4 -4
- package/src/prove/smt/solver/nlsat/upolynomial.ts +2 -2
- package/src/prove/smt/solver/pattern-inference.ts +1 -1
- package/src/prove/smt/solver/relevancy.ts +2 -2
- package/src/prove/smt/solver/rewriter.ts +1 -1
- package/src/prove/smt/solver/solver.ts +2 -2
- package/src/{tlapm-cache.ts → prove/tlapm/cache.ts} +11 -11
- package/src/{ocaml-marshal.ts → prove/tlapm/ocaml-marshal.ts} +1 -1
- package/src/prove/verdict.ts +0 -5
- package/src/prove/zenon/decide.ts +5 -11
- package/src/prove/zenon/encode.ts +21 -80
- package/src/prove/zenon/eqrel.ts +1 -1
- package/src/prove/zenon/equality-rules.ts +1 -1
- package/src/prove/zenon/expr.ts +2 -2
- package/src/prove/zenon/index-table.ts +1 -1
- package/src/prove/zenon/isar.ts +1 -1
- package/src/prove/zenon/llproof.ts +1 -1
- package/src/prove/zenon/mltoll.ts +1 -1
- package/src/prove/zenon/node.ts +1 -1
- package/src/prove/zenon/search.ts +1 -1
- package/src/prove/zenon/tla/terms.ts +1 -20
- package/src/prove/zenon/tla/tla.ts +1 -1
- package/src/randomization.ts +19 -24
- package/src/resolve.ts +15 -22
- package/src/runtime.ts +8 -8
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +38 -55
- package/src/{sany-levels.ts → sany/levels.ts} +45 -48
- package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +16 -17
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
- package/src/{sany-source.ts → sany/source.ts} +6 -7
- package/src/{sany-xml.ts → sany/xml.ts} +5 -6
- package/src/search.ts +969 -0
- package/src/spec-description.ts +26 -20
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +16 -20
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +16 -19
- package/src/symmetry.ts +1 -1
- package/src/tableau.ts +6 -7
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -213
- package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
- package/src/transfer.ts +32 -32
- package/src/values.ts +72 -67
- package/src/worker.ts +1 -4
- package/dist/run-cli.cjs +0 -45
- package/dist/run-cli.js +0 -45
- package/src/canonical.ts +0 -40
- package/src/obligations/ctx.ts +0 -64
- package/src/prove/prep/defs.ts +0 -33
- package/src/prove/prep/elab.ts +0 -156
- package/src/prove/prep/enabled.ts +0 -43
- package/src/prove/prep/flatten.ts +0 -70
- package/src/prove/prep/trivial.ts +0 -22
- package/src/prove/smt/axiomatize.ts +0 -69
- package/src/prove/smt/simplify.ts +0 -57
- package/src/run-cli.ts +0 -1806
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/prove/prep/{pragma.ts → methods.ts} +0 -0
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
- /package/src/{tlc-version.ts → tlc/version.ts} +0 -0
package/src/obligations/index.ts
CHANGED
|
@@ -1,33 +1,28 @@
|
|
|
1
1
|
// Generates the proof obligations tlapm prints for a module, in tlapm's order and layout.
|
|
2
2
|
|
|
3
3
|
import { TlaProofError, TlaSyntaxError, type SyntaxFailure } from "../errors";
|
|
4
|
-
import { createAnonymizer } from "./
|
|
4
|
+
import { createAnonymizer } from "./anonymize";
|
|
5
5
|
import {
|
|
6
6
|
getAtPrefix,
|
|
7
7
|
getErrorNote,
|
|
8
8
|
getLocusPosition,
|
|
9
9
|
getLocusPrefix,
|
|
10
10
|
type Locus,
|
|
11
|
-
type
|
|
11
|
+
type Warn,
|
|
12
12
|
type Sequent,
|
|
13
13
|
} from "./expression";
|
|
14
|
-
import { createGenerator, type LineRange } from "./generate";
|
|
15
14
|
import {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
flatten,
|
|
19
|
-
generate,
|
|
20
|
-
getDependencies,
|
|
21
|
-
normalize,
|
|
22
|
-
STANDARD_MODULES,
|
|
15
|
+
createGenerator,
|
|
16
|
+
type LineRange,
|
|
23
17
|
type ModuleSummary,
|
|
24
|
-
type Mule,
|
|
25
18
|
type TheoremSummary,
|
|
26
|
-
|
|
27
|
-
} from "./module";
|
|
19
|
+
} from "./generate";
|
|
20
|
+
import { compareNames, flatten, getDependencies, STANDARD_MODULES, type Mule } from "./module";
|
|
21
|
+
import { expandInstance, normalize, type Pipeline } from "./normalize";
|
|
28
22
|
import { formatObligation } from "./printer";
|
|
29
23
|
import type { Counter, ObligationKind } from "./proof";
|
|
30
24
|
import type { OldMethod } from "./pragma";
|
|
25
|
+
import { createSimplifier } from "./simplify";
|
|
31
26
|
import { createSource } from "./source";
|
|
32
27
|
import { tokenize } from "../lexer";
|
|
33
28
|
import { parseTlapmModule } from "../parser";
|
|
@@ -59,7 +54,7 @@ export const WHOLE_MODULE: LineRange = { start: 0, end: Infinity };
|
|
|
59
54
|
|
|
60
55
|
interface ObligationOptions {
|
|
61
56
|
lines?: LineRange;
|
|
62
|
-
onWarning?:
|
|
57
|
+
onWarning?: Warn;
|
|
63
58
|
}
|
|
64
59
|
|
|
65
60
|
const MODULE_HEADER = /-{4,} *MODULE/;
|
|
@@ -93,7 +88,7 @@ const findTab = (source: string) => {
|
|
|
93
88
|
return { offset, line, column, end };
|
|
94
89
|
};
|
|
95
90
|
|
|
96
|
-
const
|
|
91
|
+
const catchSyntaxFailure = <Value>(read: () => Value): Value | SyntaxFailure => {
|
|
97
92
|
try {
|
|
98
93
|
return read();
|
|
99
94
|
} catch (error) {
|
|
@@ -106,9 +101,11 @@ const isSyntaxFailure = (value: unknown): value is SyntaxFailure =>
|
|
|
106
101
|
typeof value === "object" && value !== null && "reason" in value;
|
|
107
102
|
|
|
108
103
|
const parseSource = (source: string): Module | SyntaxFailure[] => {
|
|
109
|
-
const tab =
|
|
104
|
+
const tab = catchSyntaxFailure(() => findTab(source));
|
|
110
105
|
if (isSyntaxFailure(tab)) return [tab];
|
|
111
|
-
const parsed =
|
|
106
|
+
const parsed = catchSyntaxFailure(() =>
|
|
107
|
+
parseTlapmModule(tab ? source.slice(0, tab.offset) : source),
|
|
108
|
+
);
|
|
112
109
|
if (tab && (!isSyntaxFailure(parsed) || parsed.isEnd)) {
|
|
113
110
|
return [
|
|
114
111
|
{
|
|
@@ -128,8 +125,8 @@ const loadMule = (
|
|
|
128
125
|
input: ObligationSource,
|
|
129
126
|
counter: Counter,
|
|
130
127
|
isMain: boolean,
|
|
131
|
-
onWarning:
|
|
132
|
-
|
|
128
|
+
onWarning: Warn,
|
|
129
|
+
errorPrefix: string,
|
|
133
130
|
): Mule => {
|
|
134
131
|
if (!MODULE_HEADER.test(input.source)) throw new TlaProofError("No tokens in file");
|
|
135
132
|
const parsed = parseSource(input.source);
|
|
@@ -140,7 +137,7 @@ const loadMule = (
|
|
|
140
137
|
onWarning({ text: `${text}\n`, channel: "toolboxOnly" });
|
|
141
138
|
});
|
|
142
139
|
const message = `Could not parse ${JSON.stringify(input.file)} successfully.`;
|
|
143
|
-
onWarning({ text: `${
|
|
140
|
+
onWarning({ text: `${errorPrefix}Error: ${message}`, channel: "stderr" });
|
|
144
141
|
throw new TlaProofError(message, { failure: "Module.Parser.parse_file" });
|
|
145
142
|
}
|
|
146
143
|
const mule = createSource(input.file, input.source, counter, isMain).convertModule(parsed);
|
|
@@ -286,7 +283,7 @@ export const getObligations = (
|
|
|
286
283
|
(scope, definition) => expandInstance(pipeline, scope, definition),
|
|
287
284
|
onWarning,
|
|
288
285
|
),
|
|
289
|
-
|
|
286
|
+
simplify: createSimplifier(counter),
|
|
290
287
|
salts: { value: 0 },
|
|
291
288
|
latestModules: new Map(),
|
|
292
289
|
onWarning,
|
|
@@ -294,13 +291,14 @@ export const getObligations = (
|
|
|
294
291
|
const order = schedule(modules).map((module) =>
|
|
295
292
|
module.isStandard ? module : flatten(modules, module, new Set()),
|
|
296
293
|
);
|
|
294
|
+
const generateModule = createGenerator(new Set(mains.map((main) => main.file)), lines, onWarning);
|
|
297
295
|
// Instances see each module as flattened, and as normalized once its turn has come.
|
|
298
296
|
const normalized = new Map(order.map((module) => [module.name, module]));
|
|
299
297
|
return order.flatMap((module): ModuleObligations[] => {
|
|
300
298
|
if (module.isStandard) return [];
|
|
301
299
|
const result = normalize(pipeline, normalized, undefined, module);
|
|
302
300
|
if (!module.isImportant) return [];
|
|
303
|
-
const generated =
|
|
301
|
+
const generated = generateModule([], result);
|
|
304
302
|
// tlapm numbers the obligations, then drops the omitted ones and those outside the lines.
|
|
305
303
|
const obligations = generated.obligations.flatMap((obligation, index): PrintedObligation[] => {
|
|
306
304
|
const location = obligation.location;
|
|
@@ -4,9 +4,14 @@
|
|
|
4
4
|
import { TlaProofError, TlapmBugError } from "../errors";
|
|
5
5
|
import {
|
|
6
6
|
adjoin,
|
|
7
|
+
adjoinAll,
|
|
7
8
|
getBoundedFresh,
|
|
9
|
+
getBoundFresh,
|
|
8
10
|
getFresh,
|
|
11
|
+
getLocalDefn,
|
|
12
|
+
getParamFresh,
|
|
9
13
|
getScopeAt,
|
|
14
|
+
isBuiltinApply,
|
|
10
15
|
mapAccumulate,
|
|
11
16
|
type Bound,
|
|
12
17
|
type Builtin,
|
|
@@ -111,7 +116,7 @@ export const LEVEL_NUMBERS: Record<Level, number> = {
|
|
|
111
116
|
|
|
112
117
|
const union = (sets: Set<string>[]) => new Set(sets.flatMap((set) => [...set]));
|
|
113
118
|
|
|
114
|
-
const
|
|
119
|
+
const combineLevels = (infos: LevelInfo[]): LevelInfo => ({
|
|
115
120
|
level: Math.max(0, ...infos.map((info) => info.level)),
|
|
116
121
|
weights: [],
|
|
117
122
|
params: union(infos.map((info) => info.params)),
|
|
@@ -151,11 +156,10 @@ const getBoundsLevel = (scope: Scope | undefined, bounds: Bound[], body: Expr) =
|
|
|
151
156
|
const domains = bounds.flatMap((bound) =>
|
|
152
157
|
bound.domain.kind === "Domain" ? [getLevelInfo(scope, bound.domain.expression)] : [],
|
|
153
158
|
);
|
|
154
|
-
|
|
155
|
-
(
|
|
156
|
-
|
|
157
|
-
);
|
|
158
|
-
return combine([getLevelInfo(inner, body), ...domains]);
|
|
159
|
+
return combineLevels([
|
|
160
|
+
getLevelInfo(adjoinAll(scope, bounds.map(getBoundFresh)), body),
|
|
161
|
+
...domains,
|
|
162
|
+
]);
|
|
159
163
|
};
|
|
160
164
|
|
|
161
165
|
const applyOperator = (operator: LevelInfo, args: LevelInfo[]): LevelInfo => {
|
|
@@ -188,11 +192,10 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
188
192
|
case "Num":
|
|
189
193
|
return getInfo(0);
|
|
190
194
|
case "Lambda": {
|
|
191
|
-
const
|
|
192
|
-
(
|
|
193
|
-
|
|
195
|
+
const body = getLevelInfo(
|
|
196
|
+
adjoinAll(scope, expression.params.map(getParamFresh)),
|
|
197
|
+
expression.body,
|
|
194
198
|
);
|
|
195
|
-
const body = getLevelInfo(inner, expression.body);
|
|
196
199
|
const names = new Set(expression.params.map((param) => param.name));
|
|
197
200
|
return {
|
|
198
201
|
level: body.level,
|
|
@@ -204,12 +207,7 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
204
207
|
const operator = expression.operator;
|
|
205
208
|
// The action frontend commutes a prime onto an operator, and tlapm keeps the level that
|
|
206
209
|
// the application had.
|
|
207
|
-
if (
|
|
208
|
-
operator.kind === "Apply" &&
|
|
209
|
-
operator.operator.kind === "Internal" &&
|
|
210
|
-
operator.operator.builtin === "Prime" &&
|
|
211
|
-
operator.args.length === 1
|
|
212
|
-
) {
|
|
210
|
+
if (isBuiltinApply(operator, "Prime") && operator.args.length === 1) {
|
|
213
211
|
return recurse({ ...expression, operator: operator.args[0] });
|
|
214
212
|
}
|
|
215
213
|
if (operator.kind === "Opaque") {
|
|
@@ -255,26 +253,17 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
255
253
|
case "Dot":
|
|
256
254
|
case "Parens":
|
|
257
255
|
return recurse(expression.expression);
|
|
258
|
-
case "Let":
|
|
259
|
-
|
|
260
|
-
(
|
|
261
|
-
|
|
262
|
-
kind: "Defn",
|
|
263
|
-
definition,
|
|
264
|
-
whereDefined: "User",
|
|
265
|
-
visibility: "Visible",
|
|
266
|
-
isLocal: true,
|
|
267
|
-
}),
|
|
268
|
-
scope,
|
|
256
|
+
case "Let":
|
|
257
|
+
return getLevelInfo(
|
|
258
|
+
adjoinAll(scope, expression.definitions.map(getLocalDefn)),
|
|
259
|
+
expression.body,
|
|
269
260
|
);
|
|
270
|
-
return getLevelInfo(inner, expression.body);
|
|
271
|
-
}
|
|
272
261
|
case "If":
|
|
273
|
-
return
|
|
262
|
+
return combineLevels(
|
|
274
263
|
[expression.condition, expression.consequent, expression.alternative].map(recurse),
|
|
275
264
|
);
|
|
276
265
|
case "List":
|
|
277
|
-
return
|
|
266
|
+
return combineLevels(expression.items.map(recurse));
|
|
278
267
|
case "Quant":
|
|
279
268
|
case "Fcn":
|
|
280
269
|
return getBoundsLevel(scope, expression.bounds, expression.body);
|
|
@@ -282,7 +271,10 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
282
271
|
return getBoundsLevel(scope, expression.bounds, expression.element);
|
|
283
272
|
case "Tquant":
|
|
284
273
|
getLevelInfo(
|
|
285
|
-
|
|
274
|
+
adjoinAll(
|
|
275
|
+
scope,
|
|
276
|
+
expression.names.map((name) => ({ kind: "Flex", name })),
|
|
277
|
+
),
|
|
286
278
|
expression.body,
|
|
287
279
|
);
|
|
288
280
|
return getInfo(3);
|
|
@@ -292,25 +284,25 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
292
284
|
const hyp = expression.domain
|
|
293
285
|
? getBoundedFresh(expression.name, expression.domain)
|
|
294
286
|
: getFresh(expression.name, "Constant");
|
|
295
|
-
return
|
|
287
|
+
return combineLevels([
|
|
296
288
|
getLevelInfo(adjoin(scope, hyp), expression.body),
|
|
297
289
|
...(domainLevel ? [domainLevel] : []),
|
|
298
290
|
]);
|
|
299
291
|
}
|
|
300
292
|
case "SetEnum":
|
|
301
293
|
case "Tuple":
|
|
302
|
-
return
|
|
294
|
+
return combineLevels(expression.elements.map(recurse));
|
|
303
295
|
case "Product":
|
|
304
|
-
return
|
|
296
|
+
return combineLevels(expression.factors.map(recurse));
|
|
305
297
|
case "FcnApp":
|
|
306
|
-
return
|
|
298
|
+
return combineLevels([expression.function, ...expression.args].map(recurse));
|
|
307
299
|
case "Arrow":
|
|
308
|
-
return
|
|
300
|
+
return combineLevels([recurse(expression.domain), recurse(expression.range)]);
|
|
309
301
|
case "Rect":
|
|
310
302
|
case "Record":
|
|
311
|
-
return
|
|
303
|
+
return combineLevels(expression.fields.map((field) => recurse(field.value)));
|
|
312
304
|
case "Except":
|
|
313
|
-
return
|
|
305
|
+
return combineLevels([
|
|
314
306
|
recurse(expression.function),
|
|
315
307
|
...expression.specs.flatMap((spec) => [
|
|
316
308
|
...spec.trail.flatMap((point) =>
|
|
@@ -320,14 +312,17 @@ export const getLevelInfo = (scope: Scope | undefined, expression: Expr): LevelI
|
|
|
320
312
|
]),
|
|
321
313
|
]);
|
|
322
314
|
case "Sub":
|
|
323
|
-
return {
|
|
315
|
+
return {
|
|
316
|
+
...combineLevels([recurse(expression.action), recurse(expression.subscript)]),
|
|
317
|
+
level: 2,
|
|
318
|
+
};
|
|
324
319
|
case "Tsub":
|
|
325
320
|
case "Fair":
|
|
326
321
|
recurse(expression.action);
|
|
327
322
|
recurse(expression.subscript);
|
|
328
323
|
return getInfo(3);
|
|
329
324
|
case "Case":
|
|
330
|
-
return
|
|
325
|
+
return combineLevels([
|
|
331
326
|
...expression.arms.flatMap((arm) => [recurse(arm.condition), recurse(arm.body)]),
|
|
332
327
|
...(expression.other ? [recurse(expression.other)] : []),
|
|
333
328
|
]);
|