tla-ts 0.0.10-dev.3a85c3a9e → 0.0.10-dev.45c0eaef5
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 +79 -79
- 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 -107
- package/src/check.ts +535 -281
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/tlc-arguments.ts +2 -2
- package/src/cli/tlc-output.ts +21 -7
- package/src/cli/tlc.ts +31 -11
- 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 +131 -41
- package/src/errors.ts +7 -0
- package/src/evaluate.ts +424 -135
- package/src/exit-codes.ts +28 -13
- 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 +204 -62
- 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/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 -10
- 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/containers.ts +7 -1
- package/src/prover/smt/solver/lp/core-solver.ts +12 -8
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
- 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/nex-creator.ts +3 -2
- package/src/prover/smt/solver/lp/nex.ts +2 -1
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -1
- package/src/prover/smt/solver/lp/nla-core.ts +26 -6
- package/src/prover/smt/solver/lp/nla-grobner.ts +158 -81
- package/src/prover/smt/solver/lp/nra-solver.ts +138 -95
- 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 -71
- 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 +20 -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 +4 -7
- 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 +10 -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/equality-rules.ts +24 -0
- package/src/prover/zenon/expr.ts +21 -0
- package/src/prover/zenon/index-table.ts +7 -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/prover/zenon/rules.ts +2 -1
- package/src/resolve.ts +1274 -258
- package/src/runtime.ts +25 -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 +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 +348 -153
- package/src/simulate.ts +250 -185
- package/src/spec-description.ts +15 -7
- package/src/standard-definitions.ts +5 -0
- package/src/standard-modules.ts +56 -22
- package/src/subexpressions.ts +564 -138
- 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 +87 -26
- package/src/tlc/trace-spec.ts +11 -25
- 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/dist/worker.cjs
CHANGED
|
@@ -6,19 +6,19 @@
|
|
|
6
6
|
* This source code is licensed under the MIT license found in the
|
|
7
7
|
* LICENSE file in the root directory of this source tree.
|
|
8
8
|
*/
|
|
9
|
-
const e={success:0,assumptionViolation:10,deadlock:11,safetyViolation:12,livenessViolation:13,assertViolation:14,specEvaluationFailure:75,safetyEvaluationFailure:76,livenessEvaluationFailure:77,specParseError:150,configParseError:151,error:255},t=new Map([...[...Array.from({length:24},(e,t)=>2222+t),2272,2273,2274,2280,2281,...Array.from({length:7},(e,t)=>5001+t)].map(t=>[t,e.configParseError]),[2253,e.livenessEvaluationFailure],[2109,e.specEvaluationFailure],[2115,e.specEvaluationFailure],[2103,e.specEvaluationFailure],[2147,e.specEvaluationFailure],[2111,e.safetyEvaluationFailure],[2146,e.safetyEvaluationFailure],[2107,e.safetyViolation],[2110,e.safetyViolation],[2112,e.livenessViolation],[2113,e.livenessViolation],[2116,e.livenessViolation],[2108,e.livenessViolation],[2114,e.deadlock],[2104,e.assumptionViolation],[2105,e.assumptionViolation],[2404,e.assumptionViolation],[2405,e.assumptionViolation],[2780,e.assumptionViolation],[2132,e.assertViolation],[2171,e.specParseError],[3002,e.specParseError]]),n=n=>t.get(n)??e.error,r=/* @__PURE__ */ new WeakMap,i=(e,t)=>(e instanceof Error&&!r.has(e)&&r.set(e,t),e),a=e=>r.get(e),o=t=>{try{return t()}catch(t){throw i(t,e.error)}},s=e=>
|
|
9
|
+
const e={success:0,abort:1,assumptionViolation:10,deadlock:11,safetyViolation:12,livenessViolation:13,assertViolation:14,specEvaluationFailure:75,safetyEvaluationFailure:76,livenessEvaluationFailure:77,specParseError:150,configParseError:151,error:255},t=new Map([...[...Array.from({length:24},(e,t)=>2222+t),2272,2273,2274,2280,2281,...Array.from({length:7},(e,t)=>5001+t)].map(t=>[t,e.configParseError]),[2253,e.livenessEvaluationFailure],[2109,e.specEvaluationFailure],[2115,e.specEvaluationFailure],[2103,e.specEvaluationFailure],[2147,e.specEvaluationFailure],[2111,e.safetyEvaluationFailure],[2146,e.safetyEvaluationFailure],[2107,e.safetyViolation],[2110,e.safetyViolation],[2112,e.livenessViolation],[2113,e.livenessViolation],[2116,e.livenessViolation],[2108,e.livenessViolation],[2114,e.deadlock],[2104,e.assumptionViolation],[2105,e.assumptionViolation],[2404,e.assumptionViolation],[2405,e.assumptionViolation],[2780,e.assumptionViolation],[2132,e.assertViolation],[2171,e.specParseError],[3002,e.specParseError]]),n=n=>t.get(n)??e.error,r=/* @__PURE__ */ new WeakMap,i=(e,t)=>(e instanceof Error&&!r.has(e)&&r.set(e,t),e),a=e=>r.get(e),o=t=>{try{return t()}catch(t){throw i(t,e.error)}},s=e=>({branches:e.branches,solutions:e.solutions,addInitialState:e.addInitialState,addState:(t,n,r,i)=>o(()=>e.addState(t,n,r,i)),storeState:e.storeState,getStateCounts:e.getStateCounts,findViolation:()=>o(()=>e.findViolation()),getViolatedProperties:(t,n)=>o(()=>e.getViolatedProperties(t,n))}),c=e=>{let t=o(e);return t&&s(t)},l=e=>{let t=o(e);return t&&{solutions:t.solutions,findTraceViolation:(e,n)=>o(()=>t.findTraceViolation(e,n))}},u=e=>`TLC threw an unexpected exception.\nThis was probably caused by an error in the spec or model.\nSee the User Output or TLC Console for clues to what happened.\nThe exception was a ${e}\n: `,d=u(`java.lang.RuntimeException`),ee=u(`tlc2.tool.EvalException`),te=e=>e instanceof RangeError&&e.message===`Maximum call stack size exceeded`||e instanceof SyntaxError&&e.message.endsWith(`: Stack overflow`);var f=class extends Error{constructor(e,t){super(e,{cause:t}),this.name=`TlaError`}},p=class extends f{failure;sany;constructor(e,t,n,r){super(e,t),this.name=`TlaSyntaxError`,this.failure=n,this.sany=r}},m=class extends p{location;parseError;constructor(e,t,n){super(e),this.location=t,this.parseError=n}},h=class extends m{constructor(e,t,n=!0){super(`Cannot find source file for module ${e} imported in module ${t}.`,n?t:void 0)}};const g=(e,t=!1,n,r=[])=>new p(e.map(e=>`${e.location}\n\n${e.message}`).join(`
|
|
10
10
|
|
|
11
|
-
`),void 0,void 0,{errors:e,warnings:r,isFatal:t,parseError:n}),
|
|
12
|
-
`)}`,
|
|
11
|
+
`),void 0,void 0,{errors:e,warnings:r,isFatal:t,parseError:n}),_=(e,t)=>g([{location:`In module ${t}`,message:`Cannot find source file for module ${e} imported in module ${t}.`}],!0),v=e=>`*** Warnings: ${e.length}\n\n${e.map(e=>`${e.location}\n\n${e.message}\n\n\n`).join(`
|
|
12
|
+
`)}`,y=e=>`line ${e.start.line}, col ${e.start.column} to line ${e.end.line}, col ${e.end.column} of module ${e.module}`;var b=class extends f{constructor(e,t){super(e,t),this.name=`TlaConfigError`}},x=class extends f{constructor(e,t){super(e,t),this.name=`TlaEvaluationError`}};const S=`This was a Java StackOverflowError. It was probably the result
|
|
13
13
|
of an incorrect recursive function definition that caused TLC to enter
|
|
14
14
|
an infinite loop when trying to compute the function or its application
|
|
15
|
-
to an element in its putative domain.`;var
|
|
15
|
+
to an element in its putative domain.`;var C=class extends x{constructor(){super(S)}};const w=()=>i(new C,e.error);var T=class extends x{},E=class extends x{state;action;variables;constructor(e,t,n,r){super(e),this.state=t,this.action=n,this.variables=r}},D=class extends x{variable;constructor(e,t){super(e),this.variable=t}},O=class extends x{exitCode;constructor(t,n=e.error){super(t),this.exitCode=n}},k=class extends x{constructor(t){super(t),i(this,e.error)}},A=class extends T{constructor(){super(`PickSuccessor reached the end of standard input without an answer whether to extend the behavior.`)}},j=class extends x{constructor(t){super(`The directory ${t} holds no checkpoint to recover from.`),i(this,e.error)}},M=class extends x{},N=class extends x{};const P=`Too many possible next states for the last state in the trace.`;var F=class extends x{constructor(){super(P)}},I=class extends x{code;constructor(e,t){super(t),this.code=e}},L=class extends x{state;constructor(e){super(`current state is not a legal state`),this.state=e}},R=class extends f{failure;exception;locus;constructor(e,t={}){super(e),this.locus=t.locus,this.name=`TlaProofError`,this.failure=t.exception===void 0?t.failure??e:void 0,this.exception=t.exception??`Failure(${JSON.stringify(this.failure)})`}},z=class extends R{constructor(e=`Assert_failure`){super(`Oops, this seems to be a bug in TLAPM.`,{exception:e})}},B=class extends f{constructor(e,t){super(e,t),this.name=`TlaProverError`}},V=class extends B{locus;constructor(e,t){super(e),this.name=`TlaMethodError`,this.locus=t}},ne=class extends f{constructor(e,t){super(e,t),this.name=`TlaZenonError`}},H=class{name=`TlaIsabelleError`;exception;message;constructor(e,t){this.exception=e,this.message=t}};const U=(e,t)=>e instanceof H&&e.exception===t;var W=class extends f{constructor(e,t){super(e,t),this.name=`TlaUnsupportedError`}},G=class extends f{constructor(e,t){super(e,t),this.name=`SmtUnsupportedError`}},K=class extends f{constructor(){super(`the SMT solver was canceled`),this.name=`SmtCanceledError`}},q=class extends f{constructor(e){super(e),this.name=`SmtDefaultError`}},J=class extends f{constructor(e){super(e),this.name=`SmtInvariantError`}},Y=class extends f{constructor(e){super(`nlsat does not implement ${e}`),this.name=`NlsatUnsupportedError`}},X=class extends f{constructor(){super(`the pdd manager ran out of nodes`),this.name=`PddMemoryOutError`}},Z=class extends f{line;column;constructor(e,t){super(e),this.name=`SmtParseError`,this.line=t.line,this.column=t.column}},re=class extends W{unwound;constructor(e,t){super(e),this.name=`TlaJavaException`,this.unwound=t}};const ie=t=>a(t)??(t instanceof p?e.specParseError:t instanceof b?e.configParseError:t instanceof x?e.specEvaluationFailure:e.error);var ae=class extends f{node;constructor(e,t){super(e),this.name=`PcalError`,this.node=t}},oe=class extends f{constructor(e){super(e),this.name=`PcalRuntimeError`}},se=class extends f{constructor(e){super(`You have discovered a bug in pcal.trans.\nSend the following information and the\ninput file to the current maintainer(s).\n\n -- ${e}.`),this.name=`PcalBugError`}},Q=class extends f{constructor(e,t){let n=t?.getSourceFile(),r=n?.getLineAndCharacterOfPosition(t?.getStart()??0);super(n===void 0||r===void 0?e:`${n.fileName}:${r.line+1}:${r.character+1} ${e}`),this.name=`TlaTypeScriptError`}};const $=`node:worker_threads`,ce=()=>typeof Worker==`function`||typeof process<`u`&&process.versions?.node!==void 0,le=async(e,t,n)=>{if(typeof Worker==`function`){let r=new Worker(e,{type:`module`});return r.addEventListener(`message`,e=>t(e.data)),r.addEventListener(`error`,n),r}let r=new(await(import(
|
|
16
16
|
/* @vite-ignore */
|
|
17
17
|
/* webpackIgnore: true */
|
|
18
|
-
|
|
18
|
+
$))).Worker(e);return r.on(`message`,t),r.on(`error`,n),{postMessage:(e,t)=>r.postMessage(e,t),terminate:()=>void r.terminate()}},ue=async()=>typeof globalThis.postMessage==`function`?globalThis:(await import(
|
|
19
19
|
/* @vite-ignore */
|
|
20
20
|
/* webpackIgnore: true */
|
|
21
|
-
|
|
21
|
+
$)).parentPort,de=()=>{let e=`Bun`in globalThis?import(
|
|
22
22
|
/* @vite-ignore */
|
|
23
23
|
/* webpackIgnore: true */
|
|
24
|
-
`bun:jsc`):void 0;return async()=>{(await e)?.edenGC(),await new Promise(e=>typeof setImmediate==`function`?setImmediate(e):setTimeout(e,0))}};Object.defineProperty(exports,"$",{enumerable:!0,get:function(){return
|
|
24
|
+
`bun:jsc`):void 0;return async()=>{(await e)?.edenGC(),await new Promise(e=>typeof setImmediate==`function`?setImmediate(e):setTimeout(e,0))}};Object.defineProperty(exports,"$",{enumerable:!0,get:function(){return u}}),Object.defineProperty(exports,"A",{enumerable:!0,get:function(){return O}}),Object.defineProperty(exports,"B",{enumerable:!0,get:function(){return T}}),Object.defineProperty(exports,"C",{enumerable:!0,get:function(){return L}}),Object.defineProperty(exports,"D",{enumerable:!0,get:function(){return V}}),Object.defineProperty(exports,"E",{enumerable:!0,get:function(){return re}}),Object.defineProperty(exports,"F",{enumerable:!0,get:function(){return C}}),Object.defineProperty(exports,"G",{enumerable:!0,get:function(){return ee}}),Object.defineProperty(exports,"H",{enumerable:!0,get:function(){return I}}),Object.defineProperty(exports,"I",{enumerable:!0,get:function(){return p}}),Object.defineProperty(exports,"J",{enumerable:!0,get:function(){return g}}),Object.defineProperty(exports,"K",{enumerable:!0,get:function(){return d}}),Object.defineProperty(exports,"L",{enumerable:!0,get:function(){return F}}),Object.defineProperty(exports,"M",{enumerable:!0,get:function(){return B}}),Object.defineProperty(exports,"N",{enumerable:!0,get:function(){return m}}),Object.defineProperty(exports,"O",{enumerable:!0,get:function(){return j}}),Object.defineProperty(exports,"P",{enumerable:!0,get:function(){return N}}),Object.defineProperty(exports,"Q",{enumerable:!0,get:function(){return ie}}),Object.defineProperty(exports,"R",{enumerable:!0,get:function(){return Q}}),Object.defineProperty(exports,"S",{enumerable:!0,get:function(){return k}}),Object.defineProperty(exports,"T",{enumerable:!0,get:function(){return H}}),Object.defineProperty(exports,"U",{enumerable:!0,get:function(){return ne}}),Object.defineProperty(exports,"V",{enumerable:!0,get:function(){return W}}),Object.defineProperty(exports,"W",{enumerable:!0,get:function(){return z}}),Object.defineProperty(exports,"X",{enumerable:!0,get:function(){return y}}),Object.defineProperty(exports,"Y",{enumerable:!0,get:function(){return w}}),Object.defineProperty(exports,"Z",{enumerable:!0,get:function(){return v}}),Object.defineProperty(exports,"_",{enumerable:!0,get:function(){return M}}),Object.defineProperty(exports,"a",{enumerable:!0,get:function(){return Y}}),Object.defineProperty(exports,"at",{enumerable:!0,get:function(){return i}}),Object.defineProperty(exports,"b",{enumerable:!0,get:function(){return f}}),Object.defineProperty(exports,"c",{enumerable:!0,get:function(){return oe}}),Object.defineProperty(exports,"d",{enumerable:!0,get:function(){return K}}),Object.defineProperty(exports,"et",{enumerable:!0,get:function(){return U}}),Object.defineProperty(exports,"f",{enumerable:!0,get:function(){return q}}),Object.defineProperty(exports,"g",{enumerable:!0,get:function(){return P}}),Object.defineProperty(exports,"h",{enumerable:!0,get:function(){return G}}),Object.defineProperty(exports,"i",{enumerable:!0,get:function(){return le}}),Object.defineProperty(exports,"it",{enumerable:!0,get:function(){return n}}),Object.defineProperty(exports,"j",{enumerable:!0,get:function(){return R}}),Object.defineProperty(exports,"k",{enumerable:!0,get:function(){return h}}),Object.defineProperty(exports,"l",{enumerable:!0,get:function(){return X}}),Object.defineProperty(exports,"m",{enumerable:!0,get:function(){return Z}}),Object.defineProperty(exports,"n",{enumerable:!0,get:function(){return ue}}),Object.defineProperty(exports,"nt",{enumerable:!0,get:function(){return e}}),Object.defineProperty(exports,"o",{enumerable:!0,get:function(){return se}}),Object.defineProperty(exports,"ot",{enumerable:!0,get:function(){return l}}),Object.defineProperty(exports,"p",{enumerable:!0,get:function(){return J}}),Object.defineProperty(exports,"q",{enumerable:!0,get:function(){return _}}),Object.defineProperty(exports,"r",{enumerable:!0,get:function(){return ce}}),Object.defineProperty(exports,"rt",{enumerable:!0,get:function(){return a}}),Object.defineProperty(exports,"s",{enumerable:!0,get:function(){return ae}}),Object.defineProperty(exports,"st",{enumerable:!0,get:function(){return c}}),Object.defineProperty(exports,"t",{enumerable:!0,get:function(){return de}}),Object.defineProperty(exports,"tt",{enumerable:!0,get:function(){return te}}),Object.defineProperty(exports,"u",{enumerable:!0,get:function(){return S}}),Object.defineProperty(exports,"v",{enumerable:!0,get:function(){return b}}),Object.defineProperty(exports,"w",{enumerable:!0,get:function(){return E}}),Object.defineProperty(exports,"x",{enumerable:!0,get:function(){return x}}),Object.defineProperty(exports,"y",{enumerable:!0,get:function(){return A}}),Object.defineProperty(exports,"z",{enumerable:!0,get:function(){return D}});
|
package/dist/worker.js
CHANGED
|
@@ -6,19 +6,19 @@
|
|
|
6
6
|
* This source code is licensed under the MIT license found in the
|
|
7
7
|
* LICENSE file in the root directory of this source tree.
|
|
8
8
|
*/
|
|
9
|
-
const e={success:0,assumptionViolation:10,deadlock:11,safetyViolation:12,livenessViolation:13,assertViolation:14,specEvaluationFailure:75,safetyEvaluationFailure:76,livenessEvaluationFailure:77,specParseError:150,configParseError:151,error:255},t=new Map([...[...Array.from({length:24},(e,t)=>2222+t),2272,2273,2274,2280,2281,...Array.from({length:7},(e,t)=>5001+t)].map(t=>[t,e.configParseError]),[2253,e.livenessEvaluationFailure],[2109,e.specEvaluationFailure],[2115,e.specEvaluationFailure],[2103,e.specEvaluationFailure],[2147,e.specEvaluationFailure],[2111,e.safetyEvaluationFailure],[2146,e.safetyEvaluationFailure],[2107,e.safetyViolation],[2110,e.safetyViolation],[2112,e.livenessViolation],[2113,e.livenessViolation],[2116,e.livenessViolation],[2108,e.livenessViolation],[2114,e.deadlock],[2104,e.assumptionViolation],[2105,e.assumptionViolation],[2404,e.assumptionViolation],[2405,e.assumptionViolation],[2780,e.assumptionViolation],[2132,e.assertViolation],[2171,e.specParseError],[3002,e.specParseError]]),n=n=>t.get(n)??e.error,r=/* @__PURE__ */ new WeakMap,i=(e,t)=>(e instanceof Error&&!r.has(e)&&r.set(e,t),e),a=e=>r.get(e),o=t=>{try{return t()}catch(t){throw i(t,e.error)}},s=e=>
|
|
9
|
+
const e={success:0,abort:1,assumptionViolation:10,deadlock:11,safetyViolation:12,livenessViolation:13,assertViolation:14,specEvaluationFailure:75,safetyEvaluationFailure:76,livenessEvaluationFailure:77,specParseError:150,configParseError:151,error:255},t=new Map([...[...Array.from({length:24},(e,t)=>2222+t),2272,2273,2274,2280,2281,...Array.from({length:7},(e,t)=>5001+t)].map(t=>[t,e.configParseError]),[2253,e.livenessEvaluationFailure],[2109,e.specEvaluationFailure],[2115,e.specEvaluationFailure],[2103,e.specEvaluationFailure],[2147,e.specEvaluationFailure],[2111,e.safetyEvaluationFailure],[2146,e.safetyEvaluationFailure],[2107,e.safetyViolation],[2110,e.safetyViolation],[2112,e.livenessViolation],[2113,e.livenessViolation],[2116,e.livenessViolation],[2108,e.livenessViolation],[2114,e.deadlock],[2104,e.assumptionViolation],[2105,e.assumptionViolation],[2404,e.assumptionViolation],[2405,e.assumptionViolation],[2780,e.assumptionViolation],[2132,e.assertViolation],[2171,e.specParseError],[3002,e.specParseError]]),n=n=>t.get(n)??e.error,r=/* @__PURE__ */ new WeakMap,i=(e,t)=>(e instanceof Error&&!r.has(e)&&r.set(e,t),e),a=e=>r.get(e),o=t=>{try{return t()}catch(t){throw i(t,e.error)}},s=e=>({branches:e.branches,solutions:e.solutions,addInitialState:e.addInitialState,addState:(t,n,r,i)=>o(()=>e.addState(t,n,r,i)),storeState:e.storeState,getStateCounts:e.getStateCounts,findViolation:()=>o(()=>e.findViolation()),getViolatedProperties:(t,n)=>o(()=>e.getViolatedProperties(t,n))}),c=e=>{let t=o(e);return t&&s(t)},l=e=>{let t=o(e);return t&&{solutions:t.solutions,findTraceViolation:(e,n)=>o(()=>t.findTraceViolation(e,n))}},u=e=>`TLC threw an unexpected exception.\nThis was probably caused by an error in the spec or model.\nSee the User Output or TLC Console for clues to what happened.\nThe exception was a ${e}\n: `,d=u(`java.lang.RuntimeException`),ee=u(`tlc2.tool.EvalException`),te=e=>e instanceof RangeError&&e.message===`Maximum call stack size exceeded`||e instanceof SyntaxError&&e.message.endsWith(`: Stack overflow`);var f=class extends Error{constructor(e,t){super(e,{cause:t}),this.name=`TlaError`}},p=class extends f{failure;sany;constructor(e,t,n,r){super(e,t),this.name=`TlaSyntaxError`,this.failure=n,this.sany=r}},m=class extends p{location;parseError;constructor(e,t,n){super(e),this.location=t,this.parseError=n}},h=class extends m{constructor(e,t,n=!0){super(`Cannot find source file for module ${e} imported in module ${t}.`,n?t:void 0)}};const g=(e,t=!1,n,r=[])=>new p(e.map(e=>`${e.location}\n\n${e.message}`).join(`
|
|
10
10
|
|
|
11
|
-
`),void 0,void 0,{errors:e,warnings:r,isFatal:t,parseError:n}),
|
|
12
|
-
`)}`,
|
|
11
|
+
`),void 0,void 0,{errors:e,warnings:r,isFatal:t,parseError:n}),_=(e,t)=>g([{location:`In module ${t}`,message:`Cannot find source file for module ${e} imported in module ${t}.`}],!0),v=e=>`*** Warnings: ${e.length}\n\n${e.map(e=>`${e.location}\n\n${e.message}\n\n\n`).join(`
|
|
12
|
+
`)}`,y=e=>`line ${e.start.line}, col ${e.start.column} to line ${e.end.line}, col ${e.end.column} of module ${e.module}`;var b=class extends f{constructor(e,t){super(e,t),this.name=`TlaConfigError`}},x=class extends f{constructor(e,t){super(e,t),this.name=`TlaEvaluationError`}};const S=`This was a Java StackOverflowError. It was probably the result
|
|
13
13
|
of an incorrect recursive function definition that caused TLC to enter
|
|
14
14
|
an infinite loop when trying to compute the function or its application
|
|
15
|
-
to an element in its putative domain.`;var
|
|
15
|
+
to an element in its putative domain.`;var C=class extends x{constructor(){super(S)}};const w=()=>i(new C,e.error);var T=class extends x{},E=class extends x{state;action;variables;constructor(e,t,n,r){super(e),this.state=t,this.action=n,this.variables=r}},D=class extends x{variable;constructor(e,t){super(e),this.variable=t}},O=class extends x{exitCode;constructor(t,n=e.error){super(t),this.exitCode=n}},k=class extends x{constructor(t){super(t),i(this,e.error)}},A=class extends T{constructor(){super(`PickSuccessor reached the end of standard input without an answer whether to extend the behavior.`)}},j=class extends x{constructor(t){super(`The directory ${t} holds no checkpoint to recover from.`),i(this,e.error)}},M=class extends x{},N=class extends x{};const P=`Too many possible next states for the last state in the trace.`;var F=class extends x{constructor(){super(P)}},I=class extends x{code;constructor(e,t){super(t),this.code=e}},L=class extends x{state;constructor(e){super(`current state is not a legal state`),this.state=e}},R=class extends f{failure;exception;locus;constructor(e,t={}){super(e),this.locus=t.locus,this.name=`TlaProofError`,this.failure=t.exception===void 0?t.failure??e:void 0,this.exception=t.exception??`Failure(${JSON.stringify(this.failure)})`}},z=class extends R{constructor(e=`Assert_failure`){super(`Oops, this seems to be a bug in TLAPM.`,{exception:e})}},B=class extends f{constructor(e,t){super(e,t),this.name=`TlaProverError`}},V=class extends B{locus;constructor(e,t){super(e),this.name=`TlaMethodError`,this.locus=t}},ne=class extends f{constructor(e,t){super(e,t),this.name=`TlaZenonError`}},H=class{name=`TlaIsabelleError`;exception;message;constructor(e,t){this.exception=e,this.message=t}};const U=(e,t)=>e instanceof H&&e.exception===t;var W=class extends f{constructor(e,t){super(e,t),this.name=`TlaUnsupportedError`}},G=class extends f{constructor(e,t){super(e,t),this.name=`SmtUnsupportedError`}},K=class extends f{constructor(){super(`the SMT solver was canceled`),this.name=`SmtCanceledError`}},q=class extends f{constructor(e){super(e),this.name=`SmtDefaultError`}},J=class extends f{constructor(e){super(e),this.name=`SmtInvariantError`}},Y=class extends f{constructor(e){super(`nlsat does not implement ${e}`),this.name=`NlsatUnsupportedError`}},X=class extends f{constructor(){super(`the pdd manager ran out of nodes`),this.name=`PddMemoryOutError`}},Z=class extends f{line;column;constructor(e,t){super(e),this.name=`SmtParseError`,this.line=t.line,this.column=t.column}},re=class extends W{unwound;constructor(e,t){super(e),this.name=`TlaJavaException`,this.unwound=t}};const ie=t=>a(t)??(t instanceof p?e.specParseError:t instanceof b?e.configParseError:t instanceof x?e.specEvaluationFailure:e.error);var ae=class extends f{node;constructor(e,t){super(e),this.name=`PcalError`,this.node=t}},oe=class extends f{constructor(e){super(e),this.name=`PcalRuntimeError`}},se=class extends f{constructor(e){super(`You have discovered a bug in pcal.trans.\nSend the following information and the\ninput file to the current maintainer(s).\n\n -- ${e}.`),this.name=`PcalBugError`}},Q=class extends f{constructor(e,t){let n=t?.getSourceFile(),r=n?.getLineAndCharacterOfPosition(t?.getStart()??0);super(n===void 0||r===void 0?e:`${n.fileName}:${r.line+1}:${r.character+1} ${e}`),this.name=`TlaTypeScriptError`}};const $=`node:worker_threads`,ce=()=>typeof Worker==`function`||typeof process<`u`&&process.versions?.node!==void 0,le=async(e,t,n)=>{if(typeof Worker==`function`){let r=new Worker(e,{type:`module`});return r.addEventListener(`message`,e=>t(e.data)),r.addEventListener(`error`,n),r}let r=new(await(import(
|
|
16
16
|
/* @vite-ignore */
|
|
17
17
|
/* webpackIgnore: true */
|
|
18
|
-
|
|
18
|
+
$))).Worker(e);return r.on(`message`,t),r.on(`error`,n),{postMessage:(e,t)=>r.postMessage(e,t),terminate:()=>void r.terminate()}},ue=async()=>typeof globalThis.postMessage==`function`?globalThis:(await import(
|
|
19
19
|
/* @vite-ignore */
|
|
20
20
|
/* webpackIgnore: true */
|
|
21
|
-
|
|
21
|
+
$)).parentPort,de=()=>{let e=`Bun`in globalThis?import(
|
|
22
22
|
/* @vite-ignore */
|
|
23
23
|
/* webpackIgnore: true */
|
|
24
|
-
`bun:jsc`):void 0;return async()=>{(await e)?.edenGC(),await new Promise(e=>typeof setImmediate==`function`?setImmediate(e):setTimeout(e,0))}};export{
|
|
24
|
+
`bun:jsc`):void 0;return async()=>{(await e)?.edenGC(),await new Promise(e=>typeof setImmediate==`function`?setImmediate(e):setTimeout(e,0))}};export{u as $,O as A,T as B,L as C,V as D,re as E,C as F,ee as G,I as H,p as I,g as J,d as K,F as L,B as M,m as N,j as O,N as P,ie as Q,Q as R,k as S,H as T,ne as U,W as V,z as W,y as X,w as Y,v as Z,M as _,Y as a,i as at,f as b,oe as c,K as d,U as et,q as f,P as g,G as h,le as i,n as it,R as j,h as k,X as l,Z as m,ue as n,e as nt,se as o,l as ot,J as p,_ as q,ce as r,a as rt,ae as s,c as st,de as t,te as tt,S as u,b as v,E as w,x,A as y,D as z};
|
package/package.json
CHANGED
package/src/ast.ts
CHANGED
|
@@ -122,6 +122,7 @@ export interface LetExpression {
|
|
|
122
122
|
kind: "Let";
|
|
123
123
|
definitions: Definition[];
|
|
124
124
|
instances?: Instance[];
|
|
125
|
+
recursive?: Declaration[];
|
|
125
126
|
body: Expression;
|
|
126
127
|
location: SourceLocation;
|
|
127
128
|
}
|
|
@@ -215,11 +216,12 @@ interface RecordExpression {
|
|
|
215
216
|
|
|
216
217
|
export type ExceptPathStep =
|
|
217
218
|
| { kind: "Field"; name: string }
|
|
218
|
-
| { kind: "Index"; args: Expression[] };
|
|
219
|
+
| { kind: "Index"; args: Expression[]; tupleRange: SourceRange };
|
|
219
220
|
|
|
220
221
|
interface ExceptUpdate {
|
|
221
222
|
path: ExceptPathStep[];
|
|
222
223
|
value: Expression;
|
|
224
|
+
range: SourceRange;
|
|
223
225
|
}
|
|
224
226
|
|
|
225
227
|
interface ExceptExpression {
|
|
@@ -306,6 +308,12 @@ interface SubexpressionExpression {
|
|
|
306
308
|
location: SourceLocation;
|
|
307
309
|
}
|
|
308
310
|
|
|
311
|
+
interface SelectionExpression {
|
|
312
|
+
kind: "Selection";
|
|
313
|
+
expression: Expression;
|
|
314
|
+
location: SourceLocation;
|
|
315
|
+
}
|
|
316
|
+
|
|
309
317
|
export type Expression =
|
|
310
318
|
| NumberExpression
|
|
311
319
|
| DecimalExpression
|
|
@@ -341,7 +349,8 @@ export type Expression =
|
|
|
341
349
|
| ActionExpression
|
|
342
350
|
| FairnessExpression
|
|
343
351
|
| LabelExpression
|
|
344
|
-
| SubexpressionExpression
|
|
352
|
+
| SubexpressionExpression
|
|
353
|
+
| SelectionExpression;
|
|
345
354
|
|
|
346
355
|
export interface OperatorParam {
|
|
347
356
|
name: string;
|
|
@@ -515,7 +524,24 @@ export interface Module {
|
|
|
515
524
|
theorems: Theorem[];
|
|
516
525
|
uses: UseOrHide[];
|
|
517
526
|
units: ModuleUnit[];
|
|
518
|
-
|
|
527
|
+
hasRecursiveLet: boolean;
|
|
528
|
+
}
|
|
529
|
+
|
|
530
|
+
const functionConstructions = new WeakMap<FunctionDefinition, Expression>();
|
|
531
|
+
|
|
532
|
+
export const getFunctionConstruction = (definition: FunctionDefinition, isLet: boolean) => {
|
|
533
|
+
const known = functionConstructions.get(definition);
|
|
534
|
+
if (known) return known;
|
|
535
|
+
const construction: Expression = {
|
|
536
|
+
kind: "FunctionConstruction",
|
|
537
|
+
bounds: definition.bounds,
|
|
538
|
+
body: definition.body,
|
|
539
|
+
location: definition.location,
|
|
540
|
+
isRecursive: isLet,
|
|
541
|
+
};
|
|
542
|
+
functionConstructions.set(definition, construction);
|
|
543
|
+
return construction;
|
|
544
|
+
};
|
|
519
545
|
|
|
520
546
|
export const getDefinitionExpressions = (definition: Definition) =>
|
|
521
547
|
definition.kind === "Function"
|
|
@@ -600,6 +626,8 @@ export const getChildren = (expression: Expression): Expression[] => {
|
|
|
600
626
|
return [expression.body];
|
|
601
627
|
case "Subexpression":
|
|
602
628
|
return expression.selectors.flatMap((selector) => ("args" in selector ? selector.args : []));
|
|
629
|
+
case "Selection":
|
|
630
|
+
return [expression.expression];
|
|
603
631
|
}
|
|
604
632
|
};
|
|
605
633
|
|
package/src/bags.ts
CHANGED
|
@@ -4,7 +4,6 @@ import {
|
|
|
4
4
|
defineConstant,
|
|
5
5
|
defineHigherOrderOperator,
|
|
6
6
|
defineOperator,
|
|
7
|
-
getJavaClassName,
|
|
8
7
|
getKindString,
|
|
9
8
|
getOperator,
|
|
10
9
|
getValue,
|
|
@@ -12,6 +11,7 @@ import {
|
|
|
12
11
|
} from "./builtins";
|
|
13
12
|
import { TlaEvaluationError, TlaModuleError } from "./errors";
|
|
14
13
|
import type { Builtin, BuiltinArgument } from "./evaluate";
|
|
14
|
+
import { prettyPrint } from "./pretty-print";
|
|
15
15
|
import {
|
|
16
16
|
createEnumeratedSet,
|
|
17
17
|
createFunction,
|
|
@@ -31,7 +31,7 @@ import {
|
|
|
31
31
|
|
|
32
32
|
const createWrongValueError = (name: string, expected: string, value: Value) =>
|
|
33
33
|
new TlaModuleError(
|
|
34
|
-
`Applying ${name} to the following value,\nwhich is not ${expected}:\n${formatValue(value)}`,
|
|
34
|
+
`Applying ${name} to the following value,\nwhich is not ${expected}:\n${prettyPrint(formatValue(value))}`,
|
|
35
35
|
);
|
|
36
36
|
|
|
37
37
|
const toFunction = (value: Value) => (isFunctionValue(value) ? toFiniteFunction(value) : undefined);
|
|
@@ -45,6 +45,7 @@ const getFunction = (args: BuiltinArgument[], index: number, name: string) => {
|
|
|
45
45
|
return functionValue;
|
|
46
46
|
};
|
|
47
47
|
|
|
48
|
+
// Deviation from TLC: Bags#BagIn and Bags#CopiesIn read the null that toFcnRcd gives for a value that isn't a function and leak a NullPointerException, where tla-ts reports the argument as not a bag.
|
|
48
49
|
const getCount = (args: BuiltinArgument[], name: string) => {
|
|
49
50
|
const bag = getValue(args, 1, name);
|
|
50
51
|
const functionValue = toFunction(bag);
|
|
@@ -55,6 +56,7 @@ const getCount = (args: BuiltinArgument[], name: string) => {
|
|
|
55
56
|
return count;
|
|
56
57
|
};
|
|
57
58
|
|
|
59
|
+
// Deviation from TLC: Bags#BagCup passes the null that toFcnRcd gives for a value that isn't a function to IsABag and leaks a NullPointerException, where tla-ts reports the argument as not a bag.
|
|
58
60
|
const getAddedBag = (
|
|
59
61
|
args: BuiltinArgument[],
|
|
60
62
|
functions: (FunctionValue | undefined)[],
|
|
@@ -85,34 +87,44 @@ const findCount = (functionValue: FunctionValue, element: Value) => {
|
|
|
85
87
|
return position === -1 ? undefined : functionValue.range[position];
|
|
86
88
|
};
|
|
87
89
|
|
|
88
|
-
|
|
90
|
+
// Deviation from TLC: Bags.java casts a count to IntValue and leaks the ClassCastException, where tla-ts reports the argument as not a bag.
|
|
91
|
+
const toCount = (value: Value, createError: () => TlaModuleError) => {
|
|
89
92
|
if (typeof value === "number") return value;
|
|
90
|
-
|
|
91
|
-
throw new TlaEvaluationError(
|
|
92
|
-
`class ${javaClass} cannot be cast to class tlc2.value.impl.IntValue (${javaClass} and tlc2.value.impl.IntValue are in unnamed module of loader 'app')`,
|
|
93
|
-
);
|
|
93
|
+
throw createError();
|
|
94
94
|
};
|
|
95
95
|
|
|
96
|
-
const addCounts = (left: Value, right: Value) => {
|
|
97
|
-
const sum = toCount(left) + toCount(right);
|
|
96
|
+
const addCounts = (left: Value, right: Value, createError: () => TlaModuleError) => {
|
|
97
|
+
const sum = toCount(left, createError) + toCount(right, createError);
|
|
98
98
|
if (isOutOfRange(sum)) throw createOverflowError(`${left}+${right}`);
|
|
99
99
|
return sum;
|
|
100
100
|
};
|
|
101
101
|
|
|
102
|
-
// Deviation from TLC: Bags
|
|
103
|
-
const subtractCounts = (
|
|
104
|
-
|
|
102
|
+
// Deviation from TLC: Bags#BagDiff subtracts counts as Java ints that wrap, where tla-ts reports the overflow as - does.
|
|
103
|
+
const subtractCounts = (
|
|
104
|
+
functionValue: FunctionValue,
|
|
105
|
+
index: number,
|
|
106
|
+
other: FunctionValue,
|
|
107
|
+
createLeftError: () => TlaModuleError,
|
|
108
|
+
createRightError: () => TlaModuleError,
|
|
109
|
+
) => {
|
|
110
|
+
const count = toCount(functionValue.range[index], createLeftError);
|
|
105
111
|
const removed = findCount(other, functionValue.domain[index]);
|
|
106
112
|
if (removed === undefined) return count;
|
|
107
|
-
const difference = count - toCount(removed);
|
|
113
|
+
const difference = count - toCount(removed, createRightError);
|
|
108
114
|
if (isOutOfRange(difference)) throw createOverflowError(`${count}-${removed}`);
|
|
109
115
|
return difference;
|
|
110
116
|
};
|
|
111
117
|
|
|
112
118
|
// BagCup looks up a key of its second bag only among the keys of its first.
|
|
113
|
-
const addToBag = (
|
|
119
|
+
const addToBag = (
|
|
120
|
+
pairs: [Value, Value][],
|
|
121
|
+
key: Value,
|
|
122
|
+
count: Value,
|
|
123
|
+
createError: () => TlaModuleError,
|
|
124
|
+
end = pairs.length,
|
|
125
|
+
) => {
|
|
114
126
|
const existing = pairs.slice(0, end).find((pair) => isEqualLikeTlc(key, pair[0]));
|
|
115
|
-
if (existing) existing[1] = addCounts(existing[1], count);
|
|
127
|
+
if (existing) existing[1] = addCounts(existing[1], count, createError);
|
|
116
128
|
else pairs.push([key, count]);
|
|
117
129
|
};
|
|
118
130
|
|
|
@@ -130,11 +142,10 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
130
142
|
defineOperator("BagCardinality", 1, (args) => {
|
|
131
143
|
const bag = getValue(args, 0, "BagCardinality");
|
|
132
144
|
const functionValue = getFunction(args, 0, "BagCardinality");
|
|
145
|
+
const createError = () => createWrongValueError("BagCardinality", "a bag", bag);
|
|
133
146
|
return functionValue.range.reduce<number>((total, count) => {
|
|
134
|
-
if (typeof count !== "number" || count <= 0)
|
|
135
|
-
|
|
136
|
-
}
|
|
137
|
-
return addCounts(total, count);
|
|
147
|
+
if (typeof count !== "number" || count <= 0) throw createError();
|
|
148
|
+
return addCounts(total, count, createError);
|
|
138
149
|
}, 0);
|
|
139
150
|
}),
|
|
140
151
|
defineOperator("BagIn", 2, (args) => {
|
|
@@ -147,8 +158,10 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
147
158
|
const left = getAddedBag(args, functions, 0);
|
|
148
159
|
const right = getAddedBag(args, functions, 1);
|
|
149
160
|
const pairs = getPairs(left);
|
|
161
|
+
const createError = () =>
|
|
162
|
+
createModuleArgumentError("second", "(+)", "bag", getValue(args, 1, "(+)"));
|
|
150
163
|
right.domain.forEach((key, index) =>
|
|
151
|
-
addToBag(pairs, key, right.range[index], left.domain.length),
|
|
164
|
+
addToBag(pairs, key, right.range[index], createError, left.domain.length),
|
|
152
165
|
);
|
|
153
166
|
return createFunction(pairs);
|
|
154
167
|
}),
|
|
@@ -159,9 +172,11 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
159
172
|
const right = toFunction(rightValue);
|
|
160
173
|
if (!left) throw createModuleArgumentError("first", "(-)", "bag", leftValue);
|
|
161
174
|
if (!right) throw createModuleArgumentError("second", "(-)", "bag", rightValue);
|
|
175
|
+
const createLeftError = () => createModuleArgumentError("first", "(-)", "bag", leftValue);
|
|
176
|
+
const createRightError = () => createModuleArgumentError("second", "(-)", "bag", rightValue);
|
|
162
177
|
return createFunction(
|
|
163
178
|
left.domain.flatMap((key, index): [Value, Value][] => {
|
|
164
|
-
const count = subtractCounts(left, index, right);
|
|
179
|
+
const count = subtractCounts(left, index, right, createLeftError, createRightError);
|
|
165
180
|
return count > 0 ? [[key, count]] : [];
|
|
166
181
|
}),
|
|
167
182
|
);
|
|
@@ -172,20 +187,20 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
172
187
|
createWrongValueError("BagUnion", "a finite enumerable set", set),
|
|
173
188
|
);
|
|
174
189
|
if (elements.length < 2) return elements[0] ?? EMPTY_BAG;
|
|
190
|
+
const createUnionError = () =>
|
|
191
|
+
new TlaModuleError(
|
|
192
|
+
`Attempted to apply BagUnion to the following set, whose\nelement is not a bag:\n${prettyPrint(formatValue(set))}`,
|
|
193
|
+
);
|
|
175
194
|
const getBag = (element: Value) => {
|
|
176
195
|
const functionValue = toFunction(element);
|
|
177
|
-
if (!functionValue)
|
|
178
|
-
throw new TlaModuleError(
|
|
179
|
-
`Attempted to apply BagUnion to the following set, whose\nelement is not a bag:\n${formatValue(set)}`,
|
|
180
|
-
);
|
|
181
|
-
}
|
|
196
|
+
if (!functionValue) throw createUnionError();
|
|
182
197
|
return functionValue;
|
|
183
198
|
};
|
|
184
199
|
const pairs = getPairs(getBag(elements[0]));
|
|
185
200
|
elements.slice(1).forEach((element) => {
|
|
186
201
|
const functionValue = getBag(element);
|
|
187
202
|
functionValue.domain.forEach((key, index) =>
|
|
188
|
-
addToBag(pairs, key, functionValue.range[index]),
|
|
203
|
+
addToBag(pairs, key, functionValue.range[index], createUnionError),
|
|
189
204
|
);
|
|
190
205
|
});
|
|
191
206
|
return createFunction(pairs);
|
|
@@ -197,9 +212,14 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
197
212
|
const right = toFunction(rightValue);
|
|
198
213
|
if (!left) throw createWrongValueError("\\sqsubseteq", FINITE_FUNCTION, leftValue);
|
|
199
214
|
if (!right) throw createWrongValueError("\\sqsubseteq", FINITE_FUNCTION, rightValue);
|
|
215
|
+
const createLeftError = () => createWrongValueError("\\sqsubseteq", "a bag", leftValue);
|
|
216
|
+
const createRightError = () => createWrongValueError("\\sqsubseteq", "a bag", rightValue);
|
|
200
217
|
return left.domain.every((key, index) => {
|
|
201
218
|
const count = findCount(right, key);
|
|
202
|
-
return
|
|
219
|
+
return (
|
|
220
|
+
toCount(left.range[index], createLeftError) <=
|
|
221
|
+
(count === undefined ? 0 : toCount(count, createRightError))
|
|
222
|
+
);
|
|
203
223
|
});
|
|
204
224
|
}),
|
|
205
225
|
defineHigherOrderOperator("BagOfAll", 2, (args) => {
|
|
@@ -210,8 +230,9 @@ export const createBagsOperators = (builtins: ReadonlyMap<string, Builtin>): Bui
|
|
|
210
230
|
throw createModuleArgumentError("second", "BagOfAll", "function with a finite domain", value);
|
|
211
231
|
}
|
|
212
232
|
const pairs: [Value, Value][] = [];
|
|
233
|
+
const createError = () => createModuleArgumentError("second", "BagOfAll", "bag", value);
|
|
213
234
|
functionValue.domain.forEach((key, index) =>
|
|
214
|
-
addToBag(pairs, operator.call([key]), functionValue.range[index]),
|
|
235
|
+
addToBag(pairs, operator.call([key]), functionValue.range[index], createError),
|
|
215
236
|
);
|
|
216
237
|
return createFunction(pairs);
|
|
217
238
|
}),
|
package/src/builtins.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { TlaEndOfInputError, TlaEvaluationError, TlaModuleError } from "./errors";
|
|
2
2
|
import type { Builtin, BuiltinArgument, Context, OperatorValue } from "./evaluate";
|
|
3
|
+
import { prettyPrint } from "./pretty-print";
|
|
3
4
|
import {
|
|
4
5
|
formatValue,
|
|
5
6
|
getFunctionClass,
|
|
@@ -51,13 +52,13 @@ export const createModuleArgumentError = (
|
|
|
51
52
|
value: Value,
|
|
52
53
|
) =>
|
|
53
54
|
new TlaModuleError(
|
|
54
|
-
`The ${position} argument of ${name} should be a ${expected}, but instead it is:\n${formatValue(value)}`,
|
|
55
|
+
`The ${position} argument of ${name} should be a ${expected}, but instead it is:\n${prettyPrint(formatValue(value))}`,
|
|
55
56
|
);
|
|
56
57
|
|
|
57
58
|
export const toEnumeratedSet = (value: Value, name: string, reported = value) => {
|
|
58
59
|
if (!isSetValue(value) || isOverriddenSet(value)) {
|
|
59
60
|
throw new TlaModuleError(
|
|
60
|
-
`Applying ${name} to the following value,\nwhich is not a finite set:\n${formatValue(reported)}`,
|
|
61
|
+
`Applying ${name} to the following value,\nwhich is not a finite set:\n${prettyPrint(formatValue(reported))}`,
|
|
61
62
|
);
|
|
62
63
|
}
|
|
63
64
|
return toFiniteSet(value);
|
|
@@ -290,7 +291,7 @@ export const defineArithmetic = (
|
|
|
290
291
|
const getIntegerArgument = (value: Value, position: string, name: string) => {
|
|
291
292
|
if (typeof value !== "number") {
|
|
292
293
|
throw new TlaModuleError(
|
|
293
|
-
`The ${position} argument of ${name} should be an integer, but instead it is:\n${formatValue(value)}`,
|
|
294
|
+
`The ${position} argument of ${name} should be an integer, but instead it is:\n${prettyPrint(formatValue(value))}`,
|
|
294
295
|
);
|
|
295
296
|
}
|
|
296
297
|
return value;
|
package/src/check-failure.ts
CHANGED
|
@@ -7,7 +7,8 @@ import {
|
|
|
7
7
|
type FingerprintFailure,
|
|
8
8
|
} from "./evaluate";
|
|
9
9
|
import { EXIT_STATUS, getExitCode, getMessageExitStatus } from "./exit-codes";
|
|
10
|
-
import {
|
|
10
|
+
import type { TraceFailure } from "./check";
|
|
11
|
+
import { getCodedMessage, isEvalException } from "./tlc/messages";
|
|
11
12
|
import { getFingerprintError, getHeldValues, markFingerprinted, type Value } from "./values";
|
|
12
13
|
|
|
13
14
|
export interface ReplayFailure {
|
|
@@ -24,16 +25,15 @@ export interface FailureOptions {
|
|
|
24
25
|
callStack?: Expression[];
|
|
25
26
|
fingerprint?: FingerprintFailure;
|
|
26
27
|
replayError?: TlaEvaluationError;
|
|
27
|
-
traceFailure?:
|
|
28
|
+
traceFailure?: TraceFailure;
|
|
28
29
|
}
|
|
29
30
|
|
|
30
31
|
const getInitialExitCode = (error: TlaEvaluationError) => {
|
|
31
32
|
const coded = getCodedMessage(error.message);
|
|
32
|
-
return
|
|
33
|
-
|
|
34
|
-
getMessageExitStatus(coded.code)
|
|
35
|
-
|
|
36
|
-
: getErrorExitCode(error);
|
|
33
|
+
return (
|
|
34
|
+
getExitCode(error) ??
|
|
35
|
+
(coded && !isEvalException(error) ? getMessageExitStatus(coded.code) : EXIT_STATUS.error)
|
|
36
|
+
);
|
|
37
37
|
};
|
|
38
38
|
|
|
39
39
|
const getReplayExitCode = (error: TlaEvaluationError): number => {
|
|
@@ -42,6 +42,9 @@ const getReplayExitCode = (error: TlaEvaluationError): number => {
|
|
|
42
42
|
return error instanceof TlaModuleError ? error.exitCode : EXIT_STATUS.specEvaluationFailure;
|
|
43
43
|
};
|
|
44
44
|
|
|
45
|
+
const getCodeExitCode = (error: TlaEvaluationError) =>
|
|
46
|
+
getExitCode(error) ?? (error instanceof TlaModuleError ? error.exitCode : EXIT_STATUS.error);
|
|
47
|
+
|
|
45
48
|
export const getFailureExitCode = (
|
|
46
49
|
error: TlaEvaluationError,
|
|
47
50
|
failureOptions: FailureOptions,
|
|
@@ -53,12 +56,11 @@ export const getFailureExitCode = (
|
|
|
53
56
|
if (isReplayed) return EXIT_STATUS.specEvaluationFailure;
|
|
54
57
|
return is174 ? EXIT_STATUS.success : getInitialExitCode(error);
|
|
55
58
|
case "behavior-graph":
|
|
56
|
-
return (
|
|
57
|
-
getExitCode(error) ?? (error instanceof TlaModuleError ? error.exitCode : EXIT_STATUS.error)
|
|
58
|
-
);
|
|
59
|
+
return getCodeExitCode(error);
|
|
59
60
|
case "liveness":
|
|
60
|
-
return getErrorExitCode(error);
|
|
61
|
+
return error instanceof TlaModuleError ? error.exitCode : getErrorExitCode(error);
|
|
61
62
|
default:
|
|
63
|
+
if (!isReplayed && failureOptions.phase === "next" && !is174) return getCodeExitCode(error);
|
|
62
64
|
if (!isReplayed) return getErrorExitCode(error);
|
|
63
65
|
return failureOptions.fingerprint
|
|
64
66
|
? EXIT_STATUS.specEvaluationFailure
|