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
|
@@ -10,6 +10,7 @@ import type {
|
|
|
10
10
|
UseOrHide,
|
|
11
11
|
} from "../ast";
|
|
12
12
|
import { TlaSyntaxError } from "../errors";
|
|
13
|
+
import { defEntryErrors, getDefEntryBinder } from "../parser";
|
|
13
14
|
import { createLevelFields } from "./builtins";
|
|
14
15
|
import {
|
|
15
16
|
addToContext,
|
|
@@ -66,10 +67,10 @@ import {
|
|
|
66
67
|
pushLabelScope,
|
|
67
68
|
resolveModule,
|
|
68
69
|
resolveName,
|
|
69
|
-
resolveSynonym,
|
|
70
70
|
withContext,
|
|
71
71
|
} from "./generation";
|
|
72
|
-
import {
|
|
72
|
+
import { resolveSynonym } from "../tlc/jar-data";
|
|
73
|
+
import { getOperandSpan } from "./generator-def-entries";
|
|
73
74
|
import {
|
|
74
75
|
generateInstance,
|
|
75
76
|
getOperatorSpan,
|
|
@@ -108,9 +109,11 @@ const getFactModules = (generation: ModuleGeneration, fact: Fact & { kind: "Modu
|
|
|
108
109
|
const generateFacts = (generation: ModuleGeneration, facts: Fact[]) =>
|
|
109
110
|
facts.flatMap((fact): FactNode[] => {
|
|
110
111
|
if (fact.kind === "ModuleFact") return getFactModules(generation, fact);
|
|
111
|
-
const
|
|
112
|
+
const reference: Expression =
|
|
113
|
+
fact.kind === "ExceptAt" ? { kind: "Identifier", name: "@", location: fact.location } : fact;
|
|
114
|
+
const items = getSelectorItems(reference);
|
|
112
115
|
if (items === undefined || !isGeneralId(items)) return [generateExpression(generation, fact)];
|
|
113
|
-
const node = generateSelector(generation,
|
|
116
|
+
const node = generateSelector(generation, reference, 0, true, false);
|
|
114
117
|
if (node.kind === "ThmOrAssumpDef") throw new TlaSyntaxError("Expected a fact");
|
|
115
118
|
return [node];
|
|
116
119
|
});
|
|
@@ -118,23 +121,26 @@ const generateFacts = (generation: ModuleGeneration, facts: Fact[]) =>
|
|
|
118
121
|
const generateDefs = (generation: ModuleGeneration, defs: Fact[]) =>
|
|
119
122
|
defs.flatMap((fact): UseOrHideNode["defs"] => {
|
|
120
123
|
if (fact.kind === "ModuleFact") return getFactModules(generation, fact);
|
|
121
|
-
|
|
124
|
+
const entryErrors = defEntryErrors.get(fact) ?? [];
|
|
125
|
+
entryErrors.forEach((error) => generation.addError(error.location, error.message));
|
|
126
|
+
if (entryErrors.length > 0) return [];
|
|
127
|
+
const location = getLocation(generation.file, fact);
|
|
128
|
+
// Deviation from SANY: Generator#genIdToSelector throws an internal error on the arguments of a name after a prefix, as in DEF A!B(1); tla-ts passes them to the selector, which rejects them.
|
|
122
129
|
const symbol = generateSelector(
|
|
123
130
|
generation,
|
|
124
|
-
fact
|
|
125
|
-
|
|
126
|
-
|
|
131
|
+
getDefEntryBinder(fact) ??
|
|
132
|
+
(fact.kind === "OperatorReference"
|
|
133
|
+
? { kind: "Identifier", name: fact.operator, location: fact.location }
|
|
134
|
+
: fact),
|
|
127
135
|
-1,
|
|
128
136
|
false,
|
|
129
137
|
true,
|
|
138
|
+
location,
|
|
130
139
|
);
|
|
131
140
|
const isDefinition =
|
|
132
141
|
symbol.kind === "OpDef" || (symbol.kind === "ThmOrAssumpDef" && !symbol.name.startsWith("<"));
|
|
133
142
|
if (!isDefinition) {
|
|
134
|
-
generation.addError(
|
|
135
|
-
getLocation(generation.file, fact),
|
|
136
|
-
"DEF clause entry should describe a defined operator.",
|
|
137
|
-
);
|
|
143
|
+
generation.addError(location, "DEF clause entry should describe a defined operator.");
|
|
138
144
|
return [];
|
|
139
145
|
}
|
|
140
146
|
return [symbol];
|
|
@@ -157,6 +163,7 @@ export const generateUseOrHide = (generation: ModuleGeneration, use: UseOrHide):
|
|
|
157
163
|
if (facts.length + defs.length === 0)
|
|
158
164
|
generation.addError(location, "Empty USE or HIDE statement.");
|
|
159
165
|
if (use.kind === "Hide") {
|
|
166
|
+
// Deviation from SANY: UseOrHideNode#factCheck crashes on a fact whose operator Generator#generateExpression could not resolve, where tla-ts reports it like a null node.
|
|
160
167
|
facts
|
|
161
168
|
.filter((fact) => fact.kind === "OpAppl" && fact.operator.kind !== "ThmOrAssumpDef")
|
|
162
169
|
.forEach((fact) =>
|
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
|
);
|
|
@@ -320,6 +321,7 @@ export const generateSanySpecification = (
|
|
|
320
321
|
file: SourceFile,
|
|
321
322
|
parent: ModuleNode | undefined,
|
|
322
323
|
contexts: Context[],
|
|
324
|
+
recursiveSections = { count: 0 },
|
|
323
325
|
): ModuleNode => {
|
|
324
326
|
const currentModule: ModuleNode = {
|
|
325
327
|
kind: "Module",
|
|
@@ -353,7 +355,7 @@ export const generateSanySpecification = (
|
|
|
353
355
|
curLevel: 0,
|
|
354
356
|
unresolvedCount: [0],
|
|
355
357
|
unresolvedSum: 0,
|
|
356
|
-
|
|
358
|
+
recursiveSections,
|
|
357
359
|
functions: [],
|
|
358
360
|
exceptStack: [],
|
|
359
361
|
exceptSpecStack: [],
|
|
@@ -502,10 +504,14 @@ export const generateSanySpecification = (
|
|
|
502
504
|
break;
|
|
503
505
|
case "Module": {
|
|
504
506
|
checkRecursiveSection(generation, unit.module.location, "A MODULE ");
|
|
505
|
-
const inner = generateModule(
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
507
|
+
const inner = generateModule(
|
|
508
|
+
unit.module,
|
|
509
|
+
file,
|
|
510
|
+
currentModule,
|
|
511
|
+
[...contexts, createContext()],
|
|
512
|
+
generation.recursiveSections,
|
|
513
|
+
);
|
|
514
|
+
currentModule.opDefsInRecursiveSection.push(...inner.opDefsInRecursiveSection);
|
|
509
515
|
const binding = resolveModule(generation, inner.name);
|
|
510
516
|
if (binding === undefined) addToContext(getTopContext(contexts), inner);
|
|
511
517
|
else if (binding !== inner) {
|
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
|
|
|
@@ -355,6 +355,15 @@ const getPositions = (source: string) => {
|
|
|
355
355
|
return { lines, columns };
|
|
356
356
|
};
|
|
357
357
|
|
|
358
|
+
// JavaCC places the end of the file at the file's last character.
|
|
359
|
+
export const getEndOfFile = (source: string) => {
|
|
360
|
+
const positions = getPositions(source);
|
|
361
|
+
return {
|
|
362
|
+
line: positions.lines[source.length - 1] ?? 0,
|
|
363
|
+
column: positions.columns[source.length - 1] ?? 0,
|
|
364
|
+
};
|
|
365
|
+
};
|
|
366
|
+
|
|
358
367
|
const STRING_PREFIX = /"(?:[^"\n\r\\]|\\[ntrf\\"])*\\?/y;
|
|
359
368
|
const LITERAL_PREFIXES = new Set(
|
|
360
369
|
[...LITERALS.keys()].flatMap((image) =>
|
|
@@ -382,8 +391,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
382
391
|
beginColumn: positions.columns[start] ?? 0,
|
|
383
392
|
next: undefined,
|
|
384
393
|
});
|
|
385
|
-
|
|
386
|
-
const getEndOfFile = () => createToken(getKind("EOF"), source.length - 1, 0);
|
|
394
|
+
const createEndOfFile = () => createToken(getKind("EOF"), source.length - 1, 0);
|
|
387
395
|
const getLexicalError = (start: number, end: number, after: string) => {
|
|
388
396
|
const index = end - 1;
|
|
389
397
|
const line = positions.lines[index];
|
|
@@ -437,7 +445,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
437
445
|
}
|
|
438
446
|
nextOffset++;
|
|
439
447
|
}
|
|
440
|
-
return
|
|
448
|
+
return createEndOfFile();
|
|
441
449
|
};
|
|
442
450
|
const getNextToken = (): SanyToken | string => {
|
|
443
451
|
if (mode === "DEFAULT") return getSkippingToken(DEFAULT_PATTERNS);
|
|
@@ -462,7 +470,7 @@ export const createSanyLexer = (source: string) => {
|
|
|
462
470
|
return token;
|
|
463
471
|
}
|
|
464
472
|
}
|
|
465
|
-
return
|
|
473
|
+
return createEndOfFile();
|
|
466
474
|
};
|
|
467
475
|
return getNextToken;
|
|
468
476
|
};
|
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") {
|
|
@@ -517,6 +522,7 @@ export const createSelectorResolver =
|
|
|
517
522
|
);
|
|
518
523
|
}
|
|
519
524
|
if (item.op !== "Null" && item.op !== "@") {
|
|
525
|
+
// Deviation from SANY: Generator#selectorToNode names a numbered selector here by its syntax node, N_StructOp; tla-ts names it by its number.
|
|
520
526
|
return generator.addError(
|
|
521
527
|
getItemLocation(),
|
|
522
528
|
`Cannot use !${item.name} to select subexpression of a LAMBDA.`,
|
|
@@ -542,10 +548,10 @@ export const createSelectorResolver =
|
|
|
542
548
|
"Selecting subexpression of expression that has none.",
|
|
543
549
|
);
|
|
544
550
|
}
|
|
545
|
-
if (walk.node === undefined)
|
|
551
|
+
if (walk.node === undefined || isAbsent(walk.node))
|
|
546
552
|
return generator.addError(
|
|
547
553
|
getItemLocation(),
|
|
548
|
-
`An unexpected null node specified by '${item
|
|
554
|
+
`An unexpected null node specified by '${getSelectorItemName(item)}'.\nThis is probably due to a previous error.`,
|
|
549
555
|
);
|
|
550
556
|
if (walk.index !== items.length - 1) {
|
|
551
557
|
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),
|