From 50893861e419b677ad262817d9689ef100a38038 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Fri, 1 Apr 2016 16:23:09 +0200
Subject: [PATCH] Unique names are really unique

---
 src/main/scala/leon/purescala/Common.scala | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/leon/purescala/Common.scala b/src/main/scala/leon/purescala/Common.scala
index c3af4f200..ea0170b73 100644
--- a/src/main/scala/leon/purescala/Common.scala
+++ b/src/main/scala/leon/purescala/Common.scala
@@ -53,16 +53,12 @@ object Common {
     override def hashCode: Int = globalId
 
     override def toString: String = {
-      if (alwaysShowUniqueID) {
-        name + (if (id > 0) id else "")
-      } else {
-        name
-      }
+      if (alwaysShowUniqueID) uniqueName else name
     }
 
-    def uniqueNameDelimited(delim: String) = name + delim + id
+    def uniqueNameDelimited(delim: String) = s"$name$delim$id"
 
-    def uniqueName: String = uniqueNameDelimited("")
+    def uniqueName: String = uniqueNameDelimited("$")
 
     def toVariable: Variable = Variable(this)
 
-- 
GitLab