Merge pull request #10398 from som-snytt/tweak/lambdaless

SethTisue · web-flow · commit 83745c6c0e6c · 2023-05-16T20:05:26.000-07:00
diff --git a/src/partest/scala/tools/partest/ReplTest.scala b/src/partest/scala/tools/partest/ReplTest.scala
@@ -89,7 +89,7 @@ trait Lambdaless extends ReplTest {
   override def normalize(s: String) = stripLambdaClassName(super.normalize(s))
 }
 object Lambdaless {
-  private val lambdaless = """\$Lambda\$\d+/(?:0x[a-f0-9]{16}|\d+)(@[a-fA-F0-9]+)?""".r
+  private val lambdaless = """\$Lambda(?:\$\d+)?/(?:0x[a-f0-9]{16}|\d+)(?:@[a-fA-F0-9]+)?""".r
   private def stripLambdaClassName(s: String): String = lambdaless.replaceAllIn(s, Regex.quoteReplacement("<function>"))
 }
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ trait Lambdaless extends ReplTest {`
`89`	`89`	`override def normalize(s: String) = stripLambdaClassName(super.normalize(s))`
`90`	`90`	`}`
`91`	`91`	`object Lambdaless {`
`92`		`- private val lambdaless = """\$Lambda\$\d+/(?:0x[a-f0-9]{16}\|\d+)(@[a-fA-F0-9]+)?""".r`
	`92`	`+ private val lambdaless = """\$Lambda(?:\$\d+)?/(?:0x[a-f0-9]{16}\|\d+)(?:@[a-fA-F0-9]+)?""".r`
`93`	`93`	`private def stripLambdaClassName(s: String): String = lambdaless.replaceAllIn(s, Regex.quoteReplacement("<function>"))`
`94`	`94`	`}`
`95`	`95`