diff options
| author | Christoffer Sawicki <christoffer.sawicki@gmail.com> | 2013-12-29 18:25:36 +0100 |
|---|---|---|
| committer | Christoffer Sawicki <christoffer.sawicki@gmail.com> | 2013-12-29 18:25:36 +0100 |
| commit | 2fe767806b44aea3f6f53735301b11fd2ffae08b (patch) | |
| tree | 849db5839282a03b332f738b4501e3e824e188f2 /src/repl/scala/tools/nsc/interpreter/Naming.scala | |
| parent | 780ceca6a39ddb2d9ba632cc8153c737707a75eb (diff) | |
| download | scala-2fe767806b44aea3f6f53735301b11fd2ffae08b.tar.gz scala-2fe767806b44aea3f6f53735301b11fd2ffae08b.tar.bz2 scala-2fe767806b44aea3f6f53735301b11fd2ffae08b.zip | |
SI-8107: Use Regex.quote
Diffstat (limited to 'src/repl/scala/tools/nsc/interpreter/Naming.scala')
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/Naming.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/Naming.scala b/src/repl/scala/tools/nsc/interpreter/Naming.scala index cf38a2ae3a..e09c6f315e 100644 --- a/src/repl/scala/tools/nsc/interpreter/Naming.scala +++ b/src/repl/scala/tools/nsc/interpreter/Naming.scala @@ -8,6 +8,7 @@ package tools.nsc package interpreter import scala.util.Properties.lineSeparator +import scala.util.matching.Regex /** This is for name logic which is independent of the compiler (notice there's no Global.) * That includes at least generating, metaquoting, mangling, and unmangling. @@ -38,12 +39,10 @@ trait Naming { // // $line3.$read.$iw.$iw.Bippy = // $line3.$read$$iw$$iw$Bippy@4a6a00ca - - private def noMeta(s: String) = "\\Q" + s + "\\E" lazy val lineRegex = { val sn = sessionNames - val members = List(sn.read, sn.eval, sn.print) map noMeta mkString ("(?:", "|", ")") - debugging("lineRegex")(noMeta(sn.line) + """\d+[./]""" + members + """[$.]""") + val members = List(sn.read, sn.eval, sn.print) map Regex.quote mkString ("(?:", "|", ")") + debugging("lineRegex")(Regex.quote(sn.line) + """\d+[./]""" + members + """[$.]""") } private def removeLineWrapper(s: String) = s.replaceAll(lineRegex, "") |