summaryrefslogtreecommitdiff
path: root/03-lexical-syntax.md
diff options
context:
space:
mode:
authorIain McGinniss <iainmcgin@gmail.com>2013-02-21 00:40:21 +0000
committerIain McGinniss <iainmcgin@gmail.com>2013-02-21 00:40:21 +0000
commit2311e3498bea8d149cc38a6d3585de245134add9 (patch)
treef7915020ed62562b6773ba3dae9c754ed989f3dd /03-lexical-syntax.md
parente7ade69a2769b04dca6c6d55122351faa154f969 (diff)
downloadscala-2311e3498bea8d149cc38a6d3585de245134add9.tar.gz
scala-2311e3498bea8d149cc38a6d3585de245134add9.tar.bz2
scala-2311e3498bea8d149cc38a6d3585de245134add9.zip
fix poorly labeled section links
fix over-wide grammar text
Diffstat (limited to '03-lexical-syntax.md')
-rw-r--r--03-lexical-syntax.md24
1 files changed, 12 insertions, 12 deletions
diff --git a/03-lexical-syntax.md b/03-lexical-syntax.md
index 476063c0c5..98365929be 100644
--- a/03-lexical-syntax.md
+++ b/03-lexical-syntax.md
@@ -181,25 +181,24 @@ Multiple newline tokens are accepted in the following places (note
that a semicolon in place of the newline would be illegal in every one
of these cases):
-- between the condition of an
- conditional expression ([here](#conditional-expressions))
- or while loop ([here](#while-loop-expressions)) and the next
+- between the condition of a
+ [conditional expression](#conditional-expressions)
+ or [while loop](#while-loop-expressions) and the next
following expression,
- between the enumerators of a
- for-comprehension ([here](#for-comprehensions-and-for-loops))
+ [for-comprehension](#for-comprehensions-and-for-loops)
and the next following expression, and
-- after the initial `type`{.scala} keyword in a type definition or
- declaration ([here](#type-declarations-and-type-aliases)).
+- after the initial `type`{.scala} keyword in a
+ [type definition or declaration](#type-declarations-and-type-aliases).
A single new line token is accepted
- in front of an opening brace ‘{’, if that brace is a legal
continuation of the current statement or expression,
-- after an infix operator, if the first token on the next line can
- start an expression ([here](#prefix-infix-and-postfix-operations)),
-- in front of a parameter clause
- ([here](#function-declarations-and-definitions)), and
-- after an annotation ([here](#user-defined-annotations)).
+- after an [infix operator](#prefix-infix-and-postfix-operations),
+ if the first token on the next line can start an expression,
+- in front of a [parameter clause](#function-declarations-and-definitions), and
+- after an [annotation](#user-defined-annotations).
(@) The following code contains four well-formed statements, each
on two lines. The newline tokens between the two lines are not
@@ -319,7 +318,8 @@ Literal ::= [‘-’] integerLiteral
### Integer Literals
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.grammar}
-integerLiteral ::= (decimalNumeral | hexNumeral | octalNumeral) [‘L’ | ‘l’]
+integerLiteral ::= (decimalNumeral | hexNumeral | octalNumeral)
+ [‘L’ | ‘l’]
decimalNumeral ::= ‘0’ | nonZeroDigit {digit}
hexNumeral ::= ‘0’ ‘x’ hexDigit {hexDigit}
octalNumeral ::= ‘0’ octalDigit {octalDigit}