From aaac74497b33bc62d3410e2269dad895d9bb71f1 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Tue, 31 Oct 2017 16:09:26 -0700
Subject: Fix bug emitting and reparsing ExtModule String parameters (#675)

---
 src/main/scala/firrtl/ir/IR.scala           |  2 +-
 src/test/scala/firrtlTests/ParserSpec.scala | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/firrtl/ir/IR.scala b/src/main/scala/firrtl/ir/IR.scala
index f2c39f8d..090ad8ec 100644
--- a/src/main/scala/firrtl/ir/IR.scala
+++ b/src/main/scala/firrtl/ir/IR.scala
@@ -481,7 +481,7 @@ case class DoubleParam(name: String, value: Double) extends Param {
 }
 /** String Parameter */
 case class StringParam(name: String, value: StringLit) extends Param {
-  override def serialize: String = super.serialize + value.serialize
+  override def serialize: String = super.serialize + value.escape
 }
 /** Raw String Parameter
   * Useful for Verilog type parameters
diff --git a/src/test/scala/firrtlTests/ParserSpec.scala b/src/test/scala/firrtlTests/ParserSpec.scala
index 66e214a1..4ed16afe 100644
--- a/src/test/scala/firrtlTests/ParserSpec.scala
+++ b/src/test/scala/firrtlTests/ParserSpec.scala
@@ -114,7 +114,8 @@ class ParserSpec extends FirrtlFlatSpec {
       |    in.0.1 <= in.0.0
       |    in2.4.23.bar.123 <= in2.4.23.foo
       """.stripMargin
-    firrtl.Parser.parse(input split "\n")
+    val c = firrtl.Parser.parse(input)
+    firrtl.Parser.parse(c.serialize)
   }
 
   // ********** Doubles as parameters **********
@@ -123,7 +124,6 @@ class ParserSpec extends FirrtlFlatSpec {
     val signs = Seq("", "+", "-")
     val tests = "0.0" +: (signs flatMap (s => nums map (n => s + n)))
     for (test <- tests) {
-      println(s"Trying $test")
       val input = s"""
         |circuit Test :
         |  extmodule Ext :
@@ -136,9 +136,27 @@ class ParserSpec extends FirrtlFlatSpec {
         |    input foo : UInt<32>
         |    output bar : UInt<32>
         """.stripMargin
-      firrtl.Parser.parse(input split "\n")
+      val c = firrtl.Parser.parse(input)
+      firrtl.Parser.parse(c.serialize)
     }
   }
+
+  "Strings" should "be legal parameters for extmodules" in {
+    val input = s"""
+      |circuit Test :
+      |  extmodule Ext :
+      |    input foo : UInt<32>
+      |
+      |    defname = MyExtModule
+      |    parameter STR = "hello=%d"
+      |
+      |  module Test :
+      |    input foo : UInt<32>
+      |    output bar : UInt<32>
+      """.stripMargin
+    val c = firrtl.Parser.parse(input)
+    firrtl.Parser.parse(c.serialize)
+  }
 }
 
 class ParserPropSpec extends FirrtlPropSpec {
-- 
cgit v1.2.3