Skip to content

Commit f9d4410

Browse files
committed
---
yaml --- r: 216891 b: refs/heads/stable c: 218d38f h: refs/heads/master i: 216889: 586bdb8 216887: 69c31d8 v: v3
1 parent d33d448 commit f9d4410

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
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: 53cd0bc772c5b73d8059a02f828ceecf9ed2287c
32+
refs/heads/stable: 218d38fb94379feca89eb858b309890d513c35da
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375

branches/stable/src/doc/grammar.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ The two values of the boolean type are written `true` and `false`.
253253
### Symbols
254254

255255
```antlr
256-
symbol : "::" "->"
256+
symbol : "::" | "->"
257257
| '#' | '[' | ']' | '(' | ')' | '{' | '}'
258258
| ',' | ';' ;
259259
```
@@ -342,7 +342,7 @@ path_glob : ident [ "::" [ path_glob
342342
| '*' ] ] ?
343343
| '{' path_item [ ',' path_item ] * '}' ;
344344
345-
path_item : ident | "mod" ;
345+
path_item : ident | "self" ;
346346
```
347347

348348
### Functions
@@ -424,7 +424,7 @@ See [Use declarations](#use-declarations).
424424
## Attributes
425425

426426
```antlr
427-
attribute : "#!" ? '[' meta_item ']' ;
427+
attribute : '#' '!' ? '[' meta_item ']' ;
428428
meta_item : ident [ '=' literal
429429
| '(' meta_seq ')' ] ? ;
430430
meta_seq : meta_item [ ',' meta_seq ] ? ;
@@ -515,8 +515,7 @@ struct_expr : expr_path '{' ident ':' expr
515515
### Block expressions
516516

517517
```antlr
518-
block_expr : '{' [ view_item ] *
519-
[ stmt ';' | item ] *
518+
block_expr : '{' [ stmt ';' | item ] *
520519
[ expr ] '}' ;
521520
```
522521

@@ -537,7 +536,7 @@ field_expr : expr '.' ident ;
537536
```antlr
538537
array_expr : '[' "mut" ? array_elems? ']' ;
539538
540-
array_elems : [expr [',' expr]*] | [expr ',' ".." expr] ;
539+
array_elems : [expr [',' expr]*] | [expr ';' expr] ;
541540
```
542541

543542
### Index expressions

0 commit comments

Comments
 (0)