diff --git a/CHANGELOG.md b/CHANGELOG.md index db6a15fc46571c38d5056fc12f8f1c04a51e27fd..9c5d7f2fd729762d8947d4ab8e7fc2e81446bf10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [(next version)](./README.md#for-developers) * Added support for Java 14. +* Added B parser version information to `:version` output. * Updated ProB 2 to version 3.11.0. * Fixed a parse error when a line comment is used on the last line of an expression while any `:let` variables are defined. * Fixed detection of B machines in cells without `::load`. Previously only single-line machines were recognized. diff --git a/notebooks/tests/version.ipynb b/notebooks/tests/version.ipynb index b79fdc1ff2de714f40d03ea694103723febe1149..25425b1e9882fd477e7ec25392fe93f9b3b6eee7 100644 --- a/notebooks/tests/version.ipynb +++ b/notebooks/tests/version.ipynb @@ -12,11 +12,11 @@ ":version\n", "```\n", "\n", - "Display version info about the ProB 2 Jupyter kernel, ProB 2, and the underlying ProB CLI." + "Display version info about the ProB 2 Jupyter kernel and its underlying components." ], "text/plain": [ ":version\n", - "Display version info about the ProB 2 Jupyter kernel, ProB 2, and the underlying ProB CLI." + "Display version info about the ProB 2 Jupyter kernel and its underlying components." ] }, "execution_count": 1, @@ -36,11 +36,12 @@ { "data": { "text/plain": [ - "ProB 2 Jupyter kernel: 1.0.1-SNAPSHOT (2b75217bf8bef7737632efee1ebb1ddbd8cfefe6)\n", - "ProB 2: 3.10.0 (0ee5d5eea6894b2899690565dfc3d9042098ce89)\n", + "ProB 2 Jupyter kernel: 1.1.1-SNAPSHOT (e5188664ec88fa6c381b5fec7b46ab44deaf9eb7)\n", + "ProB 2: 4.0.0-SNAPSHOT (489d93856139812923fae9b8e4c1297e9576b460)\n", + "ProB B parser: 2.9.26-SNAPSHOT (d2cd9ca3dba77bfff8c6eed9799794af899b3230)\n", "ProB CLI:\n", - "\t1.9.3-final (64afef0148d6ce70f2af5082e69269c950078133)\n", - "\tLast changed: Wed Feb 19 11:16:13 2020 +0100\n", + "\t1.10.0-nightly (907db892e8fdc604be6a15cea637d74da98bf1cb)\n", + "\tLast changed: Tue May 12 19:06:34 2020 +0200\n", "\tProlog: SICStus 4.5.1 (x86_64-darwin-17.7.0): Tue Apr 2 15:34:32 CEST 2019" ] }, diff --git a/src/main/java/de/prob2/jupyter/commands/VersionCommand.java b/src/main/java/de/prob2/jupyter/commands/VersionCommand.java index c22c7f04d149e6d0b65dc868380080818ccb9cfc..a46b81f19d8acd6d3f543f8aa6f052e0319c82db 100644 --- a/src/main/java/de/prob2/jupyter/commands/VersionCommand.java +++ b/src/main/java/de/prob2/jupyter/commands/VersionCommand.java @@ -2,6 +2,7 @@ package de.prob2.jupyter.commands; import com.google.inject.Inject; +import de.be4.classicalb.core.parser.BParser; import de.prob.Main; import de.prob.animator.command.GetVersionCommand; import de.prob.statespace.AnimationSelector; @@ -36,7 +37,7 @@ public final class VersionCommand implements Command { @Override public @NotNull String getShortHelp() { - return "Display version info about the ProB 2 Jupyter kernel, ProB 2, and the underlying ProB CLI."; + return "Display version info about the ProB 2 Jupyter kernel and its underlying components."; } @Override @@ -54,6 +55,10 @@ public final class VersionCommand implements Command { sb.append(Main.getVersion()); sb.append(" ("); sb.append(Main.getGitSha()); + sb.append(")\nProB B parser: "); + sb.append(BParser.getVersion()); + sb.append(" ("); + sb.append(BParser.getGitSha()); sb.append(")\nProB CLI:"); final GetVersionCommand cmd = new GetVersionCommand(); this.animationSelector.getCurrentTrace().getStateSpace().execute(cmd);