tla-ts 0.0.3 → 0.0.4-dev.1a3acf6
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 +46 -115
- 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 +194 -8
- package/dist/index.d.ts +194 -8
- 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 +1377 -18
- package/dist/transfer.js +1377 -18
- package/dist/worker.cjs +21 -0
- package/dist/worker.js +21 -0
- package/package.json +24 -11
- package/src/ast.ts +149 -8
- package/src/bags.ts +26 -30
- package/src/builtins.ts +45 -19
- package/src/bundled-modules.ts +3 -3
- package/src/check.ts +1182 -900
- package/src/cli/options.ts +109 -0
- package/src/cli/run.ts +63 -0
- package/src/cli/shared.ts +106 -0
- package/src/cli/tlapm.ts +374 -0
- package/src/cli/tlc.ts +941 -0
- package/src/cli/xml-exporter.ts +221 -0
- package/src/cli.ts +9 -2
- package/src/codegen.ts +112 -51
- package/src/config.ts +254 -181
- package/src/dependencies.ts +5 -7
- package/src/environment.ts +579 -184
- package/src/errors.ts +287 -4
- package/src/evaluate.ts +1095 -365
- package/src/exit-codes.ts +22 -43
- package/src/fingerprints.ts +49 -14
- package/src/index.ts +11 -0
- package/src/instances.ts +73 -60
- package/src/java-overrides.ts +183 -66
- package/src/json.ts +31 -36
- package/src/levels.ts +197 -54
- package/src/lexer.ts +127 -30
- package/src/liveness-checker.ts +894 -0
- package/src/liveness.ts +246 -596
- 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} +174 -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 +184 -235
- package/src/parallel.ts +156 -91
- package/src/parser.ts +490 -188
- package/src/pcal/ast.ts +755 -0
- package/src/pcal/parse.ts +1487 -0
- package/src/pcal/tokenize.ts +487 -0
- package/src/pcal/translate.ts +1151 -0
- package/src/pcal/validate.ts +444 -0
- 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 +39 -27
- package/src/resolve.ts +1474 -426
- package/src/runtime.ts +25 -7
- package/src/sany/builtins.ts +147 -0
- package/src/sany/generator.ts +3111 -0
- package/src/sany/levels.ts +1205 -0
- package/src/sany/lexer.ts +544 -0
- package/src/sany/linter.ts +122 -0
- package/src/sany/modules.ts +1398 -0
- package/src/sany/nodes.ts +463 -0
- package/src/sany/parse-error.ts +2161 -0
- package/src/sany/report.ts +355 -0
- package/src/sany/selectors.ts +736 -0
- package/src/sany/source.ts +247 -0
- package/src/sany/xml.ts +1016 -0
- package/src/search.ts +969 -0
- package/src/spec-description.ts +66 -29
- package/src/{standard-levels.ts → standard-definitions.ts} +118 -2
- package/src/standard-modules.ts +215 -164
- package/src/state-graph.ts +181 -0
- package/src/subexpressions.ts +231 -171
- package/src/substitution-levels.ts +40 -19
- package/src/successors.ts +253 -125
- package/src/symmetry.ts +194 -54
- package/src/tableau.ts +60 -32
- package/src/tlc/fingerprint.ts +214 -0
- package/src/{tlc-modules.ts → tlc/jar-data.ts} +4 -0
- package/src/tlc/messages.ts +441 -0
- package/src/{tlc-order.ts → tlc/order.ts} +84 -16
- package/src/{tlc-random.ts → tlc/random.ts} +30 -189
- package/src/tlc/replay.ts +659 -0
- package/src/{tlc-summary.ts → tlc/summary.ts} +20 -5
- package/src/{tlc-module.ts → tlc/tlc-operators.ts} +59 -50
- package/src/{tlc-ext.ts → tlc/tlcext-operators.ts} +63 -45
- package/src/tlc/version.ts +19 -0
- package/src/transfer.ts +44 -32
- package/src/values.ts +843 -241
- package/src/worker.ts +62 -0
- package/dist/parallel.cjs +0 -12
- package/dist/parallel.js +0 -12
- package/dist/run-cli.cjs +0 -28
- package/dist/run-cli.js +0 -28
- package/src/canonical.ts +0 -39
- package/src/cli-options.ts +0 -58
- package/src/obligation-expression.ts +0 -1060
- package/src/obligation-module.ts +0 -1042
- package/src/run-cli.ts +0 -478
package/src/java-overrides.ts
CHANGED
|
@@ -12,9 +12,20 @@ interface PoolEntry {
|
|
|
12
12
|
interface JavaMethod {
|
|
13
13
|
name: string;
|
|
14
14
|
arity: number;
|
|
15
|
+
// Method#toString, which TLC prints as the signature of an override.
|
|
16
|
+
signature: string;
|
|
15
17
|
code: Uint8Array | undefined;
|
|
16
18
|
}
|
|
17
19
|
|
|
20
|
+
// A public static method of the class named after a module, which TLC reports as it loads the
|
|
21
|
+
// class, with whether it overrides an operator.
|
|
22
|
+
export interface JavaOverride {
|
|
23
|
+
module: string;
|
|
24
|
+
operator: string;
|
|
25
|
+
signature: string;
|
|
26
|
+
isMatched: boolean;
|
|
27
|
+
}
|
|
28
|
+
|
|
18
29
|
interface ObjectReference {
|
|
19
30
|
className: string;
|
|
20
31
|
value: Expression | undefined;
|
|
@@ -27,6 +38,38 @@ const ACCESS_PUBLIC = 0x0001;
|
|
|
27
38
|
const ACCESS_STATIC = 0x0008;
|
|
28
39
|
const VALUE_PACKAGE = "tlc2/value/impl/";
|
|
29
40
|
|
|
41
|
+
// The constant pool tags of the JVM specification, section 4.4.
|
|
42
|
+
const POOL_TAG = {
|
|
43
|
+
utf8: 1,
|
|
44
|
+
integer: 3,
|
|
45
|
+
float: 4,
|
|
46
|
+
long: 5,
|
|
47
|
+
double: 6,
|
|
48
|
+
class: 7,
|
|
49
|
+
string: 8,
|
|
50
|
+
methodHandle: 15,
|
|
51
|
+
methodType: 16,
|
|
52
|
+
module: 19,
|
|
53
|
+
package: 20,
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
// The JVM opcodes that an override returning a constant value uses.
|
|
57
|
+
const OPCODE = {
|
|
58
|
+
iconstM1: 0x02,
|
|
59
|
+
iconst0: 0x03,
|
|
60
|
+
iconst5: 0x08,
|
|
61
|
+
bipush: 0x10,
|
|
62
|
+
sipush: 0x11,
|
|
63
|
+
ldc: 0x12,
|
|
64
|
+
ldcW: 0x13,
|
|
65
|
+
dup: 0x59,
|
|
66
|
+
areturn: 0xb0,
|
|
67
|
+
getstatic: 0xb2,
|
|
68
|
+
invokespecial: 0xb7,
|
|
69
|
+
invokestatic: 0xb8,
|
|
70
|
+
new: 0xbb,
|
|
71
|
+
};
|
|
72
|
+
|
|
30
73
|
const createReader = (bytes: Uint8Array) => {
|
|
31
74
|
const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
32
75
|
const cursor = { offset: 0 };
|
|
@@ -44,34 +87,72 @@ const createReader = (bytes: Uint8Array) => {
|
|
|
44
87
|
};
|
|
45
88
|
};
|
|
46
89
|
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
90
|
+
const PRIMITIVE_TYPES = new Map([
|
|
91
|
+
["B", "byte"],
|
|
92
|
+
["C", "char"],
|
|
93
|
+
["D", "double"],
|
|
94
|
+
["F", "float"],
|
|
95
|
+
["I", "int"],
|
|
96
|
+
["J", "long"],
|
|
97
|
+
["S", "short"],
|
|
98
|
+
["Z", "boolean"],
|
|
99
|
+
["V", "void"],
|
|
100
|
+
]);
|
|
101
|
+
|
|
102
|
+
// The modifiers Method#toString prints, in the order of Modifier#toString.
|
|
103
|
+
const METHOD_MODIFIERS: [number, string][] = [
|
|
104
|
+
[0x0001, "public"],
|
|
105
|
+
[0x0004, "protected"],
|
|
106
|
+
[0x0002, "private"],
|
|
107
|
+
[0x0400, "abstract"],
|
|
108
|
+
[0x0008, "static"],
|
|
109
|
+
[0x0010, "final"],
|
|
110
|
+
[0x0020, "synchronized"],
|
|
111
|
+
[0x0100, "native"],
|
|
112
|
+
[0x0800, "strictfp"],
|
|
113
|
+
];
|
|
114
|
+
|
|
115
|
+
const getTypeNames = (descriptor: string) =>
|
|
116
|
+
[...descriptor.matchAll(/(\[*)(?:L([^;]*);|([BCDFIJSZV]))/g)].map(
|
|
117
|
+
(match) =>
|
|
118
|
+
`${match[2]?.replaceAll("/", ".") ?? PRIMITIVE_TYPES.get(match[3])}${"[]".repeat(match[1].length)}`,
|
|
119
|
+
);
|
|
120
|
+
|
|
121
|
+
const getClassName = (pool: PoolEntry[], index: number) => pool[pool[index].first].text;
|
|
51
122
|
|
|
52
|
-
|
|
53
|
-
|
|
123
|
+
const getJavaClassName = (pool: PoolEntry[], index: number) =>
|
|
124
|
+
getClassName(pool, index).replaceAll("/", ".");
|
|
125
|
+
|
|
126
|
+
// The public static methods of a class file and their bytecode, in the order of the class file.
|
|
127
|
+
// Class#getDeclaredMethods orders them by where HotSpot allocated the symbols of their names.
|
|
128
|
+
const readClassFile = (bytes: Uint8Array) => {
|
|
54
129
|
const reader = createReader(bytes);
|
|
55
130
|
if (reader.readUint32() !== CLASS_MAGIC)
|
|
56
131
|
throw new TlaSyntaxError("A module override is not a class file");
|
|
57
132
|
reader.readUint16();
|
|
58
133
|
reader.readUint16();
|
|
59
134
|
const pool: PoolEntry[] = [];
|
|
60
|
-
const
|
|
135
|
+
const poolSize = reader.readUint16();
|
|
61
136
|
const decoder = new TextDecoder();
|
|
62
|
-
for (let index = 1; index <
|
|
137
|
+
for (let index = 1; index < poolSize; index++) {
|
|
63
138
|
const tag = reader.readUint8();
|
|
64
139
|
const entry = { tag, text: "", value: 0, first: 0, second: 0 };
|
|
65
140
|
pool[index] = entry;
|
|
66
|
-
if (tag ===
|
|
67
|
-
else if (tag ===
|
|
68
|
-
else if (tag ===
|
|
69
|
-
else if (tag ===
|
|
141
|
+
if (tag === POOL_TAG.utf8) entry.text = decoder.decode(reader.readBytes(reader.readUint16()));
|
|
142
|
+
else if (tag === POOL_TAG.integer) entry.value = reader.readInt32();
|
|
143
|
+
else if (tag === POOL_TAG.float) reader.readUint32();
|
|
144
|
+
else if (tag === POOL_TAG.long || tag === POOL_TAG.double) {
|
|
70
145
|
reader.readBytes(8);
|
|
71
146
|
index++;
|
|
72
|
-
} else if (
|
|
147
|
+
} else if (
|
|
148
|
+
tag === POOL_TAG.class ||
|
|
149
|
+
tag === POOL_TAG.string ||
|
|
150
|
+
tag === POOL_TAG.methodType ||
|
|
151
|
+
tag === POOL_TAG.module ||
|
|
152
|
+
tag === POOL_TAG.package
|
|
153
|
+
) {
|
|
73
154
|
entry.first = reader.readUint16();
|
|
74
|
-
} else if (tag ===
|
|
155
|
+
} else if (tag === POOL_TAG.methodHandle) {
|
|
75
156
|
reader.readUint8();
|
|
76
157
|
entry.first = reader.readUint16();
|
|
77
158
|
} else {
|
|
@@ -80,7 +161,7 @@ const readMethods = (bytes: Uint8Array) => {
|
|
|
80
161
|
}
|
|
81
162
|
}
|
|
82
163
|
reader.readUint16();
|
|
83
|
-
reader.readUint16();
|
|
164
|
+
const className = getJavaClassName(pool, reader.readUint16());
|
|
84
165
|
reader.readUint16();
|
|
85
166
|
reader.readBytes(reader.readUint16() * 2);
|
|
86
167
|
for (let fields = reader.readUint16(); fields > 0; fields--) {
|
|
@@ -95,24 +176,39 @@ const readMethods = (bytes: Uint8Array) => {
|
|
|
95
176
|
const access = reader.readUint16();
|
|
96
177
|
const name = pool[reader.readUint16()].text;
|
|
97
178
|
const descriptor = pool[reader.readUint16()].text;
|
|
98
|
-
const
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
method.code = attribute.subarray(8, 8 + length);
|
|
105
|
-
}
|
|
106
|
-
}
|
|
179
|
+
const parametersEnd = descriptor.indexOf(")");
|
|
180
|
+
const parameters = getTypeNames(descriptor.slice(1, parametersEnd));
|
|
181
|
+
const attributes = Array.from({ length: reader.readUint16() }, () => ({
|
|
182
|
+
name: pool[reader.readUint16()].text,
|
|
183
|
+
reader: createReader(reader.readBytes(reader.readUint32())),
|
|
184
|
+
}));
|
|
107
185
|
const isOverride = (access & ACCESS_PUBLIC) !== 0 && (access & ACCESS_STATIC) !== 0;
|
|
108
|
-
if (isOverride)
|
|
186
|
+
if (!isOverride) continue;
|
|
187
|
+
const code = attributes.find((attribute) => attribute.name === "Code")?.reader;
|
|
188
|
+
// A Code attribute holds max_stack and max_locals before the length of the bytecode.
|
|
189
|
+
code?.readBytes(4);
|
|
190
|
+
const thrown = attributes.find((attribute) => attribute.name === "Exceptions")?.reader;
|
|
191
|
+
const exceptions = thrown
|
|
192
|
+
? Array.from({ length: thrown.readUint16() }, () =>
|
|
193
|
+
getJavaClassName(pool, thrown.readUint16()),
|
|
194
|
+
)
|
|
195
|
+
: [];
|
|
196
|
+
const modifiers = METHOD_MODIFIERS.filter(([flag]) => (access & flag) !== 0).map(
|
|
197
|
+
([, modifier]) => modifier,
|
|
198
|
+
);
|
|
199
|
+
const returnType = getTypeNames(descriptor.slice(parametersEnd + 1))[0];
|
|
200
|
+
const throwsClause = exceptions.length === 0 ? "" : ` throws ${exceptions.join(",")}`;
|
|
201
|
+
methods.push({
|
|
202
|
+
name,
|
|
203
|
+
arity: parameters.length,
|
|
204
|
+
code: code?.readBytes(code.readUint32()),
|
|
205
|
+
signature: `${modifiers.join(" ")} ${returnType} ${className}.${name}(${parameters.join(",")})${throwsClause}`,
|
|
206
|
+
});
|
|
109
207
|
}
|
|
110
208
|
return { pool, methods };
|
|
111
209
|
};
|
|
112
210
|
|
|
113
|
-
const
|
|
114
|
-
|
|
115
|
-
const getMember = (pool: PoolEntry[], index: number) => {
|
|
211
|
+
const getMemberReference = (pool: PoolEntry[], index: number) => {
|
|
116
212
|
const reference = pool[index];
|
|
117
213
|
const nameAndType = pool[reference.second];
|
|
118
214
|
return {
|
|
@@ -130,70 +226,70 @@ const getReturnedLiteral = (
|
|
|
130
226
|
className: string,
|
|
131
227
|
location: SourceLocation,
|
|
132
228
|
) => {
|
|
133
|
-
const
|
|
229
|
+
const createUnsupportedError = () =>
|
|
134
230
|
new TlaUnsupportedError(
|
|
135
231
|
`The Java override ${className}.${method.name} computes its value, which tla-ts cannot run`,
|
|
136
232
|
);
|
|
137
233
|
const code = method.code;
|
|
138
|
-
if (!code) throw
|
|
234
|
+
if (!code) throw createUnsupportedError();
|
|
139
235
|
const stack: StackItem[] = [];
|
|
140
236
|
const pop = () => {
|
|
141
237
|
const item = stack.pop();
|
|
142
|
-
if (item === undefined) throw
|
|
238
|
+
if (item === undefined) throw createUnsupportedError();
|
|
143
239
|
return item;
|
|
144
240
|
};
|
|
145
241
|
const getConstant = (index: number) => {
|
|
146
242
|
const entry = pool[index];
|
|
147
|
-
if (entry.tag ===
|
|
148
|
-
if (entry.tag ===
|
|
149
|
-
throw
|
|
243
|
+
if (entry.tag === POOL_TAG.integer) return entry.value;
|
|
244
|
+
if (entry.tag === POOL_TAG.string) return pool[entry.first].text;
|
|
245
|
+
throw createUnsupportedError();
|
|
150
246
|
};
|
|
151
247
|
for (let offset = 0; offset < code.length;) {
|
|
152
248
|
const opcode = code[offset];
|
|
153
249
|
const getIndex = () => (code[offset + 1] << 8) | code[offset + 2];
|
|
154
|
-
if (opcode >=
|
|
155
|
-
stack.push(opcode -
|
|
250
|
+
if (opcode >= OPCODE.iconstM1 && opcode <= OPCODE.iconst5) {
|
|
251
|
+
stack.push(opcode - OPCODE.iconst0);
|
|
156
252
|
offset += 1;
|
|
157
|
-
} else if (opcode ===
|
|
253
|
+
} else if (opcode === OPCODE.bipush) {
|
|
158
254
|
stack.push((code[offset + 1] << 24) >> 24);
|
|
159
255
|
offset += 2;
|
|
160
|
-
} else if (opcode ===
|
|
256
|
+
} else if (opcode === OPCODE.sipush) {
|
|
161
257
|
stack.push((getIndex() << 16) >> 16);
|
|
162
258
|
offset += 3;
|
|
163
|
-
} else if (opcode ===
|
|
259
|
+
} else if (opcode === OPCODE.ldc) {
|
|
164
260
|
stack.push(getConstant(code[offset + 1]));
|
|
165
261
|
offset += 2;
|
|
166
|
-
} else if (opcode ===
|
|
262
|
+
} else if (opcode === OPCODE.ldcW) {
|
|
167
263
|
stack.push(getConstant(getIndex()));
|
|
168
264
|
offset += 3;
|
|
169
|
-
} else if (opcode ===
|
|
265
|
+
} else if (opcode === OPCODE.dup) {
|
|
170
266
|
const top = pop();
|
|
171
267
|
stack.push(top, top);
|
|
172
268
|
offset += 1;
|
|
173
|
-
} else if (opcode ===
|
|
174
|
-
const field =
|
|
175
|
-
if (field.className !== `${VALUE_PACKAGE}BoolValue`) throw
|
|
176
|
-
if (field.name !== "ValTrue" && field.name !== "ValFalse") throw
|
|
269
|
+
} else if (opcode === OPCODE.getstatic) {
|
|
270
|
+
const field = getMemberReference(pool, getIndex());
|
|
271
|
+
if (field.className !== `${VALUE_PACKAGE}BoolValue`) throw createUnsupportedError();
|
|
272
|
+
if (field.name !== "ValTrue" && field.name !== "ValFalse") throw createUnsupportedError();
|
|
177
273
|
stack.push({
|
|
178
274
|
kind: "Identifier",
|
|
179
275
|
name: field.name === "ValTrue" ? "TRUE" : "FALSE",
|
|
180
276
|
location,
|
|
181
277
|
});
|
|
182
278
|
offset += 3;
|
|
183
|
-
} else if (opcode ===
|
|
184
|
-
const callee =
|
|
279
|
+
} else if (opcode === OPCODE.invokestatic) {
|
|
280
|
+
const callee = getMemberReference(pool, getIndex());
|
|
185
281
|
const value = pop();
|
|
186
282
|
if (callee.className !== `${VALUE_PACKAGE}IntValue` || callee.name !== "gen") {
|
|
187
|
-
throw
|
|
283
|
+
throw createUnsupportedError();
|
|
188
284
|
}
|
|
189
|
-
if (typeof value !== "number") throw
|
|
285
|
+
if (typeof value !== "number") throw createUnsupportedError();
|
|
190
286
|
stack.push({ kind: "Number", value, location });
|
|
191
287
|
offset += 3;
|
|
192
|
-
} else if (opcode ===
|
|
288
|
+
} else if (opcode === OPCODE.new) {
|
|
193
289
|
stack.push({ className: getClassName(pool, getIndex()), value: undefined });
|
|
194
290
|
offset += 3;
|
|
195
|
-
} else if (opcode ===
|
|
196
|
-
const constructor =
|
|
291
|
+
} else if (opcode === OPCODE.invokespecial) {
|
|
292
|
+
const constructor = getMemberReference(pool, getIndex());
|
|
197
293
|
const text = pop();
|
|
198
294
|
const instance = pop();
|
|
199
295
|
const isStringValue =
|
|
@@ -202,34 +298,47 @@ const getReturnedLiteral = (
|
|
|
202
298
|
typeof text === "string" &&
|
|
203
299
|
typeof instance === "object" &&
|
|
204
300
|
"className" in instance;
|
|
205
|
-
if (!isStringValue) throw
|
|
301
|
+
if (!isStringValue) throw createUnsupportedError();
|
|
206
302
|
instance.value = { kind: "String", value: text, location };
|
|
207
303
|
offset += 3;
|
|
208
|
-
} else if (opcode ===
|
|
304
|
+
} else if (opcode === OPCODE.areturn) {
|
|
209
305
|
const returned = pop();
|
|
210
|
-
if (typeof returned !== "object") throw
|
|
306
|
+
if (typeof returned !== "object") throw createUnsupportedError();
|
|
211
307
|
if ("className" in returned) {
|
|
212
|
-
if (!returned.value) throw
|
|
308
|
+
if (!returned.value) throw createUnsupportedError();
|
|
213
309
|
return returned.value;
|
|
214
310
|
}
|
|
215
311
|
return returned;
|
|
216
312
|
} else {
|
|
217
|
-
throw
|
|
313
|
+
throw createUnsupportedError();
|
|
218
314
|
}
|
|
219
315
|
}
|
|
220
|
-
throw
|
|
316
|
+
throw createUnsupportedError();
|
|
221
317
|
};
|
|
222
318
|
|
|
223
|
-
// TLC loads a class named after each module and replaces
|
|
224
|
-
// with the public static method of the same name and arity.
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
319
|
+
// TLC loads a class named after each module and replaces each operator of the module that the
|
|
320
|
+
// root module sees with the public static method of the same name and arity. It reports whether
|
|
321
|
+
// each method matched an operator.
|
|
322
|
+
export const overrideDefinitions = (
|
|
323
|
+
module: Module,
|
|
324
|
+
bytes: Uint8Array | undefined,
|
|
325
|
+
isRoot: boolean,
|
|
326
|
+
): { module: Module; overrides: JavaOverride[] } => {
|
|
327
|
+
if (!bytes) return { module, overrides: [] };
|
|
328
|
+
const classFile = readClassFile(bytes);
|
|
329
|
+
const arities = new Map(
|
|
330
|
+
module.definitions
|
|
331
|
+
.filter((definition) => isRoot || !definition.isLocal)
|
|
332
|
+
.map((definition) => [
|
|
333
|
+
definition.name,
|
|
334
|
+
definition.kind === "Operator" ? definition.params.length : 0,
|
|
335
|
+
]),
|
|
336
|
+
);
|
|
337
|
+
const isMatched = (method: JavaMethod) => arities.get(method.name) === method.arity;
|
|
228
338
|
const definitions = module.definitions.map((definition): Definition => {
|
|
229
339
|
if (definition.kind !== "Operator") return definition;
|
|
230
340
|
const method = classFile.methods.find(
|
|
231
|
-
(candidate) =>
|
|
232
|
-
candidate.name === definition.name && candidate.arity === definition.params.length,
|
|
341
|
+
(candidate) => candidate.name === definition.name && isMatched(candidate),
|
|
233
342
|
);
|
|
234
343
|
if (!method) return definition;
|
|
235
344
|
return {
|
|
@@ -237,5 +346,13 @@ export const overrideDefinitions = (module: Module, bytes: Uint8Array | undefine
|
|
|
237
346
|
body: getReturnedLiteral(method, classFile.pool, module.name, definition.location),
|
|
238
347
|
};
|
|
239
348
|
});
|
|
240
|
-
return {
|
|
349
|
+
return {
|
|
350
|
+
module: { ...module, definitions },
|
|
351
|
+
overrides: classFile.methods.map((method) => ({
|
|
352
|
+
module: module.name,
|
|
353
|
+
operator: method.name,
|
|
354
|
+
signature: method.signature,
|
|
355
|
+
isMatched: isMatched(method),
|
|
356
|
+
})),
|
|
357
|
+
};
|
|
241
358
|
};
|
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
|
];
|