From 9fa32c07a031dc32d8694d75f31f915b674b6ed1 Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Sat, 16 Nov 2013 15:53:56 +1100 Subject: [PATCH] Fix the `num_lit` grammar in the reference manual. - Cause `0` to be considered a valid integer literal (it is). - Add octal literals (missed from #10243). I have *not* modified doc/po/rust.md.pot or doc/po/ja/rust.md.po at all; they already seem to be out of date so it's easier to ignore them for myself. I can update them if desired, of course. --- doc/rust.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/rust.md b/doc/rust.md index 389ea58ee15..3c0cc64ab5e 100644 --- a/doc/rust.md +++ b/doc/rust.md @@ -254,6 +254,7 @@ common_escape : '\x5c' hex_digit : 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | dec_digit ; +oct_digit : '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' ; dec_digit : '0' | nonzero_dec ; nonzero_dec: '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' ; @@ -318,8 +319,9 @@ r##"foo #"# bar"##; // foo #"# bar ~~~~ {.ebnf .gram} num_lit : nonzero_dec [ dec_digit | '_' ] * num_suffix ? - | '0' [ [ dec_digit | '_' ] + num_suffix ? + | '0' [ [ dec_digit | '_' ] * num_suffix ? | 'b' [ '1' | '0' | '_' ] + int_suffix ? + | 'o' [ oct_digit | '_' ] + int_suffix ? | 'x' [ hex_digit | '_' ] + int_suffix ? ] ; num_suffix : int_suffix | float_suffix ;