tla-ts 0.0.10-dev.d618a2d79 → 0.0.10-dev.e3e5dd576
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 +49 -44
- package/dist/transfer.js +48 -43
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +14 -2
- package/src/bags.ts +50 -29
- package/src/builtins.ts +4 -3
- package/src/check-failure.ts +13 -11
- package/src/check-trace.ts +116 -64
- package/src/check.ts +516 -280
- 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 +190 -1
- package/src/dependencies.ts +68 -15
- package/src/dfid.ts +101 -36
- package/src/environment.ts +123 -38
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +370 -99
- package/src/exit-codes.ts +28 -14
- package/src/instances.ts +135 -11
- 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 +51 -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/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 +27 -1
- 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 +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 +1 -2
- 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 +1 -2
- package/src/prover/smt/solver/dt2bv-tactic.ts +57 -21
- 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 +608 -139
- 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 +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 +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 +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/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 +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/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 +65 -12
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +129 -43
- 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 +17 -7
- package/src/prover/smt/solver/sat/sat2goal.ts +72 -48
- 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 +713 -210
- 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 +350 -195
- 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-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 +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 +1274 -257
- package/src/runtime.ts +7 -1
- 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 +18 -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 +11 -6
- package/src/sany/xml.ts +2 -3
- package/src/search.ts +319 -135
- package/src/simulate.ts +235 -182
- package/src/spec-description.ts +8 -6
- package/src/standard-definitions.ts +1 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +564 -138
- package/src/successors.ts +37 -13
- 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 +67 -43
- 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/successors.ts
CHANGED
|
@@ -274,6 +274,7 @@ const getUnchangedVariables = (
|
|
|
274
274
|
|
|
275
275
|
const ACTION_KINDS = new Set([
|
|
276
276
|
"Label",
|
|
277
|
+
"Selection",
|
|
277
278
|
"And",
|
|
278
279
|
"Or",
|
|
279
280
|
"Exists",
|
|
@@ -723,6 +724,7 @@ const compileIdentifier = (
|
|
|
723
724
|
!definition ||
|
|
724
725
|
(expression.location.range && getStartupValue(definition, environment) !== undefined)
|
|
725
726
|
) {
|
|
727
|
+
// Deviation from TLC: Tool#getInitStates prints an unassigned variable's declaration as the non-boolean value it found.
|
|
726
728
|
guard(run, scope, partial, action, isFixed, onComplete);
|
|
727
729
|
return;
|
|
728
730
|
}
|
|
@@ -1091,10 +1093,16 @@ const compileAction = (
|
|
|
1091
1093
|
case "Let": {
|
|
1092
1094
|
const body = getChildRunner(expression.body);
|
|
1093
1095
|
const reevaluated = getReevaluatedDefinitions(expression.definitions, environment);
|
|
1096
|
+
// TLC's Tool#enabled binds a LET's definitions to lazy values it caches, where Tool#getNextStates evaluates them at every use.
|
|
1097
|
+
const cached = { impure: new Set<Definition>(), streamed: reevaluated.streamed };
|
|
1094
1098
|
return (run, scope, partial, action, isFixed, onComplete) =>
|
|
1095
1099
|
body(
|
|
1096
1100
|
run,
|
|
1097
|
-
bindDefinitions(
|
|
1101
|
+
bindDefinitions(
|
|
1102
|
+
expression.definitions,
|
|
1103
|
+
getContext(run, scope, partial),
|
|
1104
|
+
run.isEnabled ? cached : reevaluated,
|
|
1105
|
+
),
|
|
1098
1106
|
partial,
|
|
1099
1107
|
action,
|
|
1100
1108
|
isFixed,
|
|
@@ -1139,6 +1147,8 @@ const compileAction = (
|
|
|
1139
1147
|
);
|
|
1140
1148
|
case "Label":
|
|
1141
1149
|
return getChildRunner(expression.body);
|
|
1150
|
+
case "Selection":
|
|
1151
|
+
return getChildRunner(expression.expression);
|
|
1142
1152
|
case "Identifier":
|
|
1143
1153
|
return compileIdentifier(expression, environment, isInit);
|
|
1144
1154
|
case "FunctionApplication":
|
|
@@ -1203,7 +1213,9 @@ export const isEnabled = (expression: Expression, context: Context): boolean =>
|
|
|
1203
1213
|
);
|
|
1204
1214
|
}
|
|
1205
1215
|
const environment = context.environment;
|
|
1206
|
-
if (environment.callStack
|
|
1216
|
+
if (environment.callStack || (environment.coverage && environment.coverage.current !== -1)) {
|
|
1217
|
+
return replayEnabled(expression, context.scope, state, environment);
|
|
1218
|
+
}
|
|
1207
1219
|
const run: Run = {
|
|
1208
1220
|
environment,
|
|
1209
1221
|
isInit: false,
|
|
@@ -1280,6 +1292,20 @@ export const getInitialStates = (
|
|
|
1280
1292
|
return states;
|
|
1281
1293
|
};
|
|
1282
1294
|
|
|
1295
|
+
export const createIncompleteSuccessorError = (
|
|
1296
|
+
partial: State,
|
|
1297
|
+
action: string | undefined,
|
|
1298
|
+
environment: Environment,
|
|
1299
|
+
) => {
|
|
1300
|
+
const missing = environment.variables.filter((_name, index) => partial[index] === undefined);
|
|
1301
|
+
return new TlaIncompleteSuccessorError(
|
|
1302
|
+
`Successor state is not completely specified by action ${action ?? "Next"}. The following variables are not assigned: ${missing.join(", ")}`,
|
|
1303
|
+
partial,
|
|
1304
|
+
action,
|
|
1305
|
+
missing,
|
|
1306
|
+
);
|
|
1307
|
+
};
|
|
1308
|
+
|
|
1283
1309
|
export const forEachSuccessor = (
|
|
1284
1310
|
expression: Expression,
|
|
1285
1311
|
state: Value[],
|
|
@@ -1288,6 +1314,7 @@ export const forEachSuccessor = (
|
|
|
1288
1314
|
scope?: Scope,
|
|
1289
1315
|
generator?: JavaRandom,
|
|
1290
1316
|
onUnsatisfied?: Run["onUnsatisfied"],
|
|
1317
|
+
onIncomplete?: (state: State, action: string | undefined) => void,
|
|
1291
1318
|
) => {
|
|
1292
1319
|
const run: Run = {
|
|
1293
1320
|
environment,
|
|
@@ -1308,15 +1335,11 @@ export const forEachSuccessor = (
|
|
|
1308
1335
|
(partial, action) => {
|
|
1309
1336
|
if (run.isStopped) return;
|
|
1310
1337
|
if (!isComplete(partial)) {
|
|
1311
|
-
|
|
1312
|
-
(
|
|
1313
|
-
|
|
1314
|
-
|
|
1315
|
-
|
|
1316
|
-
partial,
|
|
1317
|
-
action,
|
|
1318
|
-
missing,
|
|
1319
|
-
);
|
|
1338
|
+
if (onIncomplete) {
|
|
1339
|
+
onIncomplete(partial, action);
|
|
1340
|
+
return;
|
|
1341
|
+
}
|
|
1342
|
+
throw createIncompleteSuccessorError(partial, action, environment);
|
|
1320
1343
|
}
|
|
1321
1344
|
run.successors++;
|
|
1322
1345
|
run.isStopped = onSuccessor({ state: partial, action });
|
|
@@ -1340,6 +1363,7 @@ export const hasIncompleteSuccessor = (
|
|
|
1340
1363
|
generator: undefined,
|
|
1341
1364
|
successors: 0,
|
|
1342
1365
|
};
|
|
1366
|
+
// TLC's Tool#getState generates every successor of the action before it compares them.
|
|
1343
1367
|
getRunner(expression, environment, false)(
|
|
1344
1368
|
run,
|
|
1345
1369
|
scope,
|
|
@@ -1347,10 +1371,10 @@ export const hasIncompleteSuccessor = (
|
|
|
1347
1371
|
undefined,
|
|
1348
1372
|
false,
|
|
1349
1373
|
(partial) => {
|
|
1350
|
-
if (!isComplete(partial)) run.
|
|
1374
|
+
if (!isComplete(partial)) run.successors++;
|
|
1351
1375
|
},
|
|
1352
1376
|
);
|
|
1353
|
-
return run.
|
|
1377
|
+
return run.successors > 0;
|
|
1354
1378
|
};
|
|
1355
1379
|
|
|
1356
1380
|
export const getSuccessors = (
|
package/src/symmetry.ts
CHANGED
|
@@ -24,7 +24,7 @@ export type Images = Map<string, ModelValue>;
|
|
|
24
24
|
|
|
25
25
|
const getPermutationKey = (permutation: Images) =>
|
|
26
26
|
[...permutation]
|
|
27
|
-
.map((
|
|
27
|
+
.map((entry) => `${entry[0]}>${entry[1].name}`)
|
|
28
28
|
.sort()
|
|
29
29
|
.join(",");
|
|
30
30
|
|
|
@@ -139,6 +139,7 @@ export const getSymmetryGroup = (
|
|
|
139
139
|
`The set${isPlural ? "s" : ""} ${names.join(", and ")} ${isPlural ? "have" : "has"} been defined to be a symmetry set but contain${isPlural ? "" : "s"} less than two elements.`,
|
|
140
140
|
);
|
|
141
141
|
};
|
|
142
|
+
// Deviation from TLC: MVPerms#permutationSubgroup sizes a util.Set one below the number of permutations, which throws for fewer than two.
|
|
142
143
|
if (permutedSets.length >= elements.length) {
|
|
143
144
|
warnSmallSets(permutedSets);
|
|
144
145
|
return undefined;
|
package/src/tlc/jar-data.ts
CHANGED
|
@@ -143,6 +143,16 @@ export const SANY_OPERATOR_SYNONYMS = [
|
|
|
143
143
|
["^+", "⁺"],
|
|
144
144
|
];
|
|
145
145
|
|
|
146
|
+
const SYNONYMS = new Map(
|
|
147
|
+
SANY_OPERATOR_SYNONYMS.flatMap((names) => names.slice(1).map((synonym) => [synonym, names[0]])),
|
|
148
|
+
);
|
|
149
|
+
|
|
150
|
+
export const resolveSynonym = (name: string) =>
|
|
151
|
+
name
|
|
152
|
+
.split("!")
|
|
153
|
+
.map((part) => SYNONYMS.get(part) ?? (part === "~" ? "\\lnot" : part))
|
|
154
|
+
.join("!");
|
|
155
|
+
|
|
146
156
|
export const TLC_STARTUP_STRINGS = [
|
|
147
157
|
"STRING",
|
|
148
158
|
"FALSE",
|
package/src/tlc/messages.ts
CHANGED
|
@@ -345,14 +345,14 @@ interface CodedMessage {
|
|
|
345
345
|
let codedMessagePatterns: { pattern: RegExp; message: CodedMessage }[] | undefined;
|
|
346
346
|
|
|
347
347
|
const getCodedMessagePatterns = () =>
|
|
348
|
-
(codedMessagePatterns ??= CODED_MESSAGES.map((
|
|
348
|
+
(codedMessagePatterns ??= CODED_MESSAGES.map((codedMessage) => ({
|
|
349
349
|
pattern: new RegExp(
|
|
350
|
-
`^${
|
|
350
|
+
`^${codedMessage[1]
|
|
351
351
|
.split(/%\d+%/)
|
|
352
352
|
.map((part) => part.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
|
|
353
353
|
.join("[\\s\\S]*")}$`,
|
|
354
354
|
),
|
|
355
|
-
message: { code, isEvalException },
|
|
355
|
+
message: { code: codedMessage[0], isEvalException: codedMessage[2] },
|
|
356
356
|
})));
|
|
357
357
|
|
|
358
358
|
const UNCODED_MESSAGE_PATTERN =
|
package/src/tlc/order.ts
CHANGED
|
@@ -444,7 +444,11 @@ const createContexts = (getParsed: ModuleSet) => {
|
|
|
444
444
|
};
|
|
445
445
|
};
|
|
446
446
|
|
|
447
|
-
const getStringOrder = (
|
|
447
|
+
const getStringOrder = (
|
|
448
|
+
getParsed: ModuleSet,
|
|
449
|
+
config: ModelConfig,
|
|
450
|
+
runtimeModules: string[],
|
|
451
|
+
): string[] => {
|
|
448
452
|
const order = new Set<string>();
|
|
449
453
|
const intern = (text: string) => {
|
|
450
454
|
order.add(text);
|
|
@@ -541,12 +545,19 @@ const getStringOrder = (getParsed: ModuleSet, config: ModelConfig): string[] =>
|
|
|
541
545
|
});
|
|
542
546
|
};
|
|
543
547
|
analyze(undefined);
|
|
548
|
+
runtimeModules.forEach((name) => {
|
|
549
|
+
const tokens = getUnitTokens(name);
|
|
550
|
+
getParsedTexts(tokens).forEach(intern);
|
|
551
|
+
tokens.forEach((token) => {
|
|
552
|
+
if (token.kind === "String") intern(token.text);
|
|
553
|
+
});
|
|
554
|
+
});
|
|
544
555
|
TLC_RUNTIME_STRINGS.forEach(intern);
|
|
545
556
|
return [...order];
|
|
546
557
|
};
|
|
547
558
|
|
|
548
559
|
export interface TlcOrder {
|
|
549
|
-
getStringOrder: (config: ModelConfig) => string[];
|
|
560
|
+
getStringOrder: (config: ModelConfig, runtimeModules: string[]) => string[];
|
|
550
561
|
getDeclarationOrder: (kind: "variable" | "constant") => string[];
|
|
551
562
|
createDefinitionOrder: () => (name: string | undefined) => string[];
|
|
552
563
|
parseModule: (source: string) => Module;
|
|
@@ -558,7 +569,7 @@ export const createTlcOrder = (source: string, loadModule: ModuleLoader): TlcOrd
|
|
|
558
569
|
let contexts: ReturnType<typeof createContexts> | undefined;
|
|
559
570
|
const getContexts = () => (contexts ??= createContexts(getParsed));
|
|
560
571
|
return {
|
|
561
|
-
getStringOrder: (config) => getStringOrder(getParsed, config),
|
|
572
|
+
getStringOrder: (config, runtimeModules) => getStringOrder(getParsed, config, runtimeModules),
|
|
562
573
|
getDeclarationOrder: (kind) =>
|
|
563
574
|
getContexts()
|
|
564
575
|
.getContext(undefined)
|
package/src/tlc/random.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { toEnumeratedSet } from "../builtins";
|
|
2
2
|
import { TlaEvaluationError } from "../errors";
|
|
3
|
+
import { prettyPrint } from "../pretty-print";
|
|
3
4
|
import type { TlcVersion } from "./version";
|
|
4
5
|
import {
|
|
5
6
|
createRecord,
|
|
@@ -226,7 +227,7 @@ export const getRandomElement = (set: Value, random: JavaRandom): Value => {
|
|
|
226
227
|
const offset = Math.floor(random.nextDouble() * size);
|
|
227
228
|
if (offset >= size) {
|
|
228
229
|
throw new TlaEvaluationError(
|
|
229
|
-
`Attempted to retrieve out-of-bounds element from the interval value ${formatValue(set)}.`,
|
|
230
|
+
`Attempted to retrieve out-of-bounds element from the interval value ${prettyPrint(formatValue(set))}.`,
|
|
230
231
|
);
|
|
231
232
|
}
|
|
232
233
|
return set.low + offset;
|
package/src/tlc/replay.ts
CHANGED
|
@@ -2,8 +2,9 @@ import type { Expression, SourceLocation } from "../ast";
|
|
|
2
2
|
import { TlaEvaluationError } from "../errors";
|
|
3
3
|
import { isConstantLevel } from "../dependencies";
|
|
4
4
|
import {
|
|
5
|
+
chargeContexts,
|
|
5
6
|
countCoverage,
|
|
6
|
-
|
|
7
|
+
createChargedEnumerator,
|
|
7
8
|
getCoverageNode,
|
|
8
9
|
runAtCoverageNode,
|
|
9
10
|
type Coverage,
|
|
@@ -61,7 +62,7 @@ interface Replay {
|
|
|
61
62
|
isEnabled: boolean;
|
|
62
63
|
current: Value[] | undefined;
|
|
63
64
|
onState: (state: Value[]) => void;
|
|
64
|
-
onIncomplete: ((state: State) =>
|
|
65
|
+
onIncomplete: ((state: State) => boolean) | undefined;
|
|
65
66
|
}
|
|
66
67
|
|
|
67
68
|
const withFrame = <Result>(replay: Replay, expression: Expression, run: () => Result): Result => {
|
|
@@ -216,8 +217,7 @@ const proceedItems = (
|
|
|
216
217
|
): boolean => {
|
|
217
218
|
if (items === undefined) {
|
|
218
219
|
if (isComplete(partial)) return addState(replay, partial, node);
|
|
219
|
-
replay.onIncomplete?.(partial);
|
|
220
|
-
return false;
|
|
220
|
+
return replay.onIncomplete?.(partial) ?? false;
|
|
221
221
|
}
|
|
222
222
|
if (isComplete(partial) && isAssignedShortcut(replay)) {
|
|
223
223
|
return proceedAssigned(replay, items, partial, node);
|
|
@@ -309,16 +309,19 @@ const visitAt = (
|
|
|
309
309
|
case "Let": {
|
|
310
310
|
const context = getContext(replay, scope, partial);
|
|
311
311
|
const definitions = expression.definitions;
|
|
312
|
-
const bound =
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
312
|
+
const bound =
|
|
313
|
+
replay.coverage && !replay.isEnabled
|
|
314
|
+
? bindDefinitions(definitions, context, {
|
|
315
|
+
impure: new Set(definitions),
|
|
316
|
+
streamed: new Set(),
|
|
317
|
+
})
|
|
318
|
+
: bindDefinitions(definitions, context);
|
|
318
319
|
return visit(replay, expression.body, items, bound, partial, node);
|
|
319
320
|
}
|
|
320
321
|
case "Label":
|
|
321
322
|
return visit(replay, expression.body, items, scope, partial, node);
|
|
323
|
+
case "Selection":
|
|
324
|
+
return visit(replay, expression.expression, items, scope, partial, node);
|
|
322
325
|
default:
|
|
323
326
|
if (LITERAL_KINDS.has(expression.kind))
|
|
324
327
|
throw new TlaEvaluationError("The state relation is not a boolean expression.");
|
|
@@ -434,11 +437,6 @@ const createItem = (
|
|
|
434
437
|
rest: ActionItem | undefined,
|
|
435
438
|
): ActionItem => ({ kind, expression, scope, node, rest });
|
|
436
439
|
|
|
437
|
-
const getEnumerated = (replay: Replay, set: Value, elements: Value[]) => {
|
|
438
|
-
if (replay.coverage) costCoverage(replay.coverage, set, elements.length + 1);
|
|
439
|
-
return elements;
|
|
440
|
-
};
|
|
441
|
-
|
|
442
440
|
const visitAssignment = (
|
|
443
441
|
replay: Replay,
|
|
444
442
|
expression: Expression & { kind: "Apply" },
|
|
@@ -473,11 +471,15 @@ const visitAssignment = (
|
|
|
473
471
|
}
|
|
474
472
|
if (!isTlcEnumerable(set))
|
|
475
473
|
throw new TlaEvaluationError("The right side of \\IN is not enumerable.");
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
474
|
+
const elements = getStreamedElements(set);
|
|
475
|
+
const enumerator =
|
|
476
|
+
replay.coverage && createChargedEnumerator(replay.coverage, set, elements, false);
|
|
477
|
+
const isProduced = elements.reduce<boolean>((isProduced, element) => {
|
|
478
|
+
enumerator?.next();
|
|
479
|
+
return proceed(replay, items, assign(partial, index, element), node) || isProduced;
|
|
480
|
+
}, false);
|
|
481
|
+
enumerator?.next();
|
|
482
|
+
return isProduced;
|
|
481
483
|
};
|
|
482
484
|
|
|
483
485
|
const ASSIGNMENT_OPERATORS = new Set(["=", "\\in", "\\subseteq"]);
|
|
@@ -520,19 +522,26 @@ const getBindings = (
|
|
|
520
522
|
) => {
|
|
521
523
|
const bindings: (Scope | undefined)[] = [];
|
|
522
524
|
const version = replay.environment.runtime.version;
|
|
523
|
-
const
|
|
525
|
+
const bounded = runAt(replay, node, () =>
|
|
524
526
|
mapBoundSets(expression.bounds, (set) => {
|
|
525
527
|
const value = evaluate(set, context);
|
|
526
|
-
|
|
527
|
-
if (Array.isArray(elements)) getEnumerated(replay, value, elements);
|
|
528
|
-
return elements;
|
|
528
|
+
return { value, elements: getQuantifierElements(value, set, version) };
|
|
529
529
|
}),
|
|
530
530
|
);
|
|
531
|
+
const sets = bounded.map((item) => item.elements);
|
|
531
532
|
forEachBoundElement(expression.bounds, sets, context.scope, (bound) => {
|
|
532
533
|
bindings.push(bound);
|
|
533
534
|
return false;
|
|
534
535
|
});
|
|
535
|
-
|
|
536
|
+
const coverage = replay.coverage;
|
|
537
|
+
const charge =
|
|
538
|
+
coverage &&
|
|
539
|
+
chargeContexts(
|
|
540
|
+
coverage,
|
|
541
|
+
bounded.map((item) => item.value),
|
|
542
|
+
sets,
|
|
543
|
+
);
|
|
544
|
+
return { bindings, charge };
|
|
536
545
|
};
|
|
537
546
|
|
|
538
547
|
const visitApplication = (
|
|
@@ -607,14 +616,17 @@ const visitApplication = (
|
|
|
607
616
|
);
|
|
608
617
|
return isPrefixProduced || isLastProduced;
|
|
609
618
|
}
|
|
610
|
-
case "Exists":
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
);
|
|
619
|
+
case "Exists": {
|
|
620
|
+
const bound = getBindings(replay, expression, context, node);
|
|
621
|
+
return bound.bindings.reduce((isProduced, scope) => {
|
|
622
|
+
bound.charge?.();
|
|
623
|
+
return visit(replay, expression.body, items, scope, partial, node) || isProduced;
|
|
624
|
+
}, false);
|
|
625
|
+
}
|
|
616
626
|
case "Forall": {
|
|
617
|
-
const
|
|
627
|
+
const bound = getBindings(replay, expression, context, node);
|
|
628
|
+
const bounds = bound.bindings;
|
|
629
|
+
bounds.forEach(() => bound.charge?.());
|
|
618
630
|
if (bounds.length === 0) return proceed(replay, items, partial, node);
|
|
619
631
|
const rest = bounds
|
|
620
632
|
.slice(1)
|
|
@@ -715,6 +727,7 @@ const visitUnchanged = (
|
|
|
715
727
|
if (index !== undefined) {
|
|
716
728
|
const value = replay.current?.[index];
|
|
717
729
|
if (value === undefined) return false;
|
|
730
|
+
if (replay.isEnabled && replay.coverage) countCoverage(replay.coverage, node);
|
|
718
731
|
const assigned = partial[index];
|
|
719
732
|
if (assigned !== undefined && !isEqualLikeTlc(assigned, value)) {
|
|
720
733
|
warnChangedUnchanged(replay.environment, index, expression);
|
|
@@ -779,11 +792,12 @@ const createReplay = (
|
|
|
779
792
|
kind: "init" | "next" | "enabled",
|
|
780
793
|
current: Value[] | undefined,
|
|
781
794
|
onState: (state: Value[]) => void,
|
|
782
|
-
onIncomplete?: (state: State) =>
|
|
795
|
+
onIncomplete?: (state: State) => boolean,
|
|
783
796
|
): Replay => ({
|
|
784
797
|
environment,
|
|
785
798
|
callStack: environment.callStack,
|
|
786
|
-
coverage:
|
|
799
|
+
coverage:
|
|
800
|
+
kind === "enabled" && environment.coverage?.current === -1 ? undefined : environment.coverage,
|
|
787
801
|
isInit: kind === "init",
|
|
788
802
|
isEnabled: kind === "enabled",
|
|
789
803
|
current,
|
|
@@ -799,17 +813,19 @@ export const replayEnabled = (
|
|
|
799
813
|
state: Value[],
|
|
800
814
|
environment: Environment,
|
|
801
815
|
) => {
|
|
802
|
-
const
|
|
816
|
+
const found = () => {
|
|
803
817
|
throw ENABLED_FOUND;
|
|
804
|
-
}
|
|
818
|
+
};
|
|
819
|
+
const node = environment.coverage?.current ?? -1;
|
|
820
|
+
const replay = createReplay(environment, "enabled", state, found, found);
|
|
805
821
|
const callStack = replay.callStack;
|
|
806
822
|
const depth = callStack?.expressions.length ?? 0;
|
|
807
823
|
try {
|
|
808
824
|
if (expression.kind === "AngleAction" && expression.location === expression.action.location) {
|
|
809
|
-
const changed = createItem("Changed", expression.subscript, scope,
|
|
810
|
-
visit(replay, expression.action, changed, scope, getEmptyState(environment),
|
|
825
|
+
const changed = createItem("Changed", expression.subscript, scope, node, undefined);
|
|
826
|
+
visit(replay, expression.action, changed, scope, getEmptyState(environment), node);
|
|
811
827
|
} else {
|
|
812
|
-
visit(replay, expression, undefined, scope, getEmptyState(environment),
|
|
828
|
+
visit(replay, expression, undefined, scope, getEmptyState(environment), node);
|
|
813
829
|
}
|
|
814
830
|
return false;
|
|
815
831
|
} catch (error) {
|
|
@@ -826,7 +842,7 @@ export const replayInitialStates = (
|
|
|
826
842
|
inits: (ReplayAction & { node?: number })[],
|
|
827
843
|
environment: Environment,
|
|
828
844
|
onState: (state: Value[]) => void,
|
|
829
|
-
onIncomplete?: (state: State) =>
|
|
845
|
+
onIncomplete?: (state: State) => boolean,
|
|
830
846
|
) => {
|
|
831
847
|
const [first, ...others] = inits;
|
|
832
848
|
if (first === undefined) return;
|
|
@@ -838,16 +854,21 @@ export const replayInitialStates = (
|
|
|
838
854
|
visit(replay, first.expression, rest, first.scope, getEmptyState(environment), first.node ?? -1);
|
|
839
855
|
};
|
|
840
856
|
|
|
841
|
-
export const replaySuccessors = <Action extends ReplayAction>(
|
|
857
|
+
export const replaySuccessors = <Action extends ReplayAction & { node?: number }>(
|
|
842
858
|
actions: Action[],
|
|
843
859
|
state: Value[],
|
|
844
860
|
environment: Environment,
|
|
845
861
|
onState: (state: Value[], action: Action) => void,
|
|
846
862
|
) => {
|
|
847
863
|
if (actions.some((action) => LITERAL_KINDS.has(action.expression.kind))) return;
|
|
864
|
+
const coverage = environment.coverage;
|
|
848
865
|
actions.forEach((action) => {
|
|
849
866
|
const successors: Value[][] = [];
|
|
850
|
-
|
|
867
|
+
const node = action.node ?? -1;
|
|
868
|
+
walkSuccessors(action, node, state, environment, (next) => {
|
|
869
|
+
if (coverage && node !== -1) coverage.primary[node]++;
|
|
870
|
+
successors.push(next);
|
|
871
|
+
});
|
|
851
872
|
successors.forEach((successor) => onState(successor, action));
|
|
852
873
|
});
|
|
853
874
|
};
|
|
@@ -858,7 +879,7 @@ export const walkSuccessors = (
|
|
|
858
879
|
state: Value[],
|
|
859
880
|
environment: Environment,
|
|
860
881
|
onState: (state: Value[]) => void,
|
|
861
|
-
onIncomplete?: (state: State) =>
|
|
882
|
+
onIncomplete?: (state: State) => boolean,
|
|
862
883
|
) => {
|
|
863
884
|
const replay = createReplay(environment, "next", state, onState, onIncomplete);
|
|
864
885
|
visit(replay, action.expression, undefined, action.scope, getEmptyState(environment), node);
|
|
@@ -907,6 +928,9 @@ export const getPrimedRanges = (actions: ReplayAction[], environment: Environmen
|
|
|
907
928
|
case "Label":
|
|
908
929
|
collect(expression.body, scope, visited);
|
|
909
930
|
return;
|
|
931
|
+
case "Selection":
|
|
932
|
+
collect(expression.expression, scope, visited);
|
|
933
|
+
return;
|
|
910
934
|
case "FunctionApplication":
|
|
911
935
|
collect(expression.function, scope, visited);
|
|
912
936
|
return;
|
package/src/tlc/tlc-operators.ts
CHANGED
|
@@ -16,12 +16,13 @@ import {
|
|
|
16
16
|
toEnumeratedSet,
|
|
17
17
|
} from "../builtins";
|
|
18
18
|
import { getNamedRegisters, NAMED_REGISTER_PREFIX, type CheckerRuntime } from "../runtime";
|
|
19
|
-
import { createActionRecord, setTlcValue } from "./tlcext-operators";
|
|
19
|
+
import { createActionRecord, createTlcRecord, setTlcValue } from "./tlcext-operators";
|
|
20
20
|
import { getRandomElement } from "./random";
|
|
21
21
|
import {
|
|
22
22
|
ANY_SET,
|
|
23
23
|
createFunction,
|
|
24
24
|
createSet,
|
|
25
|
+
createSortedFunction,
|
|
25
26
|
createTuple,
|
|
26
27
|
createWrittenFunction,
|
|
27
28
|
formatNormalizedCopies,
|
|
@@ -34,7 +35,6 @@ import {
|
|
|
34
35
|
toFiniteSet,
|
|
35
36
|
type Value,
|
|
36
37
|
rankString,
|
|
37
|
-
setFunctionClass,
|
|
38
38
|
} from "../values";
|
|
39
39
|
import { getFingerprintPolynomial } from "./fingerprint";
|
|
40
40
|
import { zeroPad } from "./messages";
|
|
@@ -43,10 +43,9 @@ const formatCalendarVersion = (date: Date) =>
|
|
|
43
43
|
`${date.getUTCFullYear()}.${zeroPad(date.getUTCMonth() + 1)}.${zeroPad(date.getUTCDate())}.${zeroPad(date.getUTCHours())}${zeroPad(date.getUTCMinutes())}${zeroPad(date.getUTCSeconds())}`;
|
|
44
44
|
|
|
45
45
|
const getRegisterFunction = <Key extends Value>(registers: Map<Key, Value>) =>
|
|
46
|
-
createFunction(
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
setFunctionClass(createWrittenFunction(fields), "record");
|
|
46
|
+
createFunction(
|
|
47
|
+
[...registers].map((entry): [Value, Value] => [entry[0], createTuple([entry[1]])]),
|
|
48
|
+
);
|
|
50
49
|
|
|
51
50
|
const CHECKER_KEYS = new Set(["diameter", "generated", "distinct", "queue", "stats", "config"]);
|
|
52
51
|
const TLC_174_KEYS = new Set(["diameter", "distinct", "queue", "duration", "level"]);
|
|
@@ -133,7 +132,7 @@ const getTlcValue = (runtime: CheckerRuntime, key: Value, context: Context | und
|
|
|
133
132
|
}
|
|
134
133
|
if (typeof key !== "string") {
|
|
135
134
|
throw new TlaModuleError(
|
|
136
|
-
`The argument of TLCGet should be a nonnegative integer, but instead it is:\n${formatValue(key)}`,
|
|
135
|
+
`The argument of TLCGet should be a nonnegative integer, but instead it is:\n${prettyPrint(formatValue(key))}`,
|
|
137
136
|
);
|
|
138
137
|
}
|
|
139
138
|
return getRuntimeValue(runtime, key, context?.state);
|
|
@@ -160,8 +159,11 @@ const normalizeDeeply = (value: Value): void => {
|
|
|
160
159
|
const convertLikeTlcEval = (value: Value): Value => {
|
|
161
160
|
if (typeof value !== "object") return value;
|
|
162
161
|
switch (value.kind) {
|
|
163
|
-
case "ModelValue":
|
|
164
162
|
case "Function":
|
|
163
|
+
return value.functionClass === undefined
|
|
164
|
+
? value
|
|
165
|
+
: createSortedFunction(value.domain, value.range);
|
|
166
|
+
case "ModelValue":
|
|
165
167
|
case "MixedSet":
|
|
166
168
|
case "InfiniteSet":
|
|
167
169
|
case "SequenceSet":
|