diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-04 14:07:09 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-04 14:07:09 +0000 |
| commit | 550b17d7cf321c2aebff75d00b1654b55beca53c (patch) | |
| tree | a7759795877d2d5fef25915997c2679af0cd3e94 /grammar.ron | |
| parent | b86e87c8885895e5b3fcec021ee65003d64c4cbe (diff) | |
| parent | 351107d0b143e2c3497bd0f424f0d76bc51df0c0 (diff) | |
Merge #43
43: Ctx r=matklad a=matklad
Diffstat (limited to 'grammar.ron')
| -rw-r--r-- | grammar.ron | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/grammar.ron b/grammar.ron index c2fcc44f5..e97ef0c2c 100644 --- a/grammar.ron +++ b/grammar.ron | |||
| @@ -27,6 +27,11 @@ Grammar( | |||
| 27 | "mut", | 27 | "mut", |
| 28 | "unsafe", | 28 | "unsafe", |
| 29 | ], | 29 | ], |
| 30 | contextual_keywords: [ | ||
| 31 | "auto", | ||
| 32 | "default", | ||
| 33 | "union", | ||
| 34 | ], | ||
| 30 | tokens: [ | 35 | tokens: [ |
| 31 | "ERROR", | 36 | "ERROR", |
| 32 | "IDENT", | 37 | "IDENT", |