Skip to content

Commit 968ac65

Browse files
committed
---
yaml --- r: 209903 b: refs/heads/try c: 07cc7d9 h: refs/heads/master i: 209901: 503c820 209899: 51a0c47 209895: 1f9185c 209887: d762d4f v: v3
1 parent fcb81eb commit 968ac65

File tree

88 files changed

+685
-1106
lines changed

Some content is hidden

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

88 files changed

+685
-1106
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: 54d65092a49eba959b5cd7a1c4b2e43b3fedba1f
5+
refs/heads/try: 07cc7d9960a1bc767dc051b9fae0c7ad2b5cd97f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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)