diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2013-03-01 19:22:56 +0100 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2013-03-09 14:44:43 +0100 |
commit | 9bc17e7779f878f17b97130359940b0d0b30f243 (patch) | |
tree | 08cb4d18eb2989929209bdea475f67687ef81f90 /test | |
parent | 5d54cf9e375d796c59b1dd488c15f88f4bfb14d6 (diff) | |
download | scala-9bc17e7779f878f17b97130359940b0d0b30f243.tar.gz scala-9bc17e7779f878f17b97130359940b0d0b30f243.tar.bz2 scala-9bc17e7779f878f17b97130359940b0d0b30f243.zip |
SI-6725 `f` interpolator now supports %n tokens
Currently the `f` interpolator supports format specifiers which
specify conversions for formatted arguments. However Java formatting
is not limited to argument-related conversions as explained in:
http://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#detail.
Conversions which don't correspond to any arguments are `%` (used to
emit verbatim `'%'` characters) and `n` (used to emit platform-specific
line separators). Of those only the former is supported, and this patch
fixes the oversight.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/run/t6725-1.check | 2 | ||||
-rw-r--r-- | test/files/run/t6725-1.scala | 5 | ||||
-rw-r--r-- | test/files/run/t6725-2.check | 8 | ||||
-rw-r--r-- | test/files/run/t6725-2.scala | 6 |
4 files changed, 21 insertions, 0 deletions
diff --git a/test/files/run/t6725-1.check b/test/files/run/t6725-1.check new file mode 100644 index 0000000000..6ed281c757 --- /dev/null +++ b/test/files/run/t6725-1.check @@ -0,0 +1,2 @@ +1 +1 diff --git a/test/files/run/t6725-1.scala b/test/files/run/t6725-1.scala new file mode 100644 index 0000000000..a167ef8aa3 --- /dev/null +++ b/test/files/run/t6725-1.scala @@ -0,0 +1,5 @@ +object Test extends App { + val a = 1 + val s = f"$a%s%n$a%s" + println(s) +}
\ No newline at end of file diff --git a/test/files/run/t6725-2.check b/test/files/run/t6725-2.check new file mode 100644 index 0000000000..3496917ad5 --- /dev/null +++ b/test/files/run/t6725-2.check @@ -0,0 +1,8 @@ + + +aaaa + + +aaaa +aaaa +aaaa diff --git a/test/files/run/t6725-2.scala b/test/files/run/t6725-2.scala new file mode 100644 index 0000000000..e033cf5ea8 --- /dev/null +++ b/test/files/run/t6725-2.scala @@ -0,0 +1,6 @@ +object Test extends App { + println(f"%n") + println(f"aaaa%n") + println(f"%naaaa") + println(f"aaaa%naaaa") +}
\ No newline at end of file |