Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SI-6549 Improve escaping in REPL codegen.
- Escape the LHS of an assign when printing results - e.g. X("").foo = bar - Escape val names - e.g. val `"` = 0`
- Loading branch information
Showing
3 changed files
with
56 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
Type in expressions to have them evaluated. | ||
Type :help for more information. | ||
|
||
scala> | ||
|
||
scala> case class `X"`(var xxx: Any) | ||
defined class X$u0022 | ||
|
||
scala> val m = Map(("": Any) -> `X"`("\""), ('s: Any) -> `X"`("\"")) | ||
m: scala.collection.immutable.Map[Any,X"] = Map("" -> X"("), 's -> X"(")) | ||
|
||
scala> m("") | ||
res0: X" = X"(") | ||
|
||
scala> m("").xxx | ||
res1: Any = " | ||
|
||
scala> m("").xxx = 0 | ||
m("").xxx: Any = 0 | ||
|
||
scala> m("").xxx = "\"" | ||
m("").xxx: Any = " | ||
|
||
scala> m('s).xxx = 's | ||
m(scala.Symbol("s")).xxx: Any = 's | ||
|
||
scala> val `"` = 0 | ||
": Int = 0 | ||
|
||
scala> | ||
|
||
scala> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
import scala.tools.partest.ReplTest | ||
|
||
// Check that the fragments of code generated in | ||
// in the REPL correctly escape values added to | ||
// literal strings. | ||
// | ||
// Before, we saw: | ||
// scala> m("").x = 77 | ||
// <console>:10: error: ')' expected but string literal found. | ||
// + "m("").x: Int = " + `$ires8` + "\n" | ||
object Test extends ReplTest { | ||
def code = """ | ||
|case class `X"`(var xxx: Any) | ||
|val m = Map(("": Any) -> `X"`("\""), ('s: Any) -> `X"`("\"")) | ||
|m("") | ||
|m("").xxx | ||
|m("").xxx = 0 | ||
|m("").xxx = "\"" | ||
|m('s).xxx = 's | ||
|val `"` = 0 | ||
""".stripMargin | ||
} |