summaryrefslogtreecommitdiff
path: root/spec/06-expressions.md
diff options
context:
space:
mode:
authorDaniel Barclay <dsbos@users.noreply.github.com>2016-11-17 02:05:59 -0500
committerAdriaan Moors <adriaan@lightbend.com>2016-11-16 23:05:59 -0800
commit73678d4dafe250f0b38df2e953787af26b1a4ee3 (patch)
treed78ba1dacca4442e670f48e3294b9bfbc0b6a8ca /spec/06-expressions.md
parent6b44da1454fa8cce63371c253bd884626249b043 (diff)
downloadscala-73678d4dafe250f0b38df2e953787af26b1a4ee3.tar.gz
scala-73678d4dafe250f0b38df2e953787af26b1a4ee3.tar.bz2
scala-73678d4dafe250f0b38df2e953787af26b1a4ee3.zip
Add language to code blocks in spec (#5502)
* Add "scala" language code to pure-Scala code blocks. * Add "java" language code to Java code block. * Add "scala" language code to almost-pure-Scala code blocks. Add "scala" language code to two code blocks whose content was Scala except for containing ellipses (\ldots). * Add "scala" language code to non-literal-Scala code blocks. Add "scala" language code to code blocks that contain Scala but also special elements, such as identifiers that are italicized or have prime marks (e.g., e′, e′′), ellipses (\ldots), etc.
Diffstat (limited to 'spec/06-expressions.md')
-rw-r--r--spec/06-expressions.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/06-expressions.md b/spec/06-expressions.md
index 36cd3fd3cf..48cff1725a 100644
--- a/spec/06-expressions.md
+++ b/spec/06-expressions.md
@@ -945,7 +945,7 @@ comprehensions have been eliminated.
`$e$.foreach { case $p$ => $e'$ }`.
- A for comprehension
- ```
+ ```scala
for ($p$ <- $e$; $p'$ <- $e'; \ldots$) yield $e''$
```
@@ -953,13 +953,13 @@ comprehensions have been eliminated.
sequence of generators, definitions, or guards,
is translated to
- ```
+ ```scala
$e$.flatMap { case $p$ => for ($p'$ <- $e'; \ldots$) yield $e''$ }
```
- A for loop
- ```
+ ```scala
for ($p$ <- $e$; $p'$ <- $e'; \ldots$) $e''$
```
@@ -967,7 +967,7 @@ comprehensions have been eliminated.
sequence of generators, definitions, or guards,
is translated to
- ```
+ ```scala
$e$.foreach { case $p$ => for ($p'$ <- $e'; \ldots$) $e''$ }
```
@@ -980,7 +980,7 @@ comprehensions have been eliminated.
`$p'$ = $e'$` is translated to the following generator of pairs of values, where
$x$ and $x'$ are fresh names:
- ```
+ ```scala
($p$, $p'$) <- for ($x @ p$ <- $e$) yield { val $x' @ p'$ = $e'$; ($x$, $x'$) }
```