tla-ts 0.0.4-dev.0be9567 → 0.0.4-dev.22c041b
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 +77 -122
- 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 +44 -12
- package/dist/index.d.ts +44 -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 +17 -15
- 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 +135 -120
- 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} +169 -142
- 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 +16 -20
- package/src/state-graph.ts +9 -8
- package/src/substitution-levels.ts +2 -2
- package/src/successors.ts +38 -22
- 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 +119 -71
- 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
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PcalError, PcalRuntimeError, PcalBugError } from "
|
|
1
|
+
import { PcalError, PcalRuntimeError, PcalBugError } from "../errors";
|
|
2
2
|
import {
|
|
3
3
|
clonePcalExpr,
|
|
4
4
|
createNormalizedPcalExpr,
|
|
@@ -34,7 +34,7 @@ import {
|
|
|
34
34
|
type PcalWith,
|
|
35
35
|
createPcalExpr,
|
|
36
36
|
createPcalToken,
|
|
37
|
-
} from "./
|
|
37
|
+
} from "./ast";
|
|
38
38
|
import {
|
|
39
39
|
createPcalTokenizerState,
|
|
40
40
|
getPcalAlgorithmToken,
|
|
@@ -42,7 +42,7 @@ import {
|
|
|
42
42
|
tokenizePcalExpr,
|
|
43
43
|
type PcalCharReader,
|
|
44
44
|
type PcalTokenizerState,
|
|
45
|
-
} from "./
|
|
45
|
+
} from "./tokenize";
|
|
46
46
|
|
|
47
47
|
// The translator's state that its Java code keeps in static fields, which SANY never resets
|
|
48
48
|
// between the modules it validates: the options, the tokenizer's state, ParseAlgorithm's
|
|
@@ -84,7 +84,6 @@ interface PcalParserState {
|
|
|
84
84
|
hasDefaultInitialization: boolean;
|
|
85
85
|
currentProcedure: string | undefined;
|
|
86
86
|
procedures: PcalProcedure[];
|
|
87
|
-
pSyntax: boolean;
|
|
88
87
|
cSyntax: boolean;
|
|
89
88
|
plusLabels: string[];
|
|
90
89
|
minusLabels: string[];
|
|
@@ -92,13 +91,11 @@ interface PcalParserState {
|
|
|
92
91
|
gotoUsed: boolean;
|
|
93
92
|
gotoDoneUsed: boolean;
|
|
94
93
|
omitPC: boolean;
|
|
95
|
-
omitStutteringWhenDone: boolean;
|
|
96
94
|
}
|
|
97
95
|
|
|
98
96
|
interface PcalParseResult {
|
|
99
97
|
ast: PcalAlgorithm;
|
|
100
98
|
omitPC: boolean;
|
|
101
|
-
omitStutteringWhenDone: boolean;
|
|
102
99
|
hasDefaultInitialization: boolean;
|
|
103
100
|
}
|
|
104
101
|
|
|
@@ -142,7 +139,6 @@ export const parsePcalAlgorithm = (
|
|
|
142
139
|
hasDefaultInitialization: false,
|
|
143
140
|
currentProcedure: undefined,
|
|
144
141
|
procedures: [],
|
|
145
|
-
pSyntax: false,
|
|
146
142
|
cSyntax: false,
|
|
147
143
|
plusLabels: [],
|
|
148
144
|
minusLabels: [],
|
|
@@ -150,7 +146,6 @@ export const parsePcalAlgorithm = (
|
|
|
150
146
|
gotoUsed: false,
|
|
151
147
|
gotoDoneUsed: false,
|
|
152
148
|
omitPC: params.inputVersionNumber >= 1500,
|
|
153
|
-
omitStutteringWhenDone: params.inputVersionNumber >= 1500,
|
|
154
149
|
};
|
|
155
150
|
|
|
156
151
|
// ParseAlgorithm.ParsingError.
|
|
@@ -255,7 +250,7 @@ export const parsePcalAlgorithm = (
|
|
|
255
250
|
|
|
256
251
|
const gobbleCommaOrSemicolon = () => gobbleThis(peekAtAlgToken(1) === "," ? "," : ";");
|
|
257
252
|
|
|
258
|
-
const gobbleBeginOrLeftBrace = () => gobbleThis(state.
|
|
253
|
+
const gobbleBeginOrLeftBrace = () => gobbleThis(state.cSyntax ? "{" : "begin");
|
|
259
254
|
|
|
260
255
|
const gobbleEndOrRightBrace = (name: string) => {
|
|
261
256
|
if (state.cSyntax) {
|
|
@@ -362,7 +357,7 @@ export const parsePcalAlgorithm = (
|
|
|
362
357
|
const getStmtSeq = (): PcalStmt[] => {
|
|
363
358
|
const result: PcalStmt[] = [];
|
|
364
359
|
const isEnd = (token: string) =>
|
|
365
|
-
(state.
|
|
360
|
+
(!state.cSyntax && ["end", "else", "elsif", "or"].includes(token)) ||
|
|
366
361
|
(state.cSyntax && token === "}");
|
|
367
362
|
while (!isEnd(peekAtAlgToken(1))) result.push(...getCStmt());
|
|
368
363
|
if (state.cSyntax && result.length === 0) throwParsingError("Empty statement list");
|
|
@@ -467,9 +462,9 @@ export const parsePcalAlgorithm = (
|
|
|
467
462
|
const test = getExpr();
|
|
468
463
|
if (state.cSyntax) gobbleThis(")");
|
|
469
464
|
if (test.tokens.length === 0) throwParsingError("Empty while test at ");
|
|
470
|
-
if (state.
|
|
471
|
-
const unlabDo = state.
|
|
472
|
-
if (state.
|
|
465
|
+
if (!state.cSyntax) gobbleThis("do");
|
|
466
|
+
const unlabDo = state.cSyntax ? getCStmt() : getStmtSeq();
|
|
467
|
+
if (!state.cSyntax) {
|
|
473
468
|
gobbleThis("end");
|
|
474
469
|
gobbleThis("while");
|
|
475
470
|
gobbleThis(";");
|
|
@@ -495,18 +490,18 @@ export const parsePcalAlgorithm = (
|
|
|
495
490
|
result.test = getExpr();
|
|
496
491
|
if (state.cSyntax) gobbleThis(")");
|
|
497
492
|
if (result.test.tokens.length === 0) throwParsingError("Empty if test at ");
|
|
498
|
-
if (state.
|
|
499
|
-
result.unlabThen = state.
|
|
493
|
+
if (!state.cSyntax) gobbleThis("then");
|
|
494
|
+
result.unlabThen = state.cSyntax ? getCStmt() : getStmtSeq();
|
|
500
495
|
const next = peekAtAlgToken(1);
|
|
501
496
|
if (next === "else") {
|
|
502
497
|
mustGobbleThis("else");
|
|
503
|
-
result.unlabElse = state.
|
|
498
|
+
result.unlabElse = state.cSyntax ? getCStmt() : getStmtSeq();
|
|
504
499
|
}
|
|
505
|
-
if (state.
|
|
506
|
-
if (state.
|
|
500
|
+
if (!state.cSyntax && next === "elsif") result.unlabElse = [getIf(depth + 1)];
|
|
501
|
+
if (!state.cSyntax && !["else", "elsif", "end"].includes(next)) {
|
|
507
502
|
throwParsingError('Expecting "else", "elsif", or "end"');
|
|
508
503
|
}
|
|
509
|
-
if (state.
|
|
504
|
+
if (!state.cSyntax && depth === 0) {
|
|
510
505
|
gobbleThis("end");
|
|
511
506
|
gobbleThis("if");
|
|
512
507
|
gobbleThis(";");
|
|
@@ -532,7 +527,7 @@ export const parsePcalAlgorithm = (
|
|
|
532
527
|
const clause: PcalClause = {
|
|
533
528
|
...createPcalBase(),
|
|
534
529
|
kind: "Clause",
|
|
535
|
-
unlabOr: state.
|
|
530
|
+
unlabOr: state.cSyntax ? getCStmt() : getStmtSeq(),
|
|
536
531
|
labOr: [],
|
|
537
532
|
};
|
|
538
533
|
if (clause.unlabOr.length === 0) {
|
|
@@ -542,7 +537,7 @@ export const parsePcalAlgorithm = (
|
|
|
542
537
|
if (peekAtAlgToken(1) !== "or") break;
|
|
543
538
|
mustGobbleThis("or");
|
|
544
539
|
}
|
|
545
|
-
if (state.
|
|
540
|
+
if (!state.cSyntax) {
|
|
546
541
|
mustGobbleThis("end");
|
|
547
542
|
gobbleThis("either");
|
|
548
543
|
gobbleThis(";");
|
|
@@ -569,9 +564,9 @@ export const parsePcalAlgorithm = (
|
|
|
569
564
|
};
|
|
570
565
|
result.isEq = gobbleEqualOrIf();
|
|
571
566
|
result.exp = getExpr();
|
|
572
|
-
if (state.
|
|
567
|
+
if (!state.cSyntax || peekAtAlgToken(1) !== ")") gobbleCommaOrSemicolon();
|
|
573
568
|
if (result.exp.tokens.length === 0) throwParsingError("Empty with expression at ");
|
|
574
|
-
const isBlockBody = state.
|
|
569
|
+
const isBlockBody = !state.cSyntax && peekAtAlgToken(1) === "do";
|
|
575
570
|
const isBraceBody = state.cSyntax && peekAtAlgToken(1) === ")";
|
|
576
571
|
if (isBlockBody) gobbleThis("do");
|
|
577
572
|
if (isBraceBody) mustGobbleThis(")");
|
|
@@ -1337,17 +1332,16 @@ export const parsePcalAlgorithm = (
|
|
|
1337
1332
|
// lets the translation omit pc.
|
|
1338
1333
|
const checkBody = (body: PcalStmt[]) => {
|
|
1339
1334
|
if (body.length === 0) return;
|
|
1340
|
-
const
|
|
1335
|
+
const keepPC = () => {
|
|
1341
1336
|
state.omitPC = false;
|
|
1342
|
-
state.omitStutteringWhenDone = false;
|
|
1343
1337
|
};
|
|
1344
1338
|
const labeled = body[0];
|
|
1345
|
-
if (body.length > 1 || labeled.kind !== "LabeledStmt") return
|
|
1339
|
+
if (body.length > 1 || labeled.kind !== "LabeledStmt") return keepPC();
|
|
1346
1340
|
if (labeled.stmts.length === 0) return;
|
|
1347
1341
|
const whileStmt = labeled.stmts[0];
|
|
1348
|
-
if (labeled.stmts.length > 1 || whileStmt.kind !== "While") return
|
|
1342
|
+
if (labeled.stmts.length > 1 || whileStmt.kind !== "While") return keepPC();
|
|
1349
1343
|
if (!isOneTokenPcalExpr(whileStmt.test) || whileStmt.test.tokens[0][0].string !== "TRUE") {
|
|
1350
|
-
return
|
|
1344
|
+
return keepPC();
|
|
1351
1345
|
}
|
|
1352
1346
|
if (whileStmt.labDo.length > 0) state.omitPC = false;
|
|
1353
1347
|
const hasLabeled = whileStmt.unlabDo.some((stmt) =>
|
|
@@ -1365,22 +1359,6 @@ export const parsePcalAlgorithm = (
|
|
|
1365
1359
|
throw new PcalError([header, ...state.addedLabelsLocs].join("\n "));
|
|
1366
1360
|
};
|
|
1367
1361
|
|
|
1368
|
-
// ParseAlgorithm.ReportLabels.
|
|
1369
|
-
const reportLabels = () => {
|
|
1370
|
-
if (!params.reportLabelsFlag) {
|
|
1371
|
-
session.log("Labels added.");
|
|
1372
|
-
return;
|
|
1373
|
-
}
|
|
1374
|
-
session.log(
|
|
1375
|
-
state.addedLabels.length > 1
|
|
1376
|
-
? "The following labels were added:"
|
|
1377
|
-
: "The following label was added:",
|
|
1378
|
-
);
|
|
1379
|
-
state.addedLabels.forEach((label, index) =>
|
|
1380
|
-
session.log(` ${label} at ${state.addedLabelsLocs[index]}`),
|
|
1381
|
-
);
|
|
1382
|
-
};
|
|
1383
|
-
|
|
1384
1362
|
const fixProcedures = (macros: PcalMacro[]) =>
|
|
1385
1363
|
state.procedures.forEach((procedure) => {
|
|
1386
1364
|
state.currentProcedure = procedure.name;
|
|
@@ -1391,11 +1369,9 @@ export const parsePcalAlgorithm = (
|
|
|
1391
1369
|
const parse = (): PcalAlgorithm => {
|
|
1392
1370
|
if (isFairAlgorithm) {
|
|
1393
1371
|
if (getAlgToken() !== "algorithm") throwParsingError("`--fair' not followed by `algorithm'");
|
|
1394
|
-
params.fairAlgorithm = true;
|
|
1395
1372
|
}
|
|
1396
1373
|
const name = getAlgToken();
|
|
1397
1374
|
state.cSyntax = peekAtAlgToken(1) === "{";
|
|
1398
|
-
state.pSyntax = !state.cSyntax;
|
|
1399
1375
|
if (state.cSyntax) mustGobbleThis("{");
|
|
1400
1376
|
const decls =
|
|
1401
1377
|
peekAtAlgToken(1) === "variable" || peekAtAlgToken(1) === "variables" ? getVarDecls() : [];
|
|
@@ -1435,24 +1411,17 @@ export const parsePcalAlgorithm = (
|
|
|
1435
1411
|
}
|
|
1436
1412
|
gobbleEndOrRightBrace("algorithm");
|
|
1437
1413
|
checkForDuplicateMacros(macros);
|
|
1438
|
-
|
|
1414
|
+
procs.forEach((proc) => {
|
|
1439
1415
|
expandMacrosInStmtSeq(proc.body, macros);
|
|
1440
1416
|
proc.body = makeLabeledStmtSeq(proc.body);
|
|
1441
|
-
state.omitStutteringWhenDone = true;
|
|
1442
1417
|
checkBody(proc.body);
|
|
1443
|
-
return state.omitStutteringWhenDone;
|
|
1444
1418
|
});
|
|
1445
|
-
state.omitStutteringWhenDone = omitsStutteringWhenDone.includes(true);
|
|
1446
1419
|
fixProcedures(macros);
|
|
1447
1420
|
if (state.addedLabels.length > 0) {
|
|
1448
1421
|
if (!params.labelFlag) throwAddedLabels();
|
|
1449
|
-
|
|
1450
|
-
}
|
|
1451
|
-
if (state.gotoDoneUsed) {
|
|
1452
|
-
state.omitPC = false;
|
|
1453
|
-
state.omitStutteringWhenDone = false;
|
|
1422
|
+
session.log("Labels added.");
|
|
1454
1423
|
}
|
|
1455
|
-
if (state.gotoUsed) state.omitPC = false;
|
|
1424
|
+
if (state.gotoDoneUsed || state.gotoUsed) state.omitPC = false;
|
|
1456
1425
|
return {
|
|
1457
1426
|
...createPcalBase(),
|
|
1458
1427
|
kind: "Multiprocess",
|
|
@@ -1486,14 +1455,10 @@ export const parsePcalAlgorithm = (
|
|
|
1486
1455
|
const labeledBody = makeLabeledStmtSeq(body);
|
|
1487
1456
|
if (state.addedLabels.length > 0) {
|
|
1488
1457
|
if (state.hasLabel && !params.labelFlag) throwAddedLabels();
|
|
1489
|
-
|
|
1490
|
-
}
|
|
1491
|
-
if (state.gotoUsed) state.omitPC = false;
|
|
1492
|
-
if (!state.gotoDoneUsed) checkBody(labeledBody);
|
|
1493
|
-
if (state.gotoDoneUsed) {
|
|
1494
|
-
state.omitPC = false;
|
|
1495
|
-
state.omitStutteringWhenDone = false;
|
|
1458
|
+
session.log("Labels added.");
|
|
1496
1459
|
}
|
|
1460
|
+
if (state.gotoUsed || state.gotoDoneUsed) state.omitPC = false;
|
|
1461
|
+
checkBody(labeledBody);
|
|
1497
1462
|
return {
|
|
1498
1463
|
...createPcalBase(),
|
|
1499
1464
|
kind: "Uniprocess",
|
|
@@ -1513,7 +1478,6 @@ export const parsePcalAlgorithm = (
|
|
|
1513
1478
|
return {
|
|
1514
1479
|
ast,
|
|
1515
1480
|
omitPC: state.omitPC,
|
|
1516
|
-
omitStutteringWhenDone: state.omitStutteringWhenDone,
|
|
1517
1481
|
hasDefaultInitialization: state.hasDefaultInitialization,
|
|
1518
1482
|
};
|
|
1519
1483
|
} catch (error) {
|
|
@@ -1,56 +1,31 @@
|
|
|
1
|
-
import { PcalError, PcalBugError } from "
|
|
2
|
-
import { createNormalizedPcalExpr, createPcalToken, PCAL_TOKEN, type PcalToken } from "./
|
|
1
|
+
import { PcalError, PcalBugError } from "../errors";
|
|
2
|
+
import { createNormalizedPcalExpr, createPcalToken, PCAL_TOKEN, type PcalToken } from "./ast";
|
|
3
3
|
|
|
4
|
-
// PcalCharReader: reads the algorithm's characters from
|
|
5
|
-
//
|
|
6
|
-
//
|
|
4
|
+
// PcalCharReader: reads the algorithm's characters from a start position to the end of the lines,
|
|
5
|
+
// returning "\n" at the end of each line and "\t" at the end of the input. Columns count code
|
|
6
|
+
// points. The lines come without tabs, as trans.removeTabs replaced them.
|
|
7
7
|
export interface PcalCharReader {
|
|
8
8
|
lines: string[];
|
|
9
9
|
currentLine: string[] | undefined;
|
|
10
10
|
line: number;
|
|
11
11
|
column: number;
|
|
12
12
|
vcolumn: number;
|
|
13
|
-
lastLine: number;
|
|
14
|
-
lastColumn: number;
|
|
15
|
-
isTabToSpaces: boolean;
|
|
16
13
|
}
|
|
17
14
|
|
|
18
15
|
export const createPcalCharReader = (
|
|
19
16
|
lines: string[],
|
|
20
17
|
firstLine: number,
|
|
21
18
|
firstColumn: number,
|
|
22
|
-
lastLine: number,
|
|
23
|
-
lastColumn: number,
|
|
24
19
|
): PcalCharReader => ({
|
|
25
20
|
lines,
|
|
26
21
|
currentLine: firstLine < lines.length ? Array.from(lines[firstLine]) : undefined,
|
|
27
22
|
line: firstLine,
|
|
28
23
|
column: firstColumn,
|
|
29
|
-
vcolumn:
|
|
30
|
-
firstLine < lines.length
|
|
31
|
-
? Array.from(lines[firstLine].slice(0, firstColumn)).reduce(
|
|
32
|
-
(vcolumn, char) => (char === "\t" ? (Math.floor(vcolumn / 8) + 1) * 8 : vcolumn + 1),
|
|
33
|
-
0,
|
|
34
|
-
)
|
|
35
|
-
: 0,
|
|
36
|
-
lastLine,
|
|
37
|
-
lastColumn,
|
|
38
|
-
isTabToSpaces: false,
|
|
24
|
+
vcolumn: firstLine < lines.length ? Array.from(lines[firstLine].slice(0, firstColumn)).length : 0,
|
|
39
25
|
});
|
|
40
26
|
|
|
41
27
|
const getNextPcalChar = (reader: PcalCharReader) => {
|
|
42
28
|
if (reader.currentLine === undefined) return "\t";
|
|
43
|
-
if (reader.isTabToSpaces) {
|
|
44
|
-
reader.vcolumn += 1;
|
|
45
|
-
if (reader.vcolumn % 8 === 0) reader.isTabToSpaces = false;
|
|
46
|
-
return " ";
|
|
47
|
-
}
|
|
48
|
-
if (
|
|
49
|
-
reader.line > reader.lastLine ||
|
|
50
|
-
(reader.line === reader.lastLine && reader.column >= reader.lastColumn)
|
|
51
|
-
) {
|
|
52
|
-
return "\t";
|
|
53
|
-
}
|
|
54
29
|
if (reader.currentLine.length === reader.column) {
|
|
55
30
|
reader.line += 1;
|
|
56
31
|
reader.column = 0;
|
|
@@ -62,9 +37,7 @@ const getNextPcalChar = (reader: PcalCharReader) => {
|
|
|
62
37
|
const char = reader.currentLine[reader.column];
|
|
63
38
|
reader.column += 1;
|
|
64
39
|
reader.vcolumn += 1;
|
|
65
|
-
|
|
66
|
-
if (reader.vcolumn % 8 !== 0) reader.isTabToSpaces = true;
|
|
67
|
-
return " ";
|
|
40
|
+
return char;
|
|
68
41
|
};
|
|
69
42
|
|
|
70
43
|
const backspacePcalReader = (reader: PcalCharReader) => {
|
|
@@ -77,11 +50,9 @@ const backspacePcalReader = (reader: PcalCharReader) => {
|
|
|
77
50
|
throw new PcalBugError("PcalCharReader.backspace trying to move past beginning of reader");
|
|
78
51
|
}
|
|
79
52
|
reader.line -= 1;
|
|
80
|
-
|
|
81
|
-
reader.
|
|
82
|
-
reader.
|
|
83
|
-
reader.vcolumn = 0;
|
|
84
|
-
while (reader.column < currentLine.length - 1) getNextPcalChar(reader);
|
|
53
|
+
reader.currentLine = Array.from(reader.lines[reader.line]);
|
|
54
|
+
reader.column = Math.max(reader.currentLine.length - 1, 0);
|
|
55
|
+
reader.vcolumn = reader.column;
|
|
85
56
|
};
|
|
86
57
|
|
|
87
58
|
// PcalCharReader.peek: the rest of the line from the next character that is not white space, with
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PcalError, PcalBugError } from "
|
|
1
|
+
import { PcalError, PcalBugError } from "../errors";
|
|
2
2
|
import {
|
|
3
3
|
createNormalizedPcalExpr,
|
|
4
4
|
createPcalBase,
|
|
@@ -29,7 +29,7 @@ import {
|
|
|
29
29
|
type PcalVarDecl,
|
|
30
30
|
type PcalWhen,
|
|
31
31
|
type PcalWhile,
|
|
32
|
-
} from "./
|
|
32
|
+
} from "./ast";
|
|
33
33
|
|
|
34
34
|
// PcalSymTab's symbol types, which index PCAL_SYMBOL_TYPE_NAMES.
|
|
35
35
|
const PCAL_SYMBOL = {
|
|
@@ -66,14 +66,10 @@ interface PcalSymbol {
|
|
|
66
66
|
type: number;
|
|
67
67
|
id: string;
|
|
68
68
|
context: string;
|
|
69
|
-
contextType: string;
|
|
70
|
-
line: number;
|
|
71
|
-
col: number;
|
|
72
69
|
useThis: string;
|
|
73
70
|
}
|
|
74
71
|
|
|
75
|
-
// PcalSymTab.ProcedureEntry
|
|
76
|
-
// statements lacks.
|
|
72
|
+
// PcalSymTab.ProcedureEntry. initialPC is the first label, which a body with no statements lacks.
|
|
77
73
|
interface PcalProcedureEntry {
|
|
78
74
|
name: string;
|
|
79
75
|
params: PcalPVarDecl[];
|
|
@@ -81,18 +77,11 @@ interface PcalProcedureEntry {
|
|
|
81
77
|
initialPC: string | undefined;
|
|
82
78
|
}
|
|
83
79
|
|
|
84
|
-
interface PcalProcessEntry {
|
|
85
|
-
name: string;
|
|
86
|
-
initialPC: string | undefined;
|
|
87
|
-
}
|
|
88
|
-
|
|
89
80
|
interface PcalSymbolTable {
|
|
90
81
|
symbols: PcalSymbol[];
|
|
91
82
|
procedures: PcalProcedureEntry[];
|
|
92
|
-
|
|
93
|
-
disambiguateReport: string[];
|
|
83
|
+
processNames: string[];
|
|
94
84
|
errorReport: string;
|
|
95
|
-
initialPC: string | undefined;
|
|
96
85
|
}
|
|
97
86
|
|
|
98
87
|
// A Return or CallReturn outside a procedure has no from, and PcalSymTab.FindSym never matches a
|
|
@@ -116,20 +105,7 @@ const findProcedureIndex = (table: PcalSymbolTable, name: string) => {
|
|
|
116
105
|
return index === -1 ? table.procedures.length : index;
|
|
117
106
|
};
|
|
118
107
|
|
|
119
|
-
const
|
|
120
|
-
const index = table.processes.findIndex((process) => process.name === name);
|
|
121
|
-
return index === -1 ? table.processes.length : index;
|
|
122
|
-
};
|
|
123
|
-
|
|
124
|
-
const insertSymbol = (
|
|
125
|
-
table: PcalSymbolTable,
|
|
126
|
-
type: number,
|
|
127
|
-
id: string,
|
|
128
|
-
context: string,
|
|
129
|
-
contextType: string,
|
|
130
|
-
line: number,
|
|
131
|
-
col: number,
|
|
132
|
-
) => {
|
|
108
|
+
const insertSymbol = (table: PcalSymbolTable, type: number, id: string, context: string) => {
|
|
133
109
|
const isVariable =
|
|
134
110
|
type === PCAL_SYMBOL.procedureVar ||
|
|
135
111
|
type === PCAL_SYMBOL.processVar ||
|
|
@@ -139,7 +115,7 @@ const insertSymbol = (
|
|
|
139
115
|
findSymbolInContext(table, id, context) !== undefined
|
|
140
116
|
: findSymbol(table, type, id, context) !== undefined;
|
|
141
117
|
if (isDefined) return false;
|
|
142
|
-
table.symbols.push({ type, id, context,
|
|
118
|
+
table.symbols.push({ type, id, context, useThis: id });
|
|
143
119
|
return true;
|
|
144
120
|
};
|
|
145
121
|
|
|
@@ -158,38 +134,22 @@ const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
|
158
134
|
const table: PcalSymbolTable = {
|
|
159
135
|
symbols: [],
|
|
160
136
|
procedures: [],
|
|
161
|
-
|
|
162
|
-
disambiguateReport: [],
|
|
137
|
+
processNames: [],
|
|
163
138
|
errorReport: "",
|
|
164
|
-
initialPC: undefined,
|
|
165
139
|
};
|
|
166
140
|
|
|
167
|
-
const extractLabeledStmt = (
|
|
168
|
-
labeledStmt
|
|
169
|
-
context: string,
|
|
170
|
-
contextType: string,
|
|
171
|
-
) => {
|
|
172
|
-
if (
|
|
173
|
-
!insertSymbol(
|
|
174
|
-
table,
|
|
175
|
-
PCAL_SYMBOL.label,
|
|
176
|
-
labeledStmt.label,
|
|
177
|
-
context,
|
|
178
|
-
contextType,
|
|
179
|
-
labeledStmt.line,
|
|
180
|
-
labeledStmt.col,
|
|
181
|
-
)
|
|
182
|
-
) {
|
|
141
|
+
const extractLabeledStmt = (labeledStmt: PcalLabeledStmt, context: string) => {
|
|
142
|
+
if (!insertSymbol(table, PCAL_SYMBOL.label, labeledStmt.label, context)) {
|
|
183
143
|
table.errorReport += `\nLabel ${labeledStmt.label} redefined at line ${labeledStmt.line}, column ${labeledStmt.col}`;
|
|
184
144
|
}
|
|
185
|
-
labeledStmt.stmts.forEach((stmt) => extractStmt(stmt, context
|
|
145
|
+
labeledStmt.stmts.forEach((stmt) => extractStmt(stmt, context));
|
|
186
146
|
};
|
|
187
147
|
|
|
188
|
-
const extractStmt = (stmt: PcalStmt, context: string
|
|
148
|
+
const extractStmt = (stmt: PcalStmt, context: string): void => {
|
|
189
149
|
const extractStmts = (stmts: PcalStmt[]) =>
|
|
190
|
-
stmts.forEach((innerStmt) => extractStmt(innerStmt, context
|
|
150
|
+
stmts.forEach((innerStmt) => extractStmt(innerStmt, context));
|
|
191
151
|
const extractLabeledStmts = (stmts: PcalLabeledStmt[]) =>
|
|
192
|
-
stmts.forEach((innerStmt) => extractLabeledStmt(innerStmt, context
|
|
152
|
+
stmts.forEach((innerStmt) => extractLabeledStmt(innerStmt, context));
|
|
193
153
|
switch (stmt.kind) {
|
|
194
154
|
case "While":
|
|
195
155
|
extractStmts(stmt.unlabDo);
|
|
@@ -236,10 +196,9 @@ const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
|
236
196
|
const extractVarDecl = (
|
|
237
197
|
decl: PcalVarDecl | PcalPVarDecl,
|
|
238
198
|
context: string,
|
|
239
|
-
contextType = "process",
|
|
240
199
|
type: number = context === "" ? PCAL_SYMBOL.global : PCAL_SYMBOL.processVar,
|
|
241
200
|
) => {
|
|
242
|
-
if (!insertSymbol(table, type, decl.var, context
|
|
201
|
+
if (!insertSymbol(table, type, decl.var, context)) {
|
|
243
202
|
table.errorReport += `\n${PCAL_SYMBOL_TYPE_NAMES[type]} ${decl.var} redefined at line ${decl.line}, column ${decl.col}`;
|
|
244
203
|
}
|
|
245
204
|
};
|
|
@@ -257,70 +216,45 @@ const createPcalSymbolTable = (ast: PcalAlgorithm) => {
|
|
|
257
216
|
initialPC: procedure.body.length === 0 ? undefined : toLabeledStmt(procedure.body[0]).label,
|
|
258
217
|
});
|
|
259
218
|
}
|
|
260
|
-
insertSymbol(
|
|
261
|
-
table,
|
|
262
|
-
PCAL_SYMBOL.procedure,
|
|
263
|
-
procedure.name,
|
|
264
|
-
"",
|
|
265
|
-
"procedure",
|
|
266
|
-
procedure.line,
|
|
267
|
-
procedure.col,
|
|
268
|
-
);
|
|
219
|
+
insertSymbol(table, PCAL_SYMBOL.procedure, procedure.name, "");
|
|
269
220
|
procedure.decls.forEach((decl) =>
|
|
270
|
-
extractVarDecl(decl, procedure.name,
|
|
221
|
+
extractVarDecl(decl, procedure.name, PCAL_SYMBOL.procedureVar),
|
|
271
222
|
);
|
|
272
223
|
procedure.params.forEach((param) =>
|
|
273
|
-
extractVarDecl(param, procedure.name,
|
|
274
|
-
);
|
|
275
|
-
procedure.body.forEach((stmt) =>
|
|
276
|
-
extractLabeledStmt(toLabeledStmt(stmt), procedure.name, "procedure"),
|
|
224
|
+
extractVarDecl(param, procedure.name, PCAL_SYMBOL.parameter),
|
|
277
225
|
);
|
|
226
|
+
procedure.body.forEach((stmt) => extractLabeledStmt(toLabeledStmt(stmt), procedure.name));
|
|
278
227
|
};
|
|
279
228
|
|
|
280
229
|
const extractProcess = (process: PcalProcess) => {
|
|
281
|
-
const isRedefined =
|
|
230
|
+
const isRedefined = table.processNames.includes(process.name);
|
|
282
231
|
if (isRedefined) {
|
|
283
232
|
table.errorReport += `\nProcess ${process.name} redefined at line ${process.line}, column ${process.col}`;
|
|
284
233
|
}
|
|
285
|
-
if (!isRedefined)
|
|
286
|
-
|
|
287
|
-
name: process.name,
|
|
288
|
-
initialPC: process.body.length === 0 ? undefined : toLabeledStmt(process.body[0]).label,
|
|
289
|
-
});
|
|
290
|
-
}
|
|
291
|
-
insertSymbol(
|
|
292
|
-
table,
|
|
293
|
-
PCAL_SYMBOL.process,
|
|
294
|
-
process.name,
|
|
295
|
-
"",
|
|
296
|
-
"process",
|
|
297
|
-
process.line,
|
|
298
|
-
process.col,
|
|
299
|
-
);
|
|
234
|
+
if (!isRedefined) table.processNames.push(process.name);
|
|
235
|
+
insertSymbol(table, PCAL_SYMBOL.process, process.name, "");
|
|
300
236
|
process.decls.forEach((decl) => extractVarDecl(decl, process.name));
|
|
301
|
-
process.body.forEach((stmt) =>
|
|
302
|
-
extractLabeledStmt(toLabeledStmt(stmt), process.name, "process"),
|
|
303
|
-
);
|
|
237
|
+
process.body.forEach((stmt) => extractLabeledStmt(toLabeledStmt(stmt), process.name));
|
|
304
238
|
};
|
|
305
239
|
|
|
306
|
-
insertSymbol(table, PCAL_SYMBOL.global, "pc", ""
|
|
307
|
-
if (ast.prcds.length > 0) insertSymbol(table, PCAL_SYMBOL.global, "stack", ""
|
|
240
|
+
insertSymbol(table, PCAL_SYMBOL.global, "pc", "");
|
|
241
|
+
if (ast.prcds.length > 0) insertSymbol(table, PCAL_SYMBOL.global, "stack", "");
|
|
308
242
|
ast.decls.forEach((decl) => extractVarDecl(decl, ""));
|
|
309
243
|
ast.prcds.forEach(extractProcedure);
|
|
310
244
|
if (ast.kind === "Multiprocess") ast.procs.forEach(extractProcess);
|
|
311
245
|
if (ast.kind === "Uniprocess") {
|
|
312
|
-
|
|
313
|
-
ast.body.forEach((stmt) => extractLabeledStmt(toLabeledStmt(stmt), "", ""));
|
|
246
|
+
ast.body.forEach((stmt) => extractLabeledStmt(toLabeledStmt(stmt), ""));
|
|
314
247
|
}
|
|
315
248
|
if (table.errorReport.length > 0) throw new PcalError(table.errorReport);
|
|
316
249
|
return table;
|
|
317
250
|
};
|
|
318
251
|
|
|
319
252
|
// PcalSymTab.Disambiguate: renames each symbol whose name another symbol already uses, by
|
|
320
|
-
// appending "_", then the letters of its context, then its type.
|
|
253
|
+
// appending "_", then the letters of its context, then its type. Returns whether it renamed any.
|
|
321
254
|
const disambiguatePcalSymbols = (table: PcalSymbolTable) => {
|
|
322
255
|
const isAmbiguous = (id: string) =>
|
|
323
256
|
table.symbols.filter((symbol) => symbol.useThis === id).length > 1;
|
|
257
|
+
const renamed = { isAny: false };
|
|
324
258
|
for (let type = 0; type <= PCAL_SYMBOL_TYPE_COUNT; type += 1) {
|
|
325
259
|
table.symbols.forEach((symbol) => {
|
|
326
260
|
if (symbol.type !== type) return;
|
|
@@ -329,14 +263,10 @@ const disambiguatePcalSymbols = (table: PcalSymbolTable) => {
|
|
|
329
263
|
symbol.useThis +=
|
|
330
264
|
suffixLength === 1 ? "_" : (symbol.context[suffixLength - 2] ?? String(type));
|
|
331
265
|
}
|
|
332
|
-
if (symbol.id
|
|
333
|
-
const context =
|
|
334
|
-
symbol.context.length === 0 ? "" : ` of ${symbol.contextType} ${symbol.context}`;
|
|
335
|
-
table.disambiguateReport.push(
|
|
336
|
-
`\\* ${PCAL_SYMBOL_TYPE_NAMES[symbol.type]} ${symbol.id}${context} at line ${symbol.line} col ${symbol.col} changed to ${symbol.useThis}`,
|
|
337
|
-
);
|
|
266
|
+
if (symbol.id !== symbol.useThis) renamed.isAny = true;
|
|
338
267
|
});
|
|
339
268
|
}
|
|
269
|
+
return renamed.isAny;
|
|
340
270
|
};
|
|
341
271
|
|
|
342
272
|
// PcalSymTab.CheckForDefaultInitValue.
|
|
@@ -490,14 +420,9 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
490
420
|
const fixProcess = (process: PcalProcess) => {
|
|
491
421
|
process.decls.forEach((decl) => fixVarDecl(decl, process.name));
|
|
492
422
|
process.body.forEach((stmt) => fixLabeledStmt(toLabeledStmt(stmt), process.name));
|
|
493
|
-
const entry = getElement(table.processes, findProcessIndex(table, process.name));
|
|
494
423
|
fixLabels(process.plusLabels, process.name);
|
|
495
424
|
fixLabels(process.minusLabels, process.name);
|
|
496
|
-
if (entry.initialPC !== undefined) {
|
|
497
|
-
entry.initialPC = useThis(table, PCAL_SYMBOL.label, entry.initialPC, process.name);
|
|
498
|
-
}
|
|
499
425
|
process.name = useThis(table, PCAL_SYMBOL.process, process.name, "");
|
|
500
|
-
entry.name = process.name;
|
|
501
426
|
};
|
|
502
427
|
|
|
503
428
|
// PcalFixIDs.FixMultiprocess: a process calling an unknown procedure stops the fixing of the
|
|
@@ -546,9 +471,6 @@ const fixPcalIds = (ast: PcalAlgorithm, table: PcalSymbolTable, log: (line: stri
|
|
|
546
471
|
ast.prcds.forEach(fixProcedure);
|
|
547
472
|
ast.body.forEach((stmt) => fixLabeledStmt(toLabeledStmt(stmt), ""));
|
|
548
473
|
}
|
|
549
|
-
if (table.initialPC !== undefined) {
|
|
550
|
-
table.initialPC = useThis(table, PCAL_SYMBOL.label, table.initialPC, "");
|
|
551
|
-
}
|
|
552
474
|
};
|
|
553
475
|
|
|
554
476
|
// PcalTranslate's token constructors, which leave the column 0.
|
|
@@ -1222,8 +1144,7 @@ export const translatePcalAlgorithm = (
|
|
|
1222
1144
|
log: (line: string) => void,
|
|
1223
1145
|
) => {
|
|
1224
1146
|
const table = createPcalSymbolTable(ast);
|
|
1225
|
-
disambiguatePcalSymbols(table);
|
|
1226
|
-
if (table.disambiguateReport.length > 0) log("Warning: symbols were renamed.");
|
|
1147
|
+
if (disambiguatePcalSymbols(table)) log("Warning: symbols were renamed.");
|
|
1227
1148
|
fixPcalIds(ast, table, log);
|
|
1228
1149
|
checkPcalTlaGen(explodePcalAlgorithm(ast, table, omitPC), omitPC);
|
|
1229
1150
|
if (hasDefaultInitialization) checkForDefaultInitValue(table);
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { PcalError, PcalRuntimeError } from "
|
|
1
|
+
import { PcalError, PcalRuntimeError } from "../errors";
|
|
2
2
|
import {
|
|
3
3
|
formatPcalNode,
|
|
4
4
|
getPcalLocation,
|
|
5
5
|
getPcalVersionNumber,
|
|
6
6
|
PCAL_VERSION_WEIGHT,
|
|
7
7
|
type PcalAlgorithm,
|
|
8
|
-
} from "./
|
|
9
|
-
import { parsePcalAlgorithm, type PcalSession } from "./
|
|
10
|
-
import { createPcalCharReader } from "./
|
|
11
|
-
import { translatePcalAlgorithm } from "./
|
|
12
|
-
import type { TlcVersion } from "
|
|
8
|
+
} from "./ast";
|
|
9
|
+
import { parsePcalAlgorithm, type PcalSession } from "./parse";
|
|
10
|
+
import { createPcalCharReader } from "./tokenize";
|
|
11
|
+
import { translatePcalAlgorithm } from "./translate";
|
|
12
|
+
import type { TlcVersion } from "../tlc/version";
|
|
13
13
|
|
|
14
14
|
// Validator.ValidationResult.
|
|
15
15
|
type PcalValidationResult =
|
|
@@ -159,7 +159,6 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
159
159
|
);
|
|
160
160
|
return;
|
|
161
161
|
}
|
|
162
|
-
params.specFile = argument;
|
|
163
162
|
index += 1;
|
|
164
163
|
continue;
|
|
165
164
|
}
|
|
@@ -168,14 +167,9 @@ const processOptionArguments = (session: PcalSession, args: string[]) => {
|
|
|
168
167
|
params.checkTermination = true;
|
|
169
168
|
continue;
|
|
170
169
|
case "-noold":
|
|
171
|
-
params.noOld = true;
|
|
172
|
-
continue;
|
|
173
170
|
case "-nocfg":
|
|
174
|
-
params.nocfg = true;
|
|
175
|
-
continue;
|
|
176
171
|
case "-noDoneDisjunct":
|
|
177
172
|
case "noDoneDisjunct":
|
|
178
|
-
params.noDoneDisjunct = true;
|
|
179
173
|
continue;
|
|
180
174
|
case "-wf":
|
|
181
175
|
case "wf":
|
|
@@ -361,7 +355,6 @@ export const validatePcalModule = (
|
|
|
361
355
|
const rest = line.slice(searchLocation.column);
|
|
362
356
|
const idEnd = Array.from(rest).findIndex((char) => !isIdChar(char));
|
|
363
357
|
if (rest.startsWith("options") && (idEnd === -1 ? rest.length : idEnd) === 7) {
|
|
364
|
-
session.params.optionsInFile = true;
|
|
365
358
|
processOptions(session, lines, searchLocation);
|
|
366
359
|
break;
|
|
367
360
|
}
|
|
@@ -405,14 +398,11 @@ export const validatePcalModule = (
|
|
|
405
398
|
// HACK: Validator reports the exceptions of ParseAlgorithm.getAlgorithm and PCalTLAGenerator
|
|
406
399
|
// and goes on to compare the checksums.
|
|
407
400
|
try {
|
|
408
|
-
const
|
|
409
|
-
|
|
410
|
-
begin.line,
|
|
411
|
-
begin.
|
|
412
|
-
specificationText.length,
|
|
413
|
-
0,
|
|
401
|
+
const result = parsePcalAlgorithm(
|
|
402
|
+
session,
|
|
403
|
+
createPcalCharReader(lines, begin.line, begin.column),
|
|
404
|
+
begin.isFair,
|
|
414
405
|
);
|
|
415
|
-
const result = parsePcalAlgorithm(session, reader, begin.isFair);
|
|
416
406
|
parsed.ast = result.ast;
|
|
417
407
|
translatePcalAlgorithm(result.ast, result.omitPC, result.hasDefaultInitialization, session.log);
|
|
418
408
|
} catch (error) {
|