Rename FM2024 to IFM2024. Clarify generated language for --veymont-ou…

…tput option.
utwente-fmt · Aug 9, 2024 · 7ab06a8 · 7ab06a8
1 parent f044c5d
commit 7ab06a8
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 6 deletions.
diff --git a/.../FM2024VeyMontPermissions/0-TTT/0-TTT.pvl → ...IFM2024VeyMontPermissions/0-TTT/0-TTT.pvl b/.../FM2024VeyMontPermissions/0-TTT/0-TTT.pvl → ...IFM2024VeyMontPermissions/0-TTT/0-TTT.pvl
diff --git a/...4/FM2024VeyMontPermissions/0-TTT/Move.pvl → .../IFM2024VeyMontPermissions/0-TTT/Move.pvl b/...4/FM2024VeyMontPermissions/0-TTT/Move.pvl → .../IFM2024VeyMontPermissions/0-TTT/Move.pvl
diff --git a/...FM2024VeyMontPermissions/0-TTT/Player.pvl → ...FM2024VeyMontPermissions/0-TTT/Player.pvl b/...FM2024VeyMontPermissions/0-TTT/Player.pvl → ...FM2024VeyMontPermissions/0-TTT/Player.pvl
diff --git a/...4VeyMontPermissions/1-TTTmsg/1-TTTmsg.pvl → ...4VeyMontPermissions/1-TTTmsg/1-TTTmsg.pvl b/...4VeyMontPermissions/1-TTTmsg/1-TTTmsg.pvl → ...4VeyMontPermissions/1-TTTmsg/1-TTTmsg.pvl
diff --git a/...M2024VeyMontPermissions/1-TTTmsg/Move.pvl → ...M2024VeyMontPermissions/1-TTTmsg/Move.pvl b/...M2024VeyMontPermissions/1-TTTmsg/Move.pvl → ...M2024VeyMontPermissions/1-TTTmsg/Move.pvl
diff --git a/...024VeyMontPermissions/1-TTTmsg/Player.pvl → ...024VeyMontPermissions/1-TTTmsg/Player.pvl b/...024VeyMontPermissions/1-TTTmsg/Player.pvl → ...024VeyMontPermissions/1-TTTmsg/Player.pvl
diff --git a/...eyMontPermissions/2-TTTlast/2-TTTlast.pvl → ...eyMontPermissions/2-TTTlast/2-TTTlast.pvl b/...eyMontPermissions/2-TTTlast/2-TTTlast.pvl → ...eyMontPermissions/2-TTTlast/2-TTTlast.pvl
diff --git a/...2024VeyMontPermissions/2-TTTlast/Move.pvl → ...2024VeyMontPermissions/2-TTTlast/Move.pvl b/...2024VeyMontPermissions/2-TTTlast/Move.pvl → ...2024VeyMontPermissions/2-TTTlast/Move.pvl
diff --git a/...24VeyMontPermissions/2-TTTlast/Player.pvl → ...24VeyMontPermissions/2-TTTlast/Player.pvl b/...24VeyMontPermissions/2-TTTlast/Player.pvl → ...24VeyMontPermissions/2-TTTlast/Player.pvl
diff --git a/...24/FM2024VeyMontPermissions/reference.bib → ...4/IFM2024VeyMontPermissions/reference.bib b/...24/FM2024VeyMontPermissions/reference.bib → ...4/IFM2024VeyMontPermissions/reference.bib
diff --git a/...4VeyMontPermissions/testFiles/patches.txt → ...4VeyMontPermissions/testFiles/patches.txt b/...4VeyMontPermissions/testFiles/patches.txt → ...4VeyMontPermissions/testFiles/patches.txt
diff --git a/...yMontPermissions/testFiles/testScript.txt → ...yMontPermissions/testFiles/testScript.txt b/...yMontPermissions/testFiles/testScript.txt → ...yMontPermissions/testFiles/testScript.txt
diff --git a/src/main/vct/options/Options.scala b/src/main/vct/options/Options.scala
@@ -321,8 +321,9 @@ case object Options {
           )
         ),
         opt[Path]("veymont-output").valueName("<path>")
-          .action((path, c) => c.copy(veymontOutput = Some(path)))
-          .text("Indicates output path for generated implementation"),
+          .action((path, c) => c.copy(veymontOutput = Some(path))).text(
+            "Indicates output path for generated implementation. The extension decides the output language: `.pvl` is PVL, `.java` is Java."
+          ),
         opt[Path]("veymont-resource-path").valueName("<path>")
           .action((path, c) => c.copy(veymontResourcePath = path)),
         opt[Unit]("veymont-skip-choreography-verification")

diff --git a/...eymont/FM2024VeyMontPermissionsSpec.scala → ...ymont/IFM2024VeyMontPermissionsSpec.scala b/...eymont/FM2024VeyMontPermissionsSpec.scala → ...ymont/IFM2024VeyMontPermissionsSpec.scala
@@ -15,8 +15,8 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Path, Paths}
 import scala.sys.process.Process
 
-class FM2024VeyMontPermissionsSpec extends VeyMontSpec {
-  val wd = Paths.get("publications/2024/FM2024VeyMontPermissions")
+class IFM2024VeyMontPermissionsSpec extends VeyMontSpec {
+  val wd = Paths.get("publications/2024/IFM2024VeyMontPermissions")
 
   {
     val caseWd = wd.resolve("0-TTT")

diff --git a/test/main/vct/test/integration/meta/ExampleCoverage.scala b/test/main/vct/test/integration/meta/ExampleCoverage.scala
@@ -2,7 +2,7 @@ package vct.test.integration.meta
 
 import org.scalatest.flatspec.AnyFlatSpec
 import vct.test.integration.examples._
-import vct.test.integration.examples.veymont.{FM2023VeyMontSpec, TechnicalVeyMontSpec, VeyMontExamplesSpec, FM2024VeyMontPermissionsSpec}
+import vct.test.integration.examples.veymont.{FM2023VeyMontSpec, TechnicalVeyMontSpec, VeyMontExamplesSpec, IFM2024VeyMontPermissionsSpec}
 import vct.test.integration.helper._
 
 class ExampleCoverage extends AnyFlatSpec {
@@ -60,7 +60,7 @@ class ExampleCoverage extends AnyFlatSpec {
       new VerifyThisSpec(),
       new FM2023VeyMontSpec(),
       new VeyMontExamplesSpec(),
-      new FM2024VeyMontPermissionsSpec(),
+      new IFM2024VeyMontPermissionsSpec(),
       new WaitNotifySpec(),
       new WandSpec(),
       new AutoValueSpec(),