tla-ts 0.0.4 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +37 -126
- package/dist/cli.cjs +1 -1
- package/dist/cli.js +1 -1
- package/dist/deciders.cjs +366 -0
- package/dist/deciders.js +366 -0
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +46 -12
- package/dist/index.d.ts +46 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -4
- package/dist/parallel-worker.js +1 -4
- package/dist/prove-worker.cjs +9 -0
- package/dist/prove-worker.d.cts +9 -0
- package/dist/prove-worker.d.ts +9 -0
- package/dist/prove-worker.js +9 -0
- package/dist/prove.cjs +1006 -0
- package/dist/prove.js +1006 -0
- package/dist/run.cjs +45 -0
- package/dist/run.js +45 -0
- package/dist/tlapm.cjs +10 -0
- package/dist/tlapm.js +10 -0
- package/dist/transfer.cjs +76 -92
- package/dist/transfer.js +76 -92
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +21 -12
- package/src/ast.ts +2 -2
- package/src/bags.ts +22 -23
- package/src/builtins.ts +16 -8
- package/src/check.ts +131 -1153
- package/src/{cli-options.ts → cli/options.ts} +54 -9
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/{run-cli.ts → cli/tlc.ts} +115 -721
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +1 -1
- package/src/codegen.ts +43 -22
- package/src/config.ts +5 -5
- package/src/dependencies.ts +4 -6
- package/src/environment.ts +55 -60
- package/src/errors.ts +97 -35
- package/src/evaluate.ts +361 -181
- package/src/exit-codes.ts +1 -1
- package/src/fingerprints.ts +3 -3
- package/src/index.ts +10 -0
- package/src/instances.ts +56 -46
- package/src/java-overrides.ts +79 -41
- package/src/json.ts +31 -36
- package/src/levels.ts +10 -13
- package/src/{live-check.ts → liveness-checker.ts} +207 -141
- package/src/liveness.ts +38 -34
- package/src/{obligation-action.ts → obligations/action.ts} +248 -74
- package/src/{obligation-anon.ts → obligations/anonymize.ts} +55 -57
- package/src/obligations/equality.ts +260 -0
- package/src/obligations/expression.ts +618 -0
- package/src/{obligation-format.ts → obligations/format.ts} +7 -8
- package/src/obligations/generate.ts +457 -0
- package/src/{obligations.ts → obligations/index.ts} +46 -32
- package/src/{obligation-levels.ts → obligations/levels.ts} +44 -40
- package/src/obligations/module.ts +445 -0
- package/src/obligations/normalize.ts +554 -0
- package/src/obligations/operators.ts +176 -0
- package/src/obligations/pragma.ts +195 -0
- package/src/{obligation-printer.ts → obligations/printer.ts} +65 -230
- package/src/{obligation-proof.ts → obligations/proof.ts} +7 -2
- package/src/obligations/regroup.ts +100 -0
- package/src/{obligation-generate.ts → obligations/simplify.ts} +130 -536
- package/src/{obligation-source.ts → obligations/source.ts} +172 -216
- package/src/{obligation-deref.ts → obligations/subexpression.ts} +84 -115
- package/src/obligations/substitution.ts +261 -0
- package/src/obligations/temporal.ts +321 -0
- package/src/{obligation-tuples.ts → obligations/tuples.ts} +38 -54
- package/src/parallel-worker.ts +39 -51
- package/src/parallel.ts +39 -66
- package/src/parser.ts +67 -74
- package/src/{pcal-ast.ts → pcal/ast.ts} +2 -17
- package/src/{pcal-parse.ts → pcal/parse.ts} +28 -64
- package/src/{pcal-tokenize.ts → pcal/tokenize.ts} +10 -39
- package/src/{pcal-translate.ts → pcal/translate.ts} +30 -109
- package/src/{pcal-validate.ts → pcal/validate.ts} +10 -20
- package/src/prover/decide-pool.ts +95 -0
- package/src/prover/deciders.ts +33 -0
- package/src/prover/first-order.ts +175 -0
- package/src/prover/isabelle/LICENSE +36 -0
- package/src/prover/isabelle/LICENSE-tlapm +26 -0
- package/src/prover/isabelle/decide.ts +44 -0
- package/src/prover/isabelle/encode.ts +445 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +579 -0
- package/src/prover/isabelle/isar/method.ts +367 -0
- package/src/prover/isabelle/isar/proof.ts +28 -0
- package/src/prover/isabelle/isar/statement.ts +57 -0
- package/src/prover/isabelle/isar/theory.ts +192 -0
- package/src/prover/isabelle/isar/type-check.ts +278 -0
- package/src/prover/isabelle/provers/blast/blast.ts +258 -0
- package/src/prover/isabelle/provers/blast/branch.ts +322 -0
- package/src/prover/isabelle/provers/blast/prove.ts +347 -0
- package/src/prover/isabelle/provers/blast/rules.ts +330 -0
- package/src/prover/isabelle/provers/blast/state.ts +180 -0
- package/src/prover/isabelle/provers/blast/term.ts +546 -0
- package/src/prover/isabelle/provers/clasimp.ts +150 -0
- package/src/prover/isabelle/provers/classical.ts +389 -0
- package/src/prover/isabelle/provers/hypsubst.ts +433 -0
- package/src/prover/isabelle/pure/bicompose.ts +174 -0
- package/src/prover/isabelle/pure/consts.ts +32 -0
- package/src/prover/isabelle/pure/conv.ts +79 -0
- package/src/prover/isabelle/pure/drule.ts +264 -0
- package/src/prover/isabelle/pure/envir.ts +331 -0
- package/src/prover/isabelle/pure/goal.ts +53 -0
- package/src/prover/isabelle/pure/interrupt.ts +16 -0
- package/src/prover/isabelle/pure/list.ts +12 -0
- package/src/prover/isabelle/pure/logic.ts +330 -0
- package/src/prover/isabelle/pure/name.ts +98 -0
- package/src/prover/isabelle/pure/net.ts +215 -0
- package/src/prover/isabelle/pure/object-logic.ts +41 -0
- package/src/prover/isabelle/pure/pattern.ts +631 -0
- package/src/prover/isabelle/pure/raw-simplifier.ts +338 -0
- package/src/prover/isabelle/pure/rewriter.ts +602 -0
- package/src/prover/isabelle/pure/search.ts +68 -0
- package/src/prover/isabelle/pure/seq.ts +133 -0
- package/src/prover/isabelle/pure/simplifier.ts +106 -0
- package/src/prover/isabelle/pure/table.ts +201 -0
- package/src/prover/isabelle/pure/tactic.ts +168 -0
- package/src/prover/isabelle/pure/tactical.ts +264 -0
- package/src/prover/isabelle/pure/term-ord.ts +105 -0
- package/src/prover/isabelle/pure/term.ts +688 -0
- package/src/prover/isabelle/pure/thm.ts +783 -0
- package/src/prover/isabelle/pure/type.ts +121 -0
- package/src/prover/isabelle/pure/unify.ts +753 -0
- package/src/prover/isabelle/pure/variable.ts +25 -0
- package/src/prover/isabelle/tla/classical-setup.ts +101 -0
- package/src/prover/isabelle/tla/context.ts +74 -0
- package/src/prover/isabelle/tla/logic-data.ts +5 -0
- package/src/prover/isabelle/tla/logic.ts +215 -0
- package/src/prover/isabelle/tla/simpdata.ts +241 -0
- package/src/prover/isabelle/tools/intuitionistic.ts +132 -0
- package/src/prover/ocaml.ts +22 -0
- package/src/prover/prep/action.ts +508 -0
- package/src/prover/prep/enabled-axioms.ts +189 -0
- package/src/prover/prep/fingerprint.ts +388 -0
- package/src/prover/prep/level-comparison.ts +529 -0
- package/src/prover/prep/md5.ts +60 -0
- package/src/prover/prep/methods.ts +221 -0
- package/src/prover/prep/normalize.ts +309 -0
- package/src/prover/prove-worker.ts +22 -0
- package/src/prover/prove.ts +492 -0
- package/src/prover/ptl/decide.ts +68 -0
- package/src/prover/ptl/encode.ts +244 -0
- package/src/prover/ptl/sat.ts +151 -0
- package/src/prover/ptl/tableau.ts +276 -0
- package/src/prover/smt/axioms.ts +209 -0
- package/src/prover/smt/context.ts +108 -0
- package/src/prover/smt/data.ts +636 -0
- package/src/prover/smt/encode.ts +275 -0
- package/src/prover/smt/extensionality.ts +65 -0
- package/src/prover/smt/flatten.ts +112 -0
- package/src/prover/smt/format.ts +154 -0
- package/src/prover/smt/instances.ts +181 -0
- package/src/prover/smt/rewrite.ts +766 -0
- package/src/prover/smt/solver/act-cache.ts +265 -0
- package/src/prover/smt/solver/arith-rewriter.ts +962 -0
- package/src/prover/smt/solver/array.ts +22 -0
- package/src/prover/smt/solver/asserted-formulas.ts +469 -0
- package/src/prover/smt/solver/ast-lt.ts +157 -0
- package/src/prover/smt/solver/ast-util.ts +91 -0
- package/src/prover/smt/solver/ast.ts +1315 -0
- package/src/prover/smt/solver/auf-solver.ts +572 -0
- package/src/prover/smt/solver/case-split-queue.ts +178 -0
- package/src/prover/smt/solver/cg-table.ts +175 -0
- package/src/prover/smt/solver/clause.ts +276 -0
- package/src/prover/smt/solver/conflict-resolution.ts +343 -0
- package/src/prover/smt/solver/context.ts +1292 -0
- package/src/prover/smt/solver/ctx-simplify.ts +334 -0
- package/src/prover/smt/solver/der.ts +224 -0
- package/src/prover/smt/solver/dyn-ack.ts +141 -0
- package/src/prover/smt/solver/e-matching.ts +659 -0
- package/src/prover/smt/solver/enode.ts +259 -0
- package/src/prover/smt/solver/expr-ref.ts +21 -0
- package/src/prover/smt/solver/expr-safe-replace.ts +172 -0
- package/src/prover/smt/solver/fingerprints.ts +92 -0
- package/src/prover/smt/solver/flat-literals.ts +51 -0
- package/src/prover/smt/solver/goal.ts +138 -0
- package/src/prover/smt/solver/hash.ts +173 -0
- package/src/prover/smt/solver/hashtable.ts +166 -0
- package/src/prover/smt/solver/internalizer.ts +1381 -0
- package/src/prover/smt/solver/lbool.ts +5 -0
- package/src/prover/smt/solver/literal.ts +24 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +391 -0
- package/src/prover/smt/solver/lp/constraints.ts +78 -0
- package/src/prover/smt/solver/lp/containers.ts +296 -0
- package/src/prover/smt/solver/lp/core-solver.ts +504 -0
- package/src/prover/smt/solver/lp/cross-nested.ts +224 -0
- package/src/prover/smt/solver/lp/dep-intervals.ts +642 -0
- package/src/prover/smt/solver/lp/dependency.ts +51 -0
- package/src/prover/smt/solver/lp/dioph-eq.ts +1181 -0
- package/src/prover/smt/solver/lp/explanation.ts +46 -0
- package/src/prover/smt/solver/lp/gomory.ts +255 -0
- package/src/prover/smt/solver/lp/hnf-cutter.ts +125 -0
- package/src/prover/smt/solver/lp/hnf.ts +281 -0
- package/src/prover/smt/solver/lp/int-cube.ts +295 -0
- package/src/prover/smt/solver/lp/int-solver.ts +514 -0
- package/src/prover/smt/solver/lp/lar-solver.ts +816 -0
- package/src/prover/smt/solver/lp/lar-term.ts +62 -0
- package/src/prover/smt/solver/lp/lp-settings.ts +91 -0
- package/src/prover/smt/solver/lp/maximize-term.ts +347 -0
- package/src/prover/smt/solver/lp/nex-creator.ts +381 -0
- package/src/prover/smt/solver/lp/nex.ts +120 -0
- package/src/prover/smt/solver/lp/nla-backoff.ts +43 -0
- package/src/prover/smt/solver/lp/nla-basics.ts +398 -0
- package/src/prover/smt/solver/lp/nla-core.ts +968 -0
- package/src/prover/smt/solver/lp/nla-divisions.ts +332 -0
- package/src/prover/smt/solver/lp/nla-emonics.ts +373 -0
- package/src/prover/smt/solver/lp/nla-factorization.ts +30 -0
- package/src/prover/smt/solver/lp/nla-grobner.ts +904 -0
- package/src/prover/smt/solver/lp/nla-horner.ts +126 -0
- package/src/prover/smt/solver/lp/nla-intervals.ts +265 -0
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +715 -0
- package/src/prover/smt/solver/lp/nla-monotone.ts +59 -0
- package/src/prover/smt/solver/lp/nla-order.ts +307 -0
- package/src/prover/smt/solver/lp/nla-patcher.ts +112 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +251 -0
- package/src/prover/smt/solver/lp/nla-throttle.ts +85 -0
- package/src/prover/smt/solver/lp/nla-types.ts +124 -0
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +141 -0
- package/src/prover/smt/solver/lp/nra-solver.ts +440 -0
- package/src/prover/smt/solver/lp/numeric-pair.ts +65 -0
- package/src/prover/smt/solver/lp/pdd-interval.ts +31 -0
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +184 -0
- package/src/prover/smt/solver/lp/pdd-solver.ts +408 -0
- package/src/prover/smt/solver/lp/pdd.ts +971 -0
- package/src/prover/smt/solver/lp/random-updater.ts +138 -0
- package/src/prover/smt/solver/lp/static-matrix.ts +246 -0
- package/src/prover/smt/solver/lp/union-find.ts +96 -0
- package/src/prover/smt/solver/mam-compiler.ts +847 -0
- package/src/prover/smt/solver/mam-interpreter.ts +400 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +118 -0
- package/src/prover/smt/solver/model-checker.ts +347 -0
- package/src/prover/smt/solver/model-evaluator.ts +262 -0
- package/src/prover/smt/solver/model-finder.ts +155 -0
- package/src/prover/smt/solver/model-generator.ts +97 -0
- package/src/prover/smt/solver/model-macro-solver.ts +728 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +1161 -0
- package/src/prover/smt/solver/nlsat/atoms.ts +238 -0
- package/src/prover/smt/solver/nlsat/evaluator.ts +303 -0
- package/src/prover/smt/solver/nlsat/explain.ts +607 -0
- package/src/prover/smt/solver/nlsat/interval-set.ts +351 -0
- package/src/prover/smt/solver/nlsat/levelwise.ts +737 -0
- package/src/prover/smt/solver/nlsat/mpbq.ts +161 -0
- package/src/prover/smt/solver/nlsat/polynomial.ts +1722 -0
- package/src/prover/smt/solver/nlsat/solver.ts +911 -0
- package/src/prover/smt/solver/nlsat/types.ts +43 -0
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +648 -0
- package/src/prover/smt/solver/nlsat/upolynomial.ts +996 -0
- package/src/prover/smt/solver/nnf.ts +469 -0
- package/src/prover/smt/solver/pattern-inference.ts +351 -0
- package/src/prover/smt/solver/poly-rewriter.ts +477 -0
- package/src/prover/smt/solver/propagate-values.ts +83 -0
- package/src/prover/smt/solver/proto-model.ts +551 -0
- package/src/prover/smt/solver/pull-quant.ts +139 -0
- package/src/prover/smt/solver/qe-lite-der.ts +526 -0
- package/src/prover/smt/solver/qe-lite-fm.ts +576 -0
- package/src/prover/smt/solver/qe-lite.ts +381 -0
- package/src/prover/smt/solver/qi-queue.ts +362 -0
- package/src/prover/smt/solver/quant-tactics.ts +117 -0
- package/src/prover/smt/solver/quantifier-analyzer.ts +562 -0
- package/src/prover/smt/solver/quantifier-manager.ts +186 -0
- package/src/prover/smt/solver/random-gen.ts +10 -0
- package/src/prover/smt/solver/rational.ts +165 -0
- package/src/prover/smt/solver/ref-vector.ts +62 -0
- package/src/prover/smt/solver/relevancy.ts +247 -0
- package/src/prover/smt/solver/rewriter-tpl.ts +1159 -0
- package/src/prover/smt/solver/rewriter.ts +843 -0
- package/src/prover/smt/solver/rlimit.ts +79 -0
- package/src/prover/smt/solver/smtlib-parser.ts +526 -0
- package/src/prover/smt/solver/solver.ts +71 -0
- package/src/prover/smt/solver/sort.ts +35 -0
- package/src/prover/smt/solver/sticky-generations.ts +69 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +340 -0
- package/src/prover/smt/solver/theory-lra-bounds.ts +226 -0
- package/src/prover/smt/solver/theory-lra-final-check.ts +252 -0
- package/src/prover/smt/solver/theory-lra-internalize.ts +476 -0
- package/src/prover/smt/solver/theory-lra-model.ts +243 -0
- package/src/prover/smt/solver/theory-lra-propagate.ts +405 -0
- package/src/prover/smt/solver/theory-lra-state.ts +43 -0
- package/src/prover/smt/solver/theory-lra.ts +56 -0
- package/src/prover/smt/solver/var-subst.ts +258 -0
- package/src/prover/smt/solver/z3-license.txt +10 -0
- package/src/prover/smt/table.ts +170 -0
- package/src/prover/tlapm/cache.ts +236 -0
- package/src/prover/tlapm/ocaml-marshal.ts +166 -0
- package/src/prover/tlapm/tlapm.ts +96 -0
- package/src/prover/tlaps-module.ts +510 -0
- package/src/prover/verdict.ts +13 -0
- package/src/prover/zenon/LICENSE +32 -0
- package/src/prover/zenon/check/check.ts +105 -0
- package/src/prover/zenon/check/definitions.ts +144 -0
- package/src/prover/zenon/check/equality.ts +182 -0
- package/src/prover/zenon/check/functions.ts +62 -0
- package/src/prover/zenon/check/keys.ts +125 -0
- package/src/prover/zenon/check/propositional.ts +104 -0
- package/src/prover/zenon/check/records.ts +188 -0
- package/src/prover/zenon/check/relations.ts +121 -0
- package/src/prover/zenon/check/rewrites.ts +224 -0
- package/src/prover/zenon/check/sets.ts +302 -0
- package/src/prover/zenon/check/terms.ts +127 -0
- package/src/prover/zenon/check/tla.ts +126 -0
- package/src/prover/zenon/decide.ts +107 -0
- package/src/prover/zenon/encode.ts +378 -0
- package/src/prover/zenon/eqrel.ts +300 -0
- package/src/prover/zenon/equality-rules.ts +435 -0
- package/src/prover/zenon/expr.ts +551 -0
- package/src/prover/zenon/index-table.ts +350 -0
- package/src/prover/zenon/isar-case.ts +513 -0
- package/src/prover/zenon/isar.ts +1249 -0
- package/src/prover/zenon/limits.ts +15 -0
- package/src/prover/zenon/llproof.ts +173 -0
- package/src/prover/zenon/mltoll.ts +1566 -0
- package/src/prover/zenon/node.ts +297 -0
- package/src/prover/zenon/ocaml.ts +169 -0
- package/src/prover/zenon/parse.ts +247 -0
- package/src/prover/zenon/phrase.ts +191 -0
- package/src/prover/zenon/proof.ts +198 -0
- package/src/prover/zenon/propositional-rules.ts +387 -0
- package/src/prover/zenon/rules.ts +94 -0
- package/src/prover/zenon/search.ts +288 -0
- package/src/prover/zenon/tla/functions.ts +151 -0
- package/src/prover/zenon/tla/llproof.ts +480 -0
- package/src/prover/zenon/tla/records.ts +225 -0
- package/src/prover/zenon/tla/rewrites.ts +447 -0
- package/src/prover/zenon/tla/sets.ts +304 -0
- package/src/prover/zenon/tla/terms.ts +162 -0
- package/src/prover/zenon/tla/tla.ts +506 -0
- package/src/randomization.ts +19 -24
- package/src/resolve.ts +15 -22
- package/src/runtime.ts +8 -8
- package/src/{sany-builtins.ts → sany/builtins.ts} +1 -1
- package/src/{sany-generator.ts → sany/generator.ts} +38 -55
- package/src/{sany-levels.ts → sany/levels.ts} +45 -48
- package/src/{sany-lexer.ts → sany/lexer.ts} +2 -3
- package/src/{sany-linter.ts → sany/linter.ts} +1 -1
- package/src/{sany-modules.ts → sany/modules.ts} +2 -2
- package/src/{sany-nodes.ts → sany/nodes.ts} +2 -2
- package/src/{sany-parse-error.ts → sany/parse-error.ts} +2 -2
- package/src/{sany-report.ts → sany/report.ts} +16 -17
- package/src/{sany-selectors.ts → sany/selectors.ts} +3 -5
- package/src/{sany-source.ts → sany/source.ts} +6 -7
- package/src/{sany-xml.ts → sany/xml.ts} +5 -6
- package/src/search.ts +969 -0
- package/src/spec-description.ts +26 -20
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +21 -22
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +39 -23
- package/src/symmetry.ts +1 -1
- package/src/tableau.ts +6 -7
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-messages.ts → tlc/messages.ts} +119 -7
- package/src/{tlc-order.ts → tlc/order.ts} +7 -7
- package/src/{tlc-random.ts → tlc/random.ts} +3 -190
- package/src/{tlc-replay.ts → tlc/replay.ts} +40 -36
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +9 -9
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +30 -25
- package/src/{tlc-version.ts → tlc/version.ts} +8 -7
- package/src/transfer.ts +32 -32
- package/src/values.ts +166 -111
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -55
- package/dist/run-cli.js +0 -55
- package/src/canonical.ts +0 -40
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/standard-ranges.ts +0 -116
- package/src/value-sources.ts +0 -29
- /package/src/{tlc-modules.ts → tlc/jar-data.ts} +0 -0
- /package/src/{tlc-summary.ts → tlc/summary.ts} +0 -0
package/src/json.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
createJavaOverrideError,
|
|
3
|
+
createModuleArgumentError,
|
|
3
4
|
defineStateOperator,
|
|
4
5
|
getJavaClassName,
|
|
5
6
|
getValue,
|
|
6
7
|
} from "./builtins";
|
|
7
|
-
import { TlaModuleError } from "./errors";
|
|
8
8
|
import type { Builtin } from "./evaluate";
|
|
9
9
|
import {
|
|
10
10
|
createRecord,
|
|
@@ -28,19 +28,19 @@ interface ParseContext {
|
|
|
28
28
|
source?: string;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
const
|
|
31
|
+
const TO_JSON_SIGNATURE =
|
|
32
32
|
"public static tlc2.value.impl.StringValue tlc2.module.Json.toJson(tlc2.value.IValue) throws java.io.IOException";
|
|
33
|
-
const
|
|
33
|
+
const TO_JSON_ARRAY_SIGNATURE =
|
|
34
34
|
"public static tlc2.value.impl.StringValue tlc2.module.Json.toJsonArray(tlc2.value.IValue) throws java.io.IOException";
|
|
35
|
-
const
|
|
35
|
+
const TO_JSON_OBJECT_SIGNATURE =
|
|
36
36
|
"public static tlc2.value.impl.StringValue tlc2.module.Json.toJsonObject(tlc2.value.IValue) throws java.io.IOException";
|
|
37
|
-
const
|
|
37
|
+
const SERIALIZE_SIGNATURE =
|
|
38
38
|
"public static synchronized tlc2.value.impl.BoolValue tlc2.module.Json.serialize(tlc2.value.impl.StringValue,tlc2.value.impl.Value) throws java.io.IOException";
|
|
39
|
-
const
|
|
39
|
+
const ND_SERIALIZE_SIGNATURE =
|
|
40
40
|
"public static synchronized tlc2.value.impl.BoolValue tlc2.module.Json.ndSerialize(tlc2.value.impl.StringValue,tlc2.value.impl.Value) throws java.io.IOException";
|
|
41
|
-
const
|
|
41
|
+
const DESERIALIZE_SIGNATURE =
|
|
42
42
|
"public static tlc2.value.IValue tlc2.module.Json.deserialize(tlc2.value.impl.StringValue) throws java.io.IOException";
|
|
43
|
-
const
|
|
43
|
+
const ND_DESERIALIZE_SIGNATURE =
|
|
44
44
|
"public static tlc2.value.IValue tlc2.module.Json.ndDeserialize(tlc2.value.impl.StringValue) throws java.io.IOException";
|
|
45
45
|
|
|
46
46
|
const isRecord = (value: Value) => {
|
|
@@ -55,12 +55,6 @@ const createUnsupportedError = (method: string, value: Value) =>
|
|
|
55
55
|
`Cannot convert value: unsupported value type tlc2.value.impl.${getJavaClassName(value)}`,
|
|
56
56
|
);
|
|
57
57
|
|
|
58
|
-
const createCastError = (method: string, value: Value) =>
|
|
59
|
-
createJavaOverrideError(
|
|
60
|
-
method,
|
|
61
|
-
`Cannot cast tlc2.value.impl.${getJavaClassName(value)} to tlc2.value.impl.StringValue`,
|
|
62
|
-
);
|
|
63
|
-
|
|
64
58
|
const toJsonString = (text: string) =>
|
|
65
59
|
JSON.stringify(text).replaceAll("\u2028", "\\u2028").replaceAll("\u2029", "\\u2029");
|
|
66
60
|
|
|
@@ -94,15 +88,15 @@ const toJson = (value: Value, method: string): string => {
|
|
|
94
88
|
};
|
|
95
89
|
|
|
96
90
|
const toJsonArray = (value: Value) => {
|
|
97
|
-
if (isSetValue(value)) return toSetJson(value,
|
|
91
|
+
if (isSetValue(value)) return toSetJson(value, TO_JSON_ARRAY_SIGNATURE);
|
|
98
92
|
if (!isFunctionValue(value) || isRecord(value))
|
|
99
|
-
throw createUnsupportedError(
|
|
100
|
-
return toFunctionJson(value,
|
|
93
|
+
throw createUnsupportedError(TO_JSON_ARRAY_SIGNATURE, value);
|
|
94
|
+
return toFunctionJson(value, TO_JSON_ARRAY_SIGNATURE);
|
|
101
95
|
};
|
|
102
96
|
|
|
103
97
|
const toJsonObject = (value: Value) => {
|
|
104
|
-
if (!isFunctionValue(value)) throw createUnsupportedError(
|
|
105
|
-
return toFunctionJson(value,
|
|
98
|
+
if (!isFunctionValue(value)) throw createUnsupportedError(TO_JSON_OBJECT_SIGNATURE, value);
|
|
99
|
+
return toFunctionJson(value, TO_JSON_OBJECT_SIGNATURE);
|
|
106
100
|
};
|
|
107
101
|
|
|
108
102
|
// TLC reads a JSON number with Gson's intValue, which truncates the exact decimal toward zero and
|
|
@@ -150,7 +144,12 @@ const parseJson = (text: string, method: string) => {
|
|
|
150
144
|
};
|
|
151
145
|
|
|
152
146
|
const getPath = (value: Value, method: string) => {
|
|
153
|
-
if (typeof value !== "string")
|
|
147
|
+
if (typeof value !== "string") {
|
|
148
|
+
throw createJavaOverrideError(
|
|
149
|
+
method,
|
|
150
|
+
`Cannot cast tlc2.value.impl.${getJavaClassName(value)} to tlc2.value.impl.StringValue`,
|
|
151
|
+
);
|
|
152
|
+
}
|
|
154
153
|
return value;
|
|
155
154
|
};
|
|
156
155
|
|
|
@@ -164,7 +163,7 @@ const readText = (files: FileSystem, path: string, method: string) => {
|
|
|
164
163
|
|
|
165
164
|
export const createJsonOperators = (files: FileSystem): Builtin[] => [
|
|
166
165
|
defineStateOperator("ToJson", 1, (args) =>
|
|
167
|
-
rankString(toJson(getValue(args, 0, "ToJson"),
|
|
166
|
+
rankString(toJson(getValue(args, 0, "ToJson"), TO_JSON_SIGNATURE)),
|
|
168
167
|
),
|
|
169
168
|
defineStateOperator("ToJsonArray", 1, (args) =>
|
|
170
169
|
rankString(toJsonArray(getValue(args, 0, "ToJsonArray"))),
|
|
@@ -173,43 +172,39 @@ export const createJsonOperators = (files: FileSystem): Builtin[] => [
|
|
|
173
172
|
rankString(toJsonObject(getValue(args, 0, "ToJsonObject"))),
|
|
174
173
|
),
|
|
175
174
|
defineStateOperator("JsonSerialize", 2, (args) => {
|
|
176
|
-
const path = getPath(getValue(args, 0, "JsonSerialize"),
|
|
175
|
+
const path = getPath(getValue(args, 0, "JsonSerialize"), SERIALIZE_SIGNATURE);
|
|
177
176
|
const value = getValue(args, 1, "JsonSerialize");
|
|
178
177
|
if (!getSequenceElements(value) && !isRecord(value)) {
|
|
179
|
-
throw
|
|
180
|
-
`The second argument of JsonSerialize should be a sequence or record, but instead it is:\n${formatValue(value)}`,
|
|
181
|
-
);
|
|
178
|
+
throw createModuleArgumentError("second", "JsonSerialize", "sequence or record", value);
|
|
182
179
|
}
|
|
183
|
-
files.writeFile?.(path, toJson(value,
|
|
180
|
+
files.writeFile?.(path, toJson(value, SERIALIZE_SIGNATURE));
|
|
184
181
|
return true;
|
|
185
182
|
}),
|
|
186
183
|
defineStateOperator("ndJsonSerialize", 2, (args) => {
|
|
187
|
-
const path = getPath(getValue(args, 0, "ndJsonSerialize"),
|
|
184
|
+
const path = getPath(getValue(args, 0, "ndJsonSerialize"), ND_SERIALIZE_SIGNATURE);
|
|
188
185
|
const value = getValue(args, 1, "ndJsonSerialize");
|
|
189
186
|
const elements = getSequenceElements(value);
|
|
190
187
|
if (!elements) {
|
|
191
|
-
throw
|
|
192
|
-
`The second argument of ndJsonSerialize should be a sequence, but instead it is:\n${formatValue(value)}`,
|
|
193
|
-
);
|
|
188
|
+
throw createModuleArgumentError("second", "ndJsonSerialize", "sequence", value);
|
|
194
189
|
}
|
|
195
190
|
files.writeFile?.(
|
|
196
191
|
path,
|
|
197
|
-
elements.map((element) => `${toJson(element,
|
|
192
|
+
elements.map((element) => `${toJson(element, ND_SERIALIZE_SIGNATURE)}\n`).join(""),
|
|
198
193
|
);
|
|
199
194
|
return true;
|
|
200
195
|
}),
|
|
201
196
|
defineStateOperator("JsonDeserialize", 1, (args) => {
|
|
202
|
-
const path = getPath(getValue(args, 0, "JsonDeserialize"),
|
|
203
|
-
return parseJson(readText(files, path,
|
|
197
|
+
const path = getPath(getValue(args, 0, "JsonDeserialize"), DESERIALIZE_SIGNATURE);
|
|
198
|
+
return parseJson(readText(files, path, DESERIALIZE_SIGNATURE), DESERIALIZE_SIGNATURE);
|
|
204
199
|
}),
|
|
205
200
|
defineStateOperator("ndJsonDeserialize", 1, (args) => {
|
|
206
|
-
const path = getPath(getValue(args, 0, "ndJsonDeserialize"),
|
|
201
|
+
const path = getPath(getValue(args, 0, "ndJsonDeserialize"), ND_DESERIALIZE_SIGNATURE);
|
|
207
202
|
return createTuple(
|
|
208
|
-
readText(files, path,
|
|
203
|
+
readText(files, path, ND_DESERIALIZE_SIGNATURE)
|
|
209
204
|
.split(/\r\n|\r|\n/)
|
|
210
205
|
.map((line) => line.trim())
|
|
211
206
|
.filter((line) => line !== "")
|
|
212
|
-
.map((line) => parseJson(line,
|
|
207
|
+
.map((line) => parseJson(line, ND_DESERIALIZE_SIGNATURE)),
|
|
213
208
|
);
|
|
214
209
|
}),
|
|
215
210
|
];
|
package/src/levels.ts
CHANGED
|
@@ -18,7 +18,7 @@ import {
|
|
|
18
18
|
} from "./errors";
|
|
19
19
|
import { mapChildren } from "./instances";
|
|
20
20
|
import { collectSemanticErrors, getBoundNames, getPatternNames } from "./resolve";
|
|
21
|
-
import { STANDARD_LEVELS } from "./standard-
|
|
21
|
+
import { STANDARD_LEVELS } from "./standard-definitions";
|
|
22
22
|
|
|
23
23
|
interface LevelData {
|
|
24
24
|
level: number;
|
|
@@ -61,7 +61,11 @@ interface Operand {
|
|
|
61
61
|
declared?: OperatorParam;
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
-
|
|
64
|
+
// The levels of tla2sany.semantic.LevelConstants.
|
|
65
|
+
export const CONSTANT_LEVEL = 0;
|
|
66
|
+
export const VARIABLE_LEVEL = 1;
|
|
67
|
+
export const ACTION_LEVEL = 2;
|
|
68
|
+
export const TEMPORAL_LEVEL = 3;
|
|
65
69
|
|
|
66
70
|
const SEPARATOR = "\u0000";
|
|
67
71
|
|
|
@@ -88,7 +92,7 @@ const createData = (level = 0): LevelData => ({
|
|
|
88
92
|
});
|
|
89
93
|
|
|
90
94
|
export const putConstraint = (constraints: Map<string, number>, name: string, level: number) =>
|
|
91
|
-
constraints.set(name, Math.min(level, constraints.get(name) ??
|
|
95
|
+
constraints.set(name, Math.min(level, constraints.get(name) ?? TEMPORAL_LEVEL));
|
|
92
96
|
|
|
93
97
|
export const putArgConstraint = (constraints: Map<string, number>, key: string, level: number) =>
|
|
94
98
|
constraints.set(key, Math.max(level, constraints.get(key) ?? 0));
|
|
@@ -112,7 +116,7 @@ const createSignature = (
|
|
|
112
116
|
const getMaxLevel = (operator: OperatorLevels, index: number) =>
|
|
113
117
|
operator.formals.length === 0 && operator.maxLevels.length > 0
|
|
114
118
|
? operator.maxLevels[Math.min(index, operator.maxLevels.length - 1)]
|
|
115
|
-
: (operator.maxLevels[index] ??
|
|
119
|
+
: (operator.maxLevels[index] ?? TEMPORAL_LEVEL);
|
|
116
120
|
|
|
117
121
|
const getWeight = (operator: OperatorLevels, index: number) =>
|
|
118
122
|
operator.formals.length === 0 && operator.weights.length > 0
|
|
@@ -181,12 +185,6 @@ const bindFormals = (scope: Scope, formals: OperatorParam[]) =>
|
|
|
181
185
|
|
|
182
186
|
const toFormals = (names: string[]) => names.map((name) => ({ name, arity: 0 }));
|
|
183
187
|
|
|
184
|
-
// The levels of tla2sany.semantic.LevelConstants.
|
|
185
|
-
export const CONSTANT_LEVEL = 0;
|
|
186
|
-
export const VARIABLE_LEVEL = 1;
|
|
187
|
-
export const ACTION_LEVEL = 2;
|
|
188
|
-
export const TEMPORAL_LEVEL = 3;
|
|
189
|
-
|
|
190
188
|
// SANY reports a level error at the range of the expression it rejects.
|
|
191
189
|
const createLevelError = (message: string, expression: Expression) =>
|
|
192
190
|
expression.location.range
|
|
@@ -788,7 +786,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
788
786
|
formals.flatMap((formal, index) => (nonLeibnizNames.has(formal.name) ? [index] : [])),
|
|
789
787
|
),
|
|
790
788
|
maxLevels: formals.map((formal) =>
|
|
791
|
-
Math.min(
|
|
789
|
+
Math.min(TEMPORAL_LEVEL, data.constraints.get(formal.name) ?? TEMPORAL_LEVEL),
|
|
792
790
|
),
|
|
793
791
|
weights: formals.map((formal) => (data.params.has(formal.name) ? 1 : 0)),
|
|
794
792
|
minMaxLevels: formals.map((formal) =>
|
|
@@ -833,7 +831,7 @@ export const createLevelAnalyzer = (context: LevelContext) => {
|
|
|
833
831
|
...createData(),
|
|
834
832
|
name: definition.name,
|
|
835
833
|
formals,
|
|
836
|
-
maxLevels: formals.map(() =>
|
|
834
|
+
maxLevels: formals.map(() => TEMPORAL_LEVEL),
|
|
837
835
|
weights: formals.map(() => 0),
|
|
838
836
|
minMaxLevels: formals.map(() => []),
|
|
839
837
|
conditions: new Set(),
|
|
@@ -885,7 +883,6 @@ export const analyzeAssumeProve = (
|
|
|
885
883
|
return data;
|
|
886
884
|
};
|
|
887
885
|
|
|
888
|
-
// SANY checks the level of every definition, assumption, theorem, and instance of a module.
|
|
889
886
|
export const checkModuleLevels = (
|
|
890
887
|
module: Module,
|
|
891
888
|
context: LevelContext,
|