about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-29 22:58:35 -0700
committerbors <bors@rust-lang.org>2013-05-29 22:58:35 -0700
commit31b2804fdab0046b139399589eab74995da3c265 (patch)
tree4dcfb2fa57f6aaf9cd189055936f16a4e765fe4e
parent3a3bf8bdef513c889117ab6a90b463fc0b2e2642 (diff)
parentbfe141c4e1a8c19072f4c3e0ea5450961253617b (diff)
downloadrust-31b2804fdab0046b139399589eab74995da3c265.tar.gz
rust-31b2804fdab0046b139399589eab74995da3c265.zip
auto merge of #6825 : caitp/rust/issue-6824, r=Aatch
Show `int_suffix_size` to appear 0 or 1 times
Show `exponent | . dec_lit` to appear 0 or 1 times, to show why `3f;` is a valid number
-rw-r--r--doc/rust.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rust.md b/doc/rust.md
index 9d96cc1dd98..4a7f9544a11 100644
--- a/doc/rust.md
+++ b/doc/rust.md
@@ -301,10 +301,10 @@ num_lit : nonzero_dec [ dec_digit | '_' ] * num_suffix ?
 num_suffix : int_suffix | float_suffix ;
 
 int_suffix : 'u' int_suffix_size ?
-           | 'i' int_suffix_size ;
+           | 'i' int_suffix_size ? ;
 int_suffix_size : [ '8' | '1' '6' | '3' '2' | '6' '4' ] ;
 
-float_suffix : [ exponent | '.' dec_lit exponent ? ] float_suffix_ty ? ;
+float_suffix : [ exponent | '.' dec_lit exponent ? ] ? float_suffix_ty ? ;
 float_suffix_ty : 'f' [ '3' '2' | '6' '4' ] ;
 exponent : ['E' | 'e'] ['-' | '+' ] ? dec_lit ;
 dec_lit : [ dec_digit | '_' ] + ;