Skip to content

Commit 290287f

Browse files
committed
---
yaml --- r: 216214 b: refs/heads/stable c: 46462c7 h: refs/heads/master v: v3
1 parent 190bb55 commit 290287f

File tree

98 files changed

+780
-1236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+780
-1236
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ refs/heads/tmp: 378a370ff2057afeb1eae86eb6e78c476866a4a6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 4f1bbc209fbf79ed5143ec4f5d78333dab4ba39d
32+
refs/heads/stable: 46462c7b5f33f33a338ee7ab40476be2234e2851
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375

branches/stable/src/doc/grammar.md

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -152,19 +152,19 @@ token : simple_token | ident | literal | symbol | whitespace token ;
152152

153153
<p id="keyword-table-marker"></p>
154154

155-
| | | | | |
156-
|----------|----------|----------|----------|---------|
157-
| abstract | alignof | as | become | box |
158-
| break | const | continue | crate | do |
159-
| else | enum | extern | false | final |
160-
| fn | for | if | impl | in |
161-
| let | loop | macro | match | mod |
162-
| move | mut | offsetof | override | priv |
163-
| proc | pub | pure | ref | return |
164-
| Self | self | sizeof | static | struct |
165-
| super | trait | true | type | typeof |
166-
| unsafe | unsized | use | virtual | where |
167-
| while | yield | | | |
155+
| | | | | |
156+
|----------|----------|----------|----------|--------|
157+
| abstract | alignof | as | become | box |
158+
| break | const | continue | crate | do |
159+
| else | enum | extern | false | final |
160+
| fn | for | if | impl | in |
161+
| let | loop | match | mod | move |
162+
| mut | offsetof | once | override | priv |
163+
| proc | pub | pure | ref | return |
164+
| sizeof | static | self | struct | super |
165+
| true | trait | type | typeof | unsafe |
166+
| unsized | use | virtual | where | while |
167+
| yield | | | | |
168168

169169

170170
Each of these keywords has special meaning in its grammar, and all of them are
@@ -524,15 +524,6 @@ array_elems : [expr [',' expr]*] | [expr ',' ".." expr] ;
524524
idx_expr : expr '[' expr ']' ;
525525
```
526526

527-
### Range expressions
528-
529-
```antlr
530-
range_expr : expr ".." expr |
531-
expr ".." |
532-
".." expr |
533-
".." ;
534-
```
535-
536527
### Unary operator expressions
537528

538529
**FIXME:** grammar?
@@ -619,7 +610,7 @@ lambda_expr : '|' ident_list '|' expr ;
619610
### While loops
620611

621612
```antlr
622-
while_expr : [ lifetime ':' ] "while" no_struct_literal_expr '{' block '}' ;
613+
while_expr : "while" no_struct_literal_expr '{' block '}' ;
623614
```
624615

625616
### Infinite loops
@@ -643,7 +634,7 @@ continue_expr : "continue" [ lifetime ];
643634
### For expressions
644635

645636
```antlr
646-
for_expr : [ lifetime ':' ] "for" pat "in" no_struct_literal_expr '{' block '}' ;
637+
for_expr : "for" pat "in" no_struct_literal_expr '{' block '}' ;
647638
```
648639

649640
### If expressions

0 commit comments

Comments
 (0)