aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMatt Brubeck <[email protected]>2010-07-08 17:01:25 +0800
committerGraydon Hoare <[email protected]>2010-07-08 22:43:15 +0800
commit244ea680820c205461ad5af979c0a722372e6dc6 (patch)
tree45d4da70ea8f68b84105bfdac48f8556519fb14e /doc
parentSome more typestate tests. (diff)
downloadrust-244ea680820c205461ad5af979c0a722372e6dc6.tar.xz
rust-244ea680820c205461ad5af979c0a722372e6dc6.zip
Issue 66: Multi-line comments
Diffstat (limited to 'doc')
-rw-r--r--doc/rust.texi10
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/rust.texi b/doc/rust.texi
index b8a59a2b..3e6a93b2 100644
--- a/doc/rust.texi
+++ b/doc/rust.texi
@@ -616,11 +616,17 @@ otherwise a free-form language.
@dfn{Whitespace} is any of the following Unicode characters: U+0020 (space),
U+0009 (tab, @code{'\t'}), U+000A (LF, @code{'\n'}), U+000D (CR, @code{'\r'}).
-@dfn{Comments} are any sequence of Unicode characters beginning with U+002F
-U+002F (@code{"//"}) and extending to the next U+000A character,
+@dfn{Comments} are @emph{single-line comments} or @emph{multi-line comments}.
+
+A @dfn{single-line comment} is any sequence of Unicode characters beginning
+with U+002F U+002F (@code{"//"}) and extending to the next U+000A character,
@emph{excluding} cases in which such a sequence occurs within a string literal
token or a syntactic extension token.
+A @dfn{multi-line comments} is any sequence of Unicode characters beginning
+with U+002F U+002A (@code{"/*"}) and ending with U+002A U+002F (@code{"*/"}),
+@emph{excluding} cases in which such a sequence occurs within a string literal
+token or a syntactic extension token. Multi-line comments may be nested.
@node Ref.Lex.Ident
@subsection Ref.Lex.Ident