From f0beb8e9efb57dc4aef08103426bd28cf8445147 Mon Sep 17 00:00:00 2001
From: Richard Lin
Date: Mon, 11 Jun 2018 15:05:36 -0700
Subject: Allow escaped single quotes in RawParams (#820)

Escape raw params using \'
---
 src/main/scala/firrtl/Visitor.scala | 2 +-
 src/main/scala/firrtl/ir/IR.scala   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/scala/firrtl')

diff --git a/src/main/scala/firrtl/Visitor.scala b/src/main/scala/firrtl/Visitor.scala
index 64249c11..f47d7ee3 100644
--- a/src/main/scala/firrtl/Visitor.scala
+++ b/src/main/scala/firrtl/Visitor.scala
@@ -92,7 +92,7 @@ class Visitor(infoMode: InfoMode) extends FIRRTLBaseVisitor[FirrtlNode] {
       case (int, null, null, null) => IntParam(name, string2BigInt(int.getText))
       case (null, str, null, null) => StringParam(name, visitStringLit(str))
       case (null, null, dbl, null) => DoubleParam(name, dbl.getText.toDouble)
-      case (null, null, null, raw) => RawStringParam(name, raw.getText.tail.init) // Remove "\'"s
+      case (null, null, null, raw) => RawStringParam(name, raw.getText.tail.init.replace("\\'", "'")) // Remove "\'"s
       case _ => throwInternalError(s"visiting impossible parameter ${ctx.getText}")
     }
   }
diff --git a/src/main/scala/firrtl/ir/IR.scala b/src/main/scala/firrtl/ir/IR.scala
index fc741b28..faebc7b8 100644
--- a/src/main/scala/firrtl/ir/IR.scala
+++ b/src/main/scala/firrtl/ir/IR.scala
@@ -526,7 +526,7 @@ case class StringParam(name: String, value: StringLit) extends Param {
   * @note Firrtl doesn't guarantee anything about this String being legal in any backend
   */
 case class RawStringParam(name: String, value: String) extends Param {
-  override def serialize: String = super.serialize + s"'$value'"
+  override def serialize: String = super.serialize + s"'${value.replace("'", "\\'")}'"
 }
 
 /** Base class for modules */
-- 
cgit v1.2.3