tla-ts 0.0.10-dev.99796fe03 → 0.0.10-dev.a17d6d9fa
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 +54 -54
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +3 -2
- package/dist/index.d.ts +3 -2
- 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 +60 -60
- package/dist/prove.js +78 -78
- package/dist/run.cjs +42 -44
- package/dist/run.js +44 -46
- package/dist/tlapm.cjs +1 -1
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -43
- package/dist/transfer.js +39 -39
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +1 -1
- package/src/ast.ts +1 -0
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +1 -1
- package/src/check-trace.ts +90 -51
- package/src/check.ts +367 -178
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +1 -2
- package/src/cli/tlc.ts +16 -10
- package/src/cli/xml-exporter.ts +1 -1
- package/src/codegen.ts +26 -9
- package/src/dependencies.ts +49 -9
- package/src/dfid.ts +22 -10
- package/src/environment.ts +58 -33
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +117 -41
- package/src/exit-codes.ts +4 -2
- package/src/instances.ts +5 -5
- package/src/java-hash.ts +14 -0
- package/src/java-overrides.ts +2 -2
- package/src/levels.ts +138 -90
- package/src/liveness-checker.ts +81 -33
- package/src/liveness.ts +49 -11
- package/src/obligations/index.ts +1 -1
- package/src/obligations/normalize.ts +1 -4
- package/src/obligations/printer.ts +5 -5
- package/src/parallel-worker.ts +8 -2
- package/src/parallel.ts +5 -0
- package/src/parser.ts +112 -145
- 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/arith-rewriter.ts +11 -3
- package/src/prover/smt/solver/array-rewriter.ts +12 -2
- package/src/prover/smt/solver/asserted-formulas.ts +169 -58
- package/src/prover/smt/solver/ast-lt.ts +1 -1
- package/src/prover/smt/solver/ast.ts +63 -14
- package/src/prover/smt/solver/auf-solver.ts +23 -12
- package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
- 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/card2bv.ts +32 -18
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
- package/src/prover/smt/solver/context.ts +47 -9
- package/src/prover/smt/solver/ctx-simplify.ts +1 -2
- package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
- package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
- package/src/prover/smt/solver/diff-neq.ts +1 -2
- 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 +5 -8
- 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 +2 -0
- package/src/prover/smt/solver/fix-dl-var.ts +1 -2
- 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/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/logic-tactics.ts +9 -2
- package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
- package/src/prover/smt/solver/lp/nla-core.ts +1 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
- package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
- package/src/prover/smt/solver/lp/pdd.ts +2 -3
- 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/model-based-opt.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 +10 -4
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
- package/src/prover/smt/solver/muz/dl-rule.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 +1 -1
- 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/nlqsat.ts +1 -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/opt-context.ts +20 -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 +9 -5
- package/src/prover/smt/solver/optsmt.ts +1 -1
- package/src/prover/smt/solver/pb-rewriter.ts +1 -4
- 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/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 +16 -6
- 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/rewriter.ts +31 -25
- package/src/prover/smt/solver/rlimit.ts +4 -0
- package/src/prover/smt/solver/sat/config.ts +1 -1
- package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +39 -5
- package/src/prover/smt/solver/sat/model-converter.ts +1 -1
- package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
- package/src/prover/smt/solver/sat/sat-tactic.ts +13 -5
- package/src/prover/smt/solver/sat/simplifier.ts +1 -1
- package/src/prover/smt/solver/sat/solver.ts +25 -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-kernel.ts +39 -5
- package/src/prover/smt/solver/smt-setup.ts +96 -10
- package/src/prover/smt/solver/smtlib-parser.ts +584 -223
- package/src/prover/smt/solver/smtlib-script.ts +509 -154
- package/src/prover/smt/solver/solve-eqs.ts +36 -37
- package/src/prover/smt/solver/solver.ts +18 -3
- package/src/prover/smt/solver/tactic.ts +284 -168
- 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 +11 -3
- 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/tseitin-cnf.ts +1 -0
- 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 +959 -243
- package/src/runtime.ts +7 -1
- package/src/sany/builtins.ts +10 -10
- package/src/sany/generation.ts +2 -13
- package/src/sany/generator-definitions.ts +3 -1
- package/src/sany/generator-expressions.ts +36 -30
- package/src/sany/generator-proofs.ts +5 -3
- package/src/sany/generator.ts +2 -1
- package/src/sany/lexer.ts +3 -3
- package/src/sany/modules.ts +4 -2
- package/src/sany/nodes.ts +1 -1
- package/src/sany/selectors.ts +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +166 -101
- package/src/simulate.ts +110 -50
- package/src/spec-description.ts +5 -6
- package/src/standard-modules.ts +15 -6
- package/src/subexpressions.ts +398 -108
- package/src/successors.ts +4 -2
- package/src/symmetry.ts +1 -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 +3 -2
- 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/typed-tier.ts +32 -25
- package/src/typescript/types.ts +2 -2
- package/src/values.ts +135 -78
package/src/runtime.ts
CHANGED
|
@@ -14,6 +14,7 @@ export interface CheckerRuntime {
|
|
|
14
14
|
getCurrentState: () => Value[] | undefined;
|
|
15
15
|
getFingerprint: (state: Value[]) => bigint;
|
|
16
16
|
getRandom: () => JavaRandom;
|
|
17
|
+
reseedRandom: () => void;
|
|
17
18
|
getSimulationValue:
|
|
18
19
|
| ((key: string, state: (Value | undefined)[] | undefined) => Value | undefined)
|
|
19
20
|
| undefined;
|
|
@@ -26,6 +27,7 @@ export interface CheckerRuntime {
|
|
|
26
27
|
version: TlcVersion;
|
|
27
28
|
seed: bigint;
|
|
28
29
|
isSeen: (state: Value[]) => boolean;
|
|
30
|
+
markExplored: ((state: Value[]) => void) | undefined;
|
|
29
31
|
getSuccessorAction: (state: Value[], next: Value[]) => SpecAction | undefined;
|
|
30
32
|
toRecord: (state: Value[]) => Record<string, Value>;
|
|
31
33
|
generatedStates: number;
|
|
@@ -55,6 +57,7 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
|
|
|
55
57
|
counterExample: undefined,
|
|
56
58
|
deferred: undefined,
|
|
57
59
|
isSeen: () => false,
|
|
60
|
+
markExplored: undefined,
|
|
58
61
|
getSuccessorAction: () => undefined,
|
|
59
62
|
toRecord: () => ({}),
|
|
60
63
|
setLivenessSource: () => {},
|
|
@@ -70,6 +73,9 @@ export const createRuntime = (checkDeadlock: boolean, seed = 0n): CheckerRuntime
|
|
|
70
73
|
}
|
|
71
74
|
return workerRandom;
|
|
72
75
|
},
|
|
76
|
+
reseedRandom: () => {
|
|
77
|
+
seededState = undefined;
|
|
78
|
+
},
|
|
73
79
|
evaluateAtStartup: (evaluate) => {
|
|
74
80
|
const wasStartup = isStartup;
|
|
75
81
|
isStartup = true;
|
|
@@ -108,7 +114,7 @@ export const NAMED_REGISTER_PREFIX = "s:";
|
|
|
108
114
|
const POSSIBLE_REGISTER = "s:_possible";
|
|
109
115
|
|
|
110
116
|
export const getPossibleCounts = (runtime: CheckerRuntime) =>
|
|
111
|
-
createFunction([...runtime.possibleCounts].map((
|
|
117
|
+
createFunction([...runtime.possibleCounts].map((entry): [Value, Value] => [entry[0], entry[1]]));
|
|
112
118
|
|
|
113
119
|
export const getNamedRegisters = (runtime: CheckerRuntime): Map<string, Value> =>
|
|
114
120
|
runtime.possibleCounts.size === 0
|
package/src/sany/builtins.ts
CHANGED
|
@@ -98,28 +98,28 @@ export const createLevelFields = (id: number): LevelFields => ({
|
|
|
98
98
|
|
|
99
99
|
// SANY's order: OpDefNode's constructor numbers each builtin, then its phony parameters.
|
|
100
100
|
export const createBuiltins = (getId: () => number) =>
|
|
101
|
-
BUILTIN_OPERATORS.map((
|
|
101
|
+
BUILTIN_OPERATORS.map((operator): OpDefNode => {
|
|
102
102
|
const id = getId();
|
|
103
103
|
const params =
|
|
104
|
-
|
|
104
|
+
operator[1] < 0
|
|
105
105
|
? undefined
|
|
106
|
-
: Array.from({ length:
|
|
106
|
+
: Array.from({ length: operator[1] }, (_value, index): FormalParamNode => ({
|
|
107
107
|
...createLevelFields(getId()),
|
|
108
108
|
kind: "FormalParam",
|
|
109
109
|
name: `Formal_${index}`,
|
|
110
110
|
arity: 0,
|
|
111
111
|
location: undefined,
|
|
112
112
|
}));
|
|
113
|
-
const isLevelSet =
|
|
114
|
-
const isLeibnizArg =
|
|
113
|
+
const isLevelSet = operator[3] !== undefined && operator[4] !== undefined;
|
|
114
|
+
const isLeibnizArg = operator[4]?.map((weight) => weight > 0);
|
|
115
115
|
return {
|
|
116
116
|
...createLevelFields(id),
|
|
117
117
|
levelChecked: isLevelSet ? 99 : 0,
|
|
118
|
-
level,
|
|
118
|
+
level: operator[2],
|
|
119
119
|
kind: "OpDef",
|
|
120
120
|
defKind: "BuiltIn",
|
|
121
|
-
name,
|
|
122
|
-
arity,
|
|
121
|
+
name: operator[0],
|
|
122
|
+
arity: operator[1],
|
|
123
123
|
params,
|
|
124
124
|
body: undefined,
|
|
125
125
|
isLocal: false,
|
|
@@ -132,11 +132,11 @@ export const createBuiltins = (getId: () => number) =>
|
|
|
132
132
|
inRecursiveSection: false,
|
|
133
133
|
recursiveSection: -1,
|
|
134
134
|
letInLevel: 0,
|
|
135
|
-
weights:
|
|
135
|
+
weights: operator[1] < 0 ? (operator[4] ?? []).slice(0, 1) : (operator[4] ?? []),
|
|
136
136
|
isLeibnizArg: isLevelSet ? isLeibnizArg : undefined,
|
|
137
137
|
isLeibniz: isLeibnizArg?.every(Boolean) ?? true,
|
|
138
138
|
opLevelCond: undefined,
|
|
139
|
-
maxLevels:
|
|
139
|
+
maxLevels: operator[1] < 0 ? (operator[3] ?? []).slice(0, 1) : (operator[3] ?? []),
|
|
140
140
|
minMaxLevel: undefined,
|
|
141
141
|
labels: new Map(),
|
|
142
142
|
step: undefined,
|
package/src/sany/generation.ts
CHANGED
|
@@ -34,19 +34,7 @@ import {
|
|
|
34
34
|
getTokenIndex,
|
|
35
35
|
type SourceFile,
|
|
36
36
|
} from "./source";
|
|
37
|
-
import {
|
|
38
|
-
|
|
39
|
-
const SYNONYMS = new Map(
|
|
40
|
-
SANY_OPERATOR_SYNONYMS.flatMap(([canonical, ...synonyms]) =>
|
|
41
|
-
synonyms.map((synonym) => [synonym, canonical]),
|
|
42
|
-
),
|
|
43
|
-
);
|
|
44
|
-
|
|
45
|
-
export const resolveSynonym = (name: string) =>
|
|
46
|
-
name
|
|
47
|
-
.split("!")
|
|
48
|
-
.map((part) => SYNONYMS.get(part) ?? (part === "~" ? "\\lnot" : part))
|
|
49
|
-
.join("!");
|
|
37
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
50
38
|
|
|
51
39
|
export interface AssumeProveScope {
|
|
52
40
|
isDeclaredBefore: boolean[];
|
|
@@ -382,6 +370,7 @@ export const matchArguments = (
|
|
|
382
370
|
getSymbolArity(operand.op) === param.arity &&
|
|
383
371
|
!(
|
|
384
372
|
operand.op.kind === "OpDef" &&
|
|
373
|
+
// Deviation from SANY: OpDefNode#matchingOpArgOperand reads as many parameters as a RECURSIVE declaration gives and crashes when the definition has fewer.
|
|
385
374
|
(operand.op.params ?? []).some((parameter) => parameter.arity > 0)
|
|
386
375
|
);
|
|
387
376
|
if (param.arity > 0 && !isMatching) {
|
|
@@ -60,10 +60,10 @@ import {
|
|
|
60
60
|
popLabels,
|
|
61
61
|
pushLabelScope,
|
|
62
62
|
resolveSymbol,
|
|
63
|
-
resolveSynonym,
|
|
64
63
|
setRecursionFields,
|
|
65
64
|
withContext,
|
|
66
65
|
} from "./generation";
|
|
66
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
67
67
|
import {
|
|
68
68
|
findNameOrKeyword,
|
|
69
69
|
generateBounds,
|
|
@@ -123,6 +123,7 @@ export const processOperator = (
|
|
|
123
123
|
const params = getParams(generation, definition, paramsSpan, true);
|
|
124
124
|
const existing = resolveSymbol(generation.contexts, name);
|
|
125
125
|
if (existing?.kind === "OpDef" && existing.inRecursive && !existing.isDefined) {
|
|
126
|
+
// Deviation from SANY: Generator#processOperator compares only the last parameter's arity with the RECURSIVE declaration's.
|
|
126
127
|
const isMatching =
|
|
127
128
|
existing.params?.length === params.length && params.every((param) => param.arity === 0);
|
|
128
129
|
if (existing.letInLevel !== generation.curLevel) {
|
|
@@ -356,6 +357,7 @@ const processSubstitutions = (
|
|
|
356
357
|
if (targetIndex !== -1) {
|
|
357
358
|
cursor = getExpressionSpan(generation.file, substitution.expression).end + 1;
|
|
358
359
|
}
|
|
360
|
+
// Deviation from SANY: Generator#generateSubst looks a target up as spelled, so it rejects `<= <- G` for a CONSTANT _ <= _.
|
|
359
361
|
const target = getContextSymbol(instanceeContext, resolveSynonym(substitution.name));
|
|
360
362
|
if (target?.kind !== "OpDecl") {
|
|
361
363
|
generation.addError(
|
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
getArgumentSpan,
|
|
28
28
|
getExpressionSpan,
|
|
29
29
|
getMatchingIndex,
|
|
30
|
+
getParenthesizedSpan,
|
|
30
31
|
getPreComments,
|
|
31
32
|
getSpanLocation,
|
|
32
33
|
getTokenIndex,
|
|
@@ -48,11 +49,10 @@ import {
|
|
|
48
49
|
type ModuleGeneration,
|
|
49
50
|
popLabels,
|
|
50
51
|
pushLabelScope,
|
|
51
|
-
resolveName,
|
|
52
52
|
resolveSymbol,
|
|
53
|
-
resolveSynonym,
|
|
54
53
|
withContext,
|
|
55
54
|
} from "./generation";
|
|
55
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
56
56
|
import { getOperandSpan } from "./generator-def-entries";
|
|
57
57
|
import {
|
|
58
58
|
checkForUndefinedRecursiveOps,
|
|
@@ -93,18 +93,6 @@ const isOperatorArgument = (argument: Expression) => {
|
|
|
93
93
|
return OPERATOR_ARGUMENT_KINDS.has(argument.kind) || (items !== undefined && isGeneralId(items));
|
|
94
94
|
};
|
|
95
95
|
|
|
96
|
-
const POSTFIX_OPERATOR_TEXTS = new Set(["'", "^+", "^*", "^#"]);
|
|
97
|
-
|
|
98
|
-
const getOperatorNodeKind = (
|
|
99
|
-
expression: Expression & { kind: "OperatorReference" | "Lambda" },
|
|
100
|
-
text: string,
|
|
101
|
-
) => {
|
|
102
|
-
if (POSTFIX_OPERATOR_TEXTS.has(text)) return "N_GenPostfixOp";
|
|
103
|
-
return expression.kind === "Lambda" || text === "~" || text === "-."
|
|
104
|
-
? "N_GenNonExpPrefixOp"
|
|
105
|
-
: "N_GenInfixOp";
|
|
106
|
-
};
|
|
107
|
-
|
|
108
96
|
const locateSelectorItems = (file: SourceFile, items: SelectorItem[], span: TokenSpan) => {
|
|
109
97
|
let cursor = span.start;
|
|
110
98
|
return items.map((item): SelectorItem => {
|
|
@@ -244,22 +232,33 @@ const getOperatorArgumentName = (file: SourceFile, argument: Expression) =>
|
|
|
244
232
|
? argument.body.operator
|
|
245
233
|
: file.tokens[getTokenIndex(file, argument.location)].text;
|
|
246
234
|
|
|
235
|
+
const resolveOperatorArgument = (
|
|
236
|
+
generation: ModuleGeneration,
|
|
237
|
+
argument: Expression,
|
|
238
|
+
location: SanyLocation,
|
|
239
|
+
) => {
|
|
240
|
+
const name = getOperatorArgumentName(generation.file, argument);
|
|
241
|
+
const symbol = resolveSymbol(generation.contexts, resolveSynonym(name));
|
|
242
|
+
if (symbol !== undefined) return createOpArg(generation, symbol, location);
|
|
243
|
+
generation.addError(location, `Could not find declaration or definition of symbol '${name}'.`);
|
|
244
|
+
return createNullNode(generation);
|
|
245
|
+
};
|
|
246
|
+
|
|
247
247
|
export const generateOperatorArgument = (
|
|
248
248
|
generation: ModuleGeneration,
|
|
249
249
|
argument: Expression,
|
|
250
250
|
target: OpDeclNode,
|
|
251
251
|
): OpArgNode | OpApplNode => {
|
|
252
|
-
const
|
|
253
|
-
|
|
252
|
+
const span = getExpressionSpan(generation.file, argument);
|
|
253
|
+
const parenthesizedSpan = getParenthesizedSpan(generation.file, span);
|
|
254
|
+
const location = getSpanLocation(generation.file, parenthesizedSpan);
|
|
255
|
+
const isParenthesized = parenthesizedSpan !== span;
|
|
256
|
+
if (argument.kind === "Lambda" && !isParenthesized) {
|
|
254
257
|
if (argument.location.range !== undefined && argument.operator === undefined)
|
|
255
258
|
return createOpArg(generation, generateLambda(generation, argument), location);
|
|
256
|
-
return
|
|
257
|
-
generation,
|
|
258
|
-
resolveName(generation, getOperatorArgumentName(generation.file, argument), location),
|
|
259
|
-
location,
|
|
260
|
-
);
|
|
259
|
+
return resolveOperatorArgument(generation, argument, location);
|
|
261
260
|
}
|
|
262
|
-
if (!isOperatorArgument(argument)) {
|
|
261
|
+
if (isParenthesized || !isOperatorArgument(argument)) {
|
|
263
262
|
generation.addError(
|
|
264
263
|
location,
|
|
265
264
|
`Arity ${target.arity} operator (not an expression) is expected \nto substitute for CONSTANT '${target.name}'.`,
|
|
@@ -267,7 +266,7 @@ export const generateOperatorArgument = (
|
|
|
267
266
|
return createNullNode(generation);
|
|
268
267
|
}
|
|
269
268
|
if (argument.kind === "OperatorReference") {
|
|
270
|
-
return
|
|
269
|
+
return resolveOperatorArgument(generation, argument, location);
|
|
271
270
|
}
|
|
272
271
|
const node = generateSelector(generation, argument, target.arity, false, false);
|
|
273
272
|
if (node.kind === "OpArg" || (node.kind === "OpAppl" && node.nullKind !== undefined)) return node;
|
|
@@ -283,10 +282,13 @@ export const generateArgument = (
|
|
|
283
282
|
argument: Expression,
|
|
284
283
|
operatorLocation: SanyLocation,
|
|
285
284
|
): ExprOrOpArgNode => {
|
|
286
|
-
const
|
|
285
|
+
const params =
|
|
287
286
|
operator.kind === "OpDef" &&
|
|
288
|
-
(operator.defKind === "UserDefined" || operator.defKind === "ModuleInstance")
|
|
289
|
-
|
|
287
|
+
(operator.defKind === "UserDefined" || operator.defKind === "ModuleInstance")
|
|
288
|
+
? (operator.params ?? [])
|
|
289
|
+
: undefined;
|
|
290
|
+
if (params !== undefined && params.length <= index) return createNullNode(generation);
|
|
291
|
+
const expectedArity = params?.[index]?.arity ?? 0;
|
|
290
292
|
if (expectedArity === 0) return generateExpression(generation, argument);
|
|
291
293
|
const span = getExpressionSpan(generation.file, argument);
|
|
292
294
|
const location = getSpanLocation(generation.file, span);
|
|
@@ -722,13 +724,17 @@ export const generateExpression = (
|
|
|
722
724
|
return { ...createNullNode(generation), nullKind: "absent" };
|
|
723
725
|
case "OperatorReference":
|
|
724
726
|
case "Lambda": {
|
|
725
|
-
const
|
|
726
|
-
|
|
727
|
+
const token = generation.file.tokens[getExpressionSpan(generation.file, expression).start];
|
|
728
|
+
const name = expression.operator ?? token.text;
|
|
729
|
+
// Deviation from SANY: Generator#generateExpression names its internal node kind here, where tla-ts words it as for a name.
|
|
730
|
+
const symbol = resolveSymbol(generation.contexts, resolveSynonym(name));
|
|
727
731
|
generation.addError(
|
|
728
732
|
location,
|
|
729
|
-
text === "LAMBDA"
|
|
733
|
+
token.text === "LAMBDA"
|
|
730
734
|
? "LAMBDA expression used where an expression is required."
|
|
731
|
-
:
|
|
735
|
+
: symbol === undefined
|
|
736
|
+
? `Could not find declaration or definition of symbol '${token.spelling ?? name}'.`
|
|
737
|
+
: `The operator ${resolveSynonym(name)} requires ${getSymbolArity(symbol)} arguments.`,
|
|
732
738
|
);
|
|
733
739
|
return { ...createNullNode(generation), nullKind: "absent" };
|
|
734
740
|
}
|
|
@@ -66,9 +66,9 @@ import {
|
|
|
66
66
|
pushLabelScope,
|
|
67
67
|
resolveModule,
|
|
68
68
|
resolveName,
|
|
69
|
-
resolveSynonym,
|
|
70
69
|
withContext,
|
|
71
70
|
} from "./generation";
|
|
71
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
72
72
|
import { getOperandSpan, reportDefEntry } from "./generator-def-entries";
|
|
73
73
|
import {
|
|
74
74
|
generateInstance,
|
|
@@ -108,9 +108,11 @@ const getFactModules = (generation: ModuleGeneration, fact: Fact & { kind: "Modu
|
|
|
108
108
|
const generateFacts = (generation: ModuleGeneration, facts: Fact[]) =>
|
|
109
109
|
facts.flatMap((fact): FactNode[] => {
|
|
110
110
|
if (fact.kind === "ModuleFact") return getFactModules(generation, fact);
|
|
111
|
-
const
|
|
111
|
+
const reference: Expression =
|
|
112
|
+
fact.kind === "ExceptAt" ? { kind: "Identifier", name: "@", location: fact.location } : fact;
|
|
113
|
+
const items = getSelectorItems(reference);
|
|
112
114
|
if (items === undefined || !isGeneralId(items)) return [generateExpression(generation, fact)];
|
|
113
|
-
const node = generateSelector(generation,
|
|
115
|
+
const node = generateSelector(generation, reference, 0, true, false);
|
|
114
116
|
if (node.kind === "ThmOrAssumpDef") throw new TlaSyntaxError("Expected a fact");
|
|
115
117
|
return [node];
|
|
116
118
|
});
|
package/src/sany/generator.ts
CHANGED
|
@@ -51,8 +51,8 @@ import {
|
|
|
51
51
|
type ModuleGeneration,
|
|
52
52
|
resolveModule,
|
|
53
53
|
resolveSymbol,
|
|
54
|
-
resolveSynonym,
|
|
55
54
|
} from "./generation";
|
|
55
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
56
56
|
import {
|
|
57
57
|
checkForUndefinedRecursiveOps,
|
|
58
58
|
checkRecursiveSection,
|
|
@@ -125,6 +125,7 @@ const isInternalInstance = (module: Module, instance: Instance) => {
|
|
|
125
125
|
return seen.has(instance.module);
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
+
// Deviation from SANY: SpecObj#instanceResolvesToInternalModule reads only top-level INSTANCEs, so SANY loads an inner module that only a LET instantiates a second time and rejects it as multiply defined.
|
|
128
129
|
return module.modules.some(
|
|
129
130
|
(inner) => inner.name === instance.module && isBefore(inner.location, instance.location),
|
|
130
131
|
);
|
package/src/sany/lexer.ts
CHANGED
|
@@ -302,9 +302,9 @@ const getLongerMatch = (best: TokenMatch, match: TokenMatch) =>
|
|
|
302
302
|
|
|
303
303
|
const matchPatterns = (patterns: [string, RegExp[]][], source: string, offset: number) =>
|
|
304
304
|
patterns
|
|
305
|
-
.map((
|
|
306
|
-
kind: getKind(
|
|
307
|
-
length: Math.max(...
|
|
305
|
+
.map((pattern) => ({
|
|
306
|
+
kind: getKind(pattern[0]),
|
|
307
|
+
length: Math.max(...pattern[1].map((regex) => getMatchLength(regex, source, offset))),
|
|
308
308
|
}))
|
|
309
309
|
.reduce(getLongerMatch, { kind: -1, length: 0 });
|
|
310
310
|
|
package/src/sany/modules.ts
CHANGED
|
@@ -1289,8 +1289,10 @@ _TLCTrace ==
|
|
|
1289
1289
|
]);
|
|
1290
1290
|
|
|
1291
1291
|
export const SANY_174_STANDARD_MODULES = new Map([
|
|
1292
|
-
...[...SANY_STANDARD_MODULES].filter((
|
|
1293
|
-
["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(
|
|
1292
|
+
...[...SANY_STANDARD_MODULES].filter((entry) =>
|
|
1293
|
+
["FiniteSets", "Integers", "Naturals", "RealTime", "Reals", "Sequences", "TLC"].includes(
|
|
1294
|
+
entry[0],
|
|
1295
|
+
),
|
|
1294
1296
|
),
|
|
1295
1297
|
["Bags", BAGS.replace("\nLOCAL INSTANCE Naturals\n", "\nEXTENDS TLC\nLOCAL INSTANCE Naturals\n")],
|
|
1296
1298
|
[
|
package/src/sany/nodes.ts
CHANGED
|
@@ -156,7 +156,7 @@ export interface OpApplNode extends LevelFields {
|
|
|
156
156
|
nullKind?: "null" | "absent";
|
|
157
157
|
}
|
|
158
158
|
|
|
159
|
-
export const isAbsent = (node: LevelNode | undefined) =>
|
|
159
|
+
export const isAbsent = (node: LevelNode | SymbolNode | undefined) =>
|
|
160
160
|
node?.kind === "OpAppl" && node.nullKind === "absent";
|
|
161
161
|
|
|
162
162
|
export interface NumeralNode extends LevelFields {
|
package/src/sany/selectors.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
CONSTANT_DECL_KIND,
|
|
5
5
|
getContextSymbol,
|
|
6
6
|
getSymbolArity,
|
|
7
|
+
isAbsent,
|
|
7
8
|
type AssumeProveNode,
|
|
8
9
|
type Context,
|
|
9
10
|
type ExprNode,
|
|
@@ -382,7 +383,7 @@ export const createSelectorResolver =
|
|
|
382
383
|
"`!:' can be used only after a name and either at the end after an\noperator name or before an operator name.",
|
|
383
384
|
);
|
|
384
385
|
}
|
|
385
|
-
} else if (node === undefined) {
|
|
386
|
+
} else if (node === undefined || isAbsent(node)) {
|
|
386
387
|
return generator.addError(
|
|
387
388
|
getItemLocation(),
|
|
388
389
|
"Subexpression selection failed, probably due to an error in the selected expression.",
|
|
@@ -413,7 +414,11 @@ export const createSelectorResolver =
|
|
|
413
414
|
const number = getArgNumber(item.op, operator.arity);
|
|
414
415
|
if (number === -1) return addNonexistentError();
|
|
415
416
|
walk.node = operands[number - 1];
|
|
416
|
-
} else if (
|
|
417
|
+
} else if (
|
|
418
|
+
operator.kind === "OpDef" &&
|
|
419
|
+
operator.defKind === "BuiltIn" &&
|
|
420
|
+
node.nullKind !== "null"
|
|
421
|
+
) {
|
|
417
422
|
if (operator.name === "$RcdConstructor" || operator.name === "$SetOfRcds") {
|
|
418
423
|
if (operandNumber === -1) return addNonexistentError();
|
|
419
424
|
const pair = operands[operandNumber - 1];
|
|
@@ -438,7 +443,7 @@ export const createSelectorResolver =
|
|
|
438
443
|
);
|
|
439
444
|
}
|
|
440
445
|
walk.node = pair.operands[number - 1];
|
|
441
|
-
if (walk.node === undefined)
|
|
446
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
442
447
|
return generator.addError(
|
|
443
448
|
getItemLocation(),
|
|
444
449
|
"Selecting OTHER in a CASE statement.",
|
|
@@ -476,7 +481,7 @@ export const createSelectorResolver =
|
|
|
476
481
|
} else {
|
|
477
482
|
return generator.addError(
|
|
478
483
|
getItemLocation(),
|
|
479
|
-
`Choosing operand \`${item
|
|
484
|
+
`Choosing operand \`${getSelectorItemName(item)}' of subexpression with no operands.`,
|
|
480
485
|
);
|
|
481
486
|
}
|
|
482
487
|
} else if (node.kind === "AssumeProve") {
|
|
@@ -542,10 +547,10 @@ export const createSelectorResolver =
|
|
|
542
547
|
"Selecting subexpression of expression that has none.",
|
|
543
548
|
);
|
|
544
549
|
}
|
|
545
|
-
if (walk.node === undefined)
|
|
550
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
546
551
|
return generator.addError(
|
|
547
552
|
getItemLocation(),
|
|
548
|
-
`An unexpected null node specified by '${item
|
|
553
|
+
`An unexpected null node specified by '${getSelectorItemName(item)}'.\nThis is probably due to a previous error.`,
|
|
549
554
|
);
|
|
550
555
|
if (walk.index !== items.length - 1) {
|
|
551
556
|
const next = items[walk.index + 1];
|
package/src/sany/xml.ts
CHANGED
|
@@ -894,10 +894,9 @@ const exportSpecification = (
|
|
|
894
894
|
"context",
|
|
895
895
|
[...entries.entries()]
|
|
896
896
|
.toSorted(
|
|
897
|
-
([
|
|
898
|
-
getHashMapBucket(first, capacity) - getHashMapBucket(second, capacity),
|
|
897
|
+
(left, right) => getHashMapBucket(left[0], capacity) - getHashMapBucket(right[0], capacity),
|
|
899
898
|
)
|
|
900
|
-
.map((
|
|
899
|
+
.map((pair) => createElement("entry", [createText("UID", pair[0]), pair[1]])),
|
|
901
900
|
);
|
|
902
901
|
return createElement("modules", [
|
|
903
902
|
createText("RootModule", root.name),
|