summaryrefslogtreecommitdiff
path: root/03-lexical-syntax.md
diff options
context:
space:
mode:
authorIain McGinniss <iainmcgin@gmail.com>2012-10-26 22:53:29 +0100
committerIain McGinniss <iainmcgin@gmail.com>2012-10-26 22:53:29 +0100
commitbb53357a77105d4c01cc0c7566497f05a7620878 (patch)
tree173585aa52d94951d3d43f002f9d57526f7da966 /03-lexical-syntax.md
parent3340862f0140b7f70dbea250a60fc4e2f41ff01b (diff)
downloadscala-bb53357a77105d4c01cc0c7566497f05a7620878.tar.gz
scala-bb53357a77105d4c01cc0c7566497f05a7620878.tar.bz2
scala-bb53357a77105d4c01cc0c7566497f05a7620878.zip
types chapter fully converted. Added link to jquery and some experimental
code for a fixed pop-out version of the table of contents, which is currently disabled.
Diffstat (limited to '03-lexical-syntax.md')
-rw-r--r--03-lexical-syntax.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/03-lexical-syntax.md b/03-lexical-syntax.md
index cbc09d2c9a..8fc6d30cf6 100644
--- a/03-lexical-syntax.md
+++ b/03-lexical-syntax.md
@@ -23,7 +23,7 @@ classes (Unicode general category given in parentheses):
#. Whitespace characters. `\u0020 | \u0009 | \u000D | \u000A`{.grammar}
#. Letters, which include lower case letters(Ll), upper case letters(Lu),
titlecase letters(Lt), other letters(Lo), letter numerals(Nl) and the
- two characters \\u0024 ‘$’ and \\u005F ‘_’, which both count as upper case
+ two characters \\u0024 ‘\\$’ and \\u005F ‘_’, which both count as upper case
letters
#. Digits ` ‘0’ | … | ‘9’ `{.grammar}
#. Parentheses ` ‘(’ | ‘)’ | ‘[’ | ‘]’ | ‘{’ | ‘}’ `{.grammar}
@@ -70,9 +70,9 @@ decomposes into the three identifiers `big_bob`, `++=`, and
_variable identifiers_, which start with a lower case letter, and
_constant identifiers_, which do not.
-The ‘$’ character is reserved
+The ‘\$’ character is reserved
for compiler-synthesized identifiers. User programs should not define
-identifiers which contain ‘$’ characters.
+identifiers which contain ‘\$’ characters.
The following names are reserved words instead of being members of the
syntactic class `id` of lexical identifiers.