Expand fpp-to-json tests

compiler/lib/src/main/scala/util/Result.scala

@@ -64,7 +64,7 @@ object Result {
     }
   }
 
-  /** Expect a Right result; throw InternalException otherwise */
+  /** Expect a Right result; throw InternalError otherwise */
   def expectRight[T](result: Result[T]): T = result match {
     case Right(value) => value
     case Left(e) => throw new InternalError(s"unexpected error ${e}")

compiler/scripts/test-utils.sh

@@ -34,7 +34,7 @@ remove_author()
 # Run a test
 run()
 {
-  printf '%-60s' $1
+  printf '%-74s' $1
   $@
   status=$?
   if test $status -eq 0

compiler/tools/fpp-to-json/src/main/scala/fpp-to-json.scala

@@ -1,108 +1,108 @@
-package fpp.compiler
-
-import fpp.compiler.analysis._
-import fpp.compiler.ast._
-import fpp.compiler.codegen._
-import fpp.compiler.syntax._
-import fpp.compiler.transform._
-import fpp.compiler.util._
-import scopt.OParser
-
-object FPPtoJson {
-  case class Options(
-      syntaxOnly: Boolean = false,
-      dir: Option[String] = None,
-      files: List[File] = Nil
-  )
-
-  def command(options: Options) = {
-    fpp.compiler.util.Error.setTool(Tool(name))
-    val files = options.files.reverse match {
-      case Nil  => List(File.StdIn)
-      case list => list
-    }
-    for {
-      tul <- Result.map(files, Parser.parseFile(Parser.transUnit)(None) _)
-      tul <- resolveIncludes(tul)
-      _ <- writeAst (options) (tul)
-      _ <- writeLocMap (options)
-      _ <- writeAnalysis (options) (tul)
-    } yield ()
-  }
-
-  def main(args: Array[String]) =
-    Tool(name).mainMethod(args, oparser, Options(), command)
-
-  def writeJson (
-    options: Options,
-    fileName: String,
-    json: io.circe.Json
-  ): Result.Result[Unit] = {
-    val path =
-      java.nio.file.Paths.get(options.dir.getOrElse("."), fileName)
-    val file = File.Path(path)
-    for (writer <- file.openWrite()) yield {
-      writer.println(json)
-      writer.close()
-    }
-  }
-
-  def writeAst (options: Options) (tul: List[Ast.TransUnit]):
-    Result.Result[Unit] =
-      writeJson(options, "fpp-ast.json", AstJsonEncoder.astToJson(tul))
-
-  def writeLocMap (options: Options): Result.Result[Unit] =
-    writeJson(options, "fpp-loc-map.json", LocMapJsonEncoder.locMapToJson)
-
-  def writeAnalysis (options: Options) (tul: List[Ast.TransUnit]):
-    Result.Result[Unit] =
-    options.syntaxOnly match {
-      case false =>
-        val files = options.files.reverse match {
-          case Nil  => List(File.StdIn)
-          case list => list
-        }
-        val a = Analysis(inputFileSet = options.files.toSet)
-        for {
-          a <- CheckSemantics.tuList(a, tul)
-          _ <- writeJson(options, "fpp-analysis.json", AnalysisJsonEncoder.analysisToJson(a))
-        } yield ()
-      case true => Right(())
-    }
-
-  def resolveIncludes(tul: List[Ast.TransUnit]):
-    Result.Result[List[Ast.TransUnit]] =
-  for {
-    result <- ResolveSpecInclude.transformList(
-      Analysis(),
-      tul,
-      ResolveSpecInclude.transUnit
-    )
-  } yield result._2
-
-  val builder = OParser.builder[Options]
-
-  val name = "fpp-to-json"
-
-  val oparser = {
-    import builder._
-    OParser.sequence(
-      programName(name),
-      head(name, Version.v),
-      opt[Unit]('s', "syntax only")
-        .action((_, c) => c.copy(syntaxOnly = true))
-        .text("emit syntax only (location map and abstract syntax tree)"),
-      opt[String]('d', "directory")
-        .valueName("<dir>")
-        .action((d, c) => c.copy(dir = Some(d)))
-        .text("output directory"),
-      help('h', "help").text("print this message and exit"),
-      arg[String]("file ...")
-        .unbounded()
-        .optional()
-        .action((f, c) => c.copy(files = File.fromString(f) :: c.files))
-        .text("input files")
-    )
-  }
-
-}
+package fpp.compiler
+
+import fpp.compiler.analysis._
+import fpp.compiler.ast._
+import fpp.compiler.codegen._
+import fpp.compiler.syntax._
+import fpp.compiler.transform._
+import fpp.compiler.util._
+import scopt.OParser
+
+object FPPtoJson {
+  case class Options(
+      syntaxOnly: Boolean = false,
+      dir: Option[String] = None,
+      files: List[File] = Nil
+  )
+
+  def command(options: Options) = {
+    fpp.compiler.util.Error.setTool(Tool(name))
+    val files = options.files.reverse match {
+      case Nil  => List(File.StdIn)
+      case list => list
+    }
+    for {
+      tul <- Result.map(files, Parser.parseFile(Parser.transUnit)(None) _)
+      tul <- resolveIncludes(tul)
+      _ <- writeAst (options) (tul)
+      _ <- writeLocMap (options)
+      _ <- writeAnalysis (options) (tul)
+    } yield ()
+  }
+
+  def main(args: Array[String]) =
+    Tool(name).mainMethod(args, oparser, Options(), command)
+
+  def writeJson (
+    options: Options,
+    fileName: String,
+    json: io.circe.Json
+  ): Result.Result[Unit] = {
+    val path =
+      java.nio.file.Paths.get(options.dir.getOrElse("."), fileName)
+    val file = File.Path(path)
+    for (writer <- file.openWrite()) yield {
+      writer.println(json)
+      writer.close()
+    }
+  }
+
+  def writeAst (options: Options) (tul: List[Ast.TransUnit]):
+    Result.Result[Unit] =
+      writeJson(options, "fpp-ast.json", AstJsonEncoder.astToJson(tul))
+
+  def writeLocMap (options: Options): Result.Result[Unit] =
+    writeJson(options, "fpp-loc-map.json", LocMapJsonEncoder.locMapToJson)
+
+  def writeAnalysis (options: Options) (tul: List[Ast.TransUnit]):
+    Result.Result[Unit] =
+    options.syntaxOnly match {
+      case false =>
+        val files = options.files.reverse match {
+          case Nil  => List(File.StdIn)
+          case list => list
+        }
+        val a = Analysis(inputFileSet = options.files.toSet)
+        for {
+          a <- CheckSemantics.tuList(a, tul)
+          _ <- writeJson(options, "fpp-analysis.json", AnalysisJsonEncoder.analysisToJson(a))
+        } yield ()
+      case true => Right(())
+    }
+
+  def resolveIncludes(tul: List[Ast.TransUnit]):
+    Result.Result[List[Ast.TransUnit]] =
+  for {
+    result <- ResolveSpecInclude.transformList(
+      Analysis(),
+      tul,
+      ResolveSpecInclude.transUnit
+    )
+  } yield result._2
+
+  val builder = OParser.builder[Options]
+
+  val name = "fpp-to-json"
+
+  val oparser = {
+    import builder._
+    OParser.sequence(
+      programName(name),
+      head(name, Version.v),
+      opt[Unit]('s', "syntax only")
+        .action((_, c) => c.copy(syntaxOnly = true))
+        .text("emit syntax only (location map and abstract syntax tree)"),
+      opt[String]('d', "directory")
+        .valueName("<dir>")
+        .action((d, c) => c.copy(dir = Some(d)))
+        .text("output directory"),
+      help('h', "help").text("print this message and exit"),
+      arg[String]("file ...")
+        .unbounded()
+        .optional()
+        .action((f, c) => c.copy(files = File.fromString(f) :: c.files))
+        .text("input files")
+    )
+  }
+
+}

compiler/tools/fpp-to-json/test/clean

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-rm -rf *.diff.txt *.out.txt
+. ../../../scripts/utils.sh
+
+for target in `find . -mindepth 2 -name clean`
+do
+  dir=`dirname $target`
+  (cd $dir; ./clean)
+done
+clean

compiler/tools/fpp-to-json/test/dataProducts.fpp

@@ -0,0 +1,33 @@
+module Fw {
+
+  port DpRequest
+  port DpResponse
+  port DpSend
+  port Time
+
+}
+
+passive component C {
+
+  product request port productRequestOut
+  sync product recv port productRecvIn
+  product send port productSendOut
+  time get port timeGetOut
+
+  @ A container with no ID and no default priority
+  product container Basic
+
+  @ A container with ID and no default priority
+  product container IdOnly id 0x100
+
+  @ A container with ID and default priority
+  product container IdPriority id 0x200 default priority 3
+
+  @ A record with no ID
+  product record Basic: U32
+
+  @ A record with an ID
+  product record Id: U32 id 0x100
+
+}
+