From 8421e96f04831fc61ddd5efa30f0ebc84f27c596 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Mon, 13 Sep 2021 20:42:27 -0700 Subject: Bump Scala to 2.12.14 and 2.13.6 (#2356) This required also bumping sbt-scalafix to bring in a newer version of semanticdb. The new version of semanticdb had an issue with a regex in SMTLib, fixed by fixing the way '$' is escaped in the regex.--- src/main/scala/firrtl/backends/experimental/smt/SMTLibSerializer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/scala/firrtl/backends/experimental/smt/SMTLibSerializer.scala b/src/main/scala/firrtl/backends/experimental/smt/SMTLibSerializer.scala index a70adc61..f81acce0 100644 --- a/src/main/scala/firrtl/backends/experimental/smt/SMTLibSerializer.scala +++ b/src/main/scala/firrtl/backends/experimental/smt/SMTLibSerializer.scala @@ -145,7 +145,7 @@ object SMTLibSerializer { else { s"(ite ${serialize(e)} $bvOne $bvZero)" } // See definition in the Concrete Syntax Appendix of the SMTLib Spec - private val simple: Regex = raw"[a-zA-Z\+-/\*\=%\?!\.\$$_~&\^<>@][a-zA-Z0-9\+-/\*\=%\?!\.\$$_~&\^<>@]*".r + private val simple: Regex = raw"[a-zA-Z\+-/\*\=%\?!\.$$_~&\^<>@][a-zA-Z0-9\+-/\*\=%\?!\.$$_~&\^<>@]*".r def escapeIdentifier(name: String): String = name match { case simple() => name case _ => if (name.startsWith("|") && name.endsWith("|")) name else s"|$name|" -- cgit v1.2.3