Check rsc/nsc output classfiles with checkscalasig

twitter · Aug 22, 2019 · cd26a8a · cd26a8a
1 parent 8df1e01
commit cd26a8a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/check/src/main/scala/rsc/checkscalasig/Main.scala b/check/src/main/scala/rsc/checkscalasig/Main.scala
@@ -2,12 +2,17 @@ package rsc.checkscalasig
 
 import java.nio.file.Path
 import _root_.rsc.checkbase.{SimpleBase, ToolResult}
+import rsc.checkscalasig.Settings.ClassFiles
 
 /**
  * Example invocation (in sbt):
  * check/runMain rsc.checkscalasig.Main --classpath $JAVALIB:SCALALIB C.scala
  *
  * Replace $JAVALIB:SCALALIB with the actual paths
+ *
+ * Or in --classfiles mode to check output
+ *
+ * check/runMain rsc.checkscalasig.Main --classfiles rsc_output.jar nsc_output.jar
  */
 object Main extends SimpleBase[Settings, Path, Path] {
 
@@ -16,11 +21,11 @@ object Main extends SimpleBase[Settings, Path, Path] {
   }
 
   def nscResult(settings: Settings): ToolResult[Path] = {
-    nsc(settings.cp, settings.ins)
+    settings.classfiles.nsc.map(Right(_)).getOrElse(nsc(settings.cp, settings.ins))
   }
 
   def rscResult(settings: Settings): ToolResult[Path] = {
-    rsc(settings.cp, settings.ins)
+    settings.classfiles.rsc.map(Right(_)).getOrElse(rsc(settings.cp, settings.ins))
   }
 
   def checker(settings: Settings, nscResult: Path, rscResult: Path): Checker = {

diff --git a/check/src/main/scala/rsc/checkscalasig/Settings.scala b/check/src/main/scala/rsc/checkscalasig/Settings.scala
@@ -3,15 +3,23 @@ package rsc.checkscalasig
 import java.io.File.pathSeparator
 import java.nio.file.{Path, Paths}
 import rsc.checkbase.SettingsBase
+import rsc.checkscalasig.Settings.ClassFiles
 
 final case class Settings(
     cp: List[Path] = Nil,
     ins: List[Path] = Nil,
     quiet: Boolean = false,
-    saveOutput: Boolean = false
+    saveOutput: Boolean = false,
+    classfiles: ClassFiles = ClassFiles(None, None)
 ) extends SettingsBase
 
 object Settings {
+
+  final case class ClassFiles(rsc: Option[Path], nsc: Option[Path])
+
+  private def pathsFor(pathStr: String): List[Path] =
+    pathStr.split(pathSeparator).map(s => Paths.get(s)).toList
+
   def parse(args: List[String]): Either[List[String], Settings] = {
     def loop(
         settings: Settings,
@@ -20,8 +28,12 @@ object Settings {
       args match {
         case "--" +: rest =>
           loop(settings, false, rest)
+        case "--classfiles" +: rsc_path +: nsc_path +: Nil =>
+          val rsc_files = Paths.get(rsc_path)
+          val nsc_files = Paths.get(nsc_path)
+          loop(settings.copy(classfiles = ClassFiles(Some(rsc_files), Some(nsc_files))), true, Nil)
         case "--classpath" +: s_cp +: rest if allowOptions =>
-          val cp = s_cp.split(pathSeparator).map(s => Paths.get(s)).toList
+          val cp = pathsFor(s_cp)
           loop(settings.copy(cp = settings.cp ++ cp), true, rest)
         case "--save-output" +: rest if allowOptions =>
           loop(settings.copy(saveOutput = true), true, rest)