From a0708dca42a7106b3985aca964b3a5f42b3e6409 Mon Sep 17 00:00:00 2001
From: chick
Date: Fri, 23 Sep 2016 16:24:51 -0700
Subject:  use name parameter when calling a function with boolean constant

---
 src/main/scala/firrtl/StringLit.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/main/scala/firrtl/StringLit.scala b/src/main/scala/firrtl/StringLit.scala
index 501e9686..b34fc498 100644
--- a/src/main/scala/firrtl/StringLit.scala
+++ b/src/main/scala/firrtl/StringLit.scala
@@ -111,11 +111,11 @@ object VerilogStringLitHandler extends StringLitHandler {
     def format(in: Array[Byte], out: Array[Byte], percent: Boolean): Array[Byte] = {
       if (in.isEmpty) out
       else {
-        if (percent && in.head == 'x') format(in.tail, out :+ 'h'.toByte, false)
+        if (percent && in.head == 'x') format(in.tail, out :+ 'h'.toByte, percent = false)
         else format(in.tail, out :+ in.head, in.head == '%' && !percent)
       }
     }
-    StringLit(format(lit.array, Array(), false))
+    StringLit(format(lit.array, Array(), percent = false))
   }
 }
 
-- 
cgit v1.2.3


From 1f168585c80d5c96e41353d6275d99b34b967b23 Mon Sep 17 00:00:00 2001
From: chick
Date: Fri, 23 Sep 2016 16:40:08 -0700
Subject: remove unnecessary blocks example 1 s"${x}" example 2 case blah => {
 ??? }

---
 src/main/scala/firrtl/StringLit.scala | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/src/main/scala/firrtl/StringLit.scala b/src/main/scala/firrtl/StringLit.scala
index b34fc498..fd282177 100644
--- a/src/main/scala/firrtl/StringLit.scala
+++ b/src/main/scala/firrtl/StringLit.scala
@@ -79,11 +79,10 @@ trait StringLitHandler {
             // TODO Finalize supported escapes, implement hex2Bytes
             //case 0x78 => (4, hex2Bytes(in.slice(2, 3)))) // hex escape
             //case 0x75 => (6, hex2Bytes(in.slice(2, 5))) // unicode excape 
-            case e => { // error
-              val msg = s"Invalid escape character ${e.toChar}! " + 
+            case e => // error
+              val msg = s"Invalid escape character ${e.toChar}! " +
                          "Valid characters [nt'\"\\]"
               throw new InvalidEscapeCharException(msg)
-            }
           }
           unescape(in.drop(n), out ++ bytes) // consume n
         } else {
-- 
cgit v1.2.3