diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-17 22:07:16 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-02-17 22:07:16 +0000 |
commit | 9500ad521121f501aea02f549223eb583cb298ee (patch) | |
tree | a383a2e71da6029bbd6a5669b5f9d2b99a1b0a92 /src/syntax_kinds.rs | |
parent | 8c4c5b5b802a204bfeef52e215358ae838900f1f (diff) | |
parent | c6f4a06b4297f498da4bc2cd747aa38effb855b0 (diff) |
Merge #54
54: G: value_parameters, patterns & let statement r=matklad a=matklad
bors r+
Diffstat (limited to 'src/syntax_kinds.rs')
-rw-r--r-- | src/syntax_kinds.rs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/syntax_kinds.rs b/src/syntax_kinds.rs index 537a80417..1cc29bb61 100644 --- a/src/syntax_kinds.rs +++ b/src/syntax_kinds.rs | |||
@@ -84,6 +84,8 @@ pub enum SyntaxKind { | |||
84 | MUT_KW, | 84 | MUT_KW, |
85 | UNSAFE_KW, | 85 | UNSAFE_KW, |
86 | TYPE_KW, | 86 | TYPE_KW, |
87 | REF_KW, | ||
88 | LET_KW, | ||
87 | AUTO_KW, | 89 | AUTO_KW, |
88 | DEFAULT_KW, | 90 | DEFAULT_KW, |
89 | UNION_KW, | 91 | UNION_KW, |
@@ -110,6 +112,10 @@ pub enum SyntaxKind { | |||
110 | PLACEHOLDER_TYPE, | 112 | PLACEHOLDER_TYPE, |
111 | FN_POINTER_TYPE, | 113 | FN_POINTER_TYPE, |
112 | FOR_TYPE, | 114 | FOR_TYPE, |
115 | REF_PAT, | ||
116 | BIND_PAT, | ||
117 | PLACEHOLDER_PAT, | ||
118 | TUPLE_EXPR, | ||
113 | EXTERN_BLOCK, | 119 | EXTERN_BLOCK, |
114 | ENUM_VARIANT, | 120 | ENUM_VARIANT, |
115 | NAMED_FIELD, | 121 | NAMED_FIELD, |
@@ -129,6 +135,9 @@ pub enum SyntaxKind { | |||
129 | ABI, | 135 | ABI, |
130 | NAME, | 136 | NAME, |
131 | NAME_REF, | 137 | NAME_REF, |
138 | VALUE_PARAMETER, | ||
139 | BLOCK, | ||
140 | LET_STMT, | ||
132 | 141 | ||
133 | // Technical SyntaxKinds: they appear temporally during parsing, | 142 | // Technical SyntaxKinds: they appear temporally during parsing, |
134 | // but never end up in the final tree | 143 | // but never end up in the final tree |
@@ -220,6 +229,8 @@ impl SyntaxKind { | |||
220 | MUT_KW => &SyntaxInfo { name: "MUT_KW" }, | 229 | MUT_KW => &SyntaxInfo { name: "MUT_KW" }, |
221 | UNSAFE_KW => &SyntaxInfo { name: "UNSAFE_KW" }, | 230 | UNSAFE_KW => &SyntaxInfo { name: "UNSAFE_KW" }, |
222 | TYPE_KW => &SyntaxInfo { name: "TYPE_KW" }, | 231 | TYPE_KW => &SyntaxInfo { name: "TYPE_KW" }, |
232 | REF_KW => &SyntaxInfo { name: "REF_KW" }, | ||
233 | LET_KW => &SyntaxInfo { name: "LET_KW" }, | ||
223 | AUTO_KW => &SyntaxInfo { name: "AUTO_KW" }, | 234 | AUTO_KW => &SyntaxInfo { name: "AUTO_KW" }, |
224 | DEFAULT_KW => &SyntaxInfo { name: "DEFAULT_KW" }, | 235 | DEFAULT_KW => &SyntaxInfo { name: "DEFAULT_KW" }, |
225 | UNION_KW => &SyntaxInfo { name: "UNION_KW" }, | 236 | UNION_KW => &SyntaxInfo { name: "UNION_KW" }, |
@@ -246,6 +257,10 @@ impl SyntaxKind { | |||
246 | PLACEHOLDER_TYPE => &SyntaxInfo { name: "PLACEHOLDER_TYPE" }, | 257 | PLACEHOLDER_TYPE => &SyntaxInfo { name: "PLACEHOLDER_TYPE" }, |
247 | FN_POINTER_TYPE => &SyntaxInfo { name: "FN_POINTER_TYPE" }, | 258 | FN_POINTER_TYPE => &SyntaxInfo { name: "FN_POINTER_TYPE" }, |
248 | FOR_TYPE => &SyntaxInfo { name: "FOR_TYPE" }, | 259 | FOR_TYPE => &SyntaxInfo { name: "FOR_TYPE" }, |
260 | REF_PAT => &SyntaxInfo { name: "REF_PAT" }, | ||
261 | BIND_PAT => &SyntaxInfo { name: "BIND_PAT" }, | ||
262 | PLACEHOLDER_PAT => &SyntaxInfo { name: "PLACEHOLDER_PAT" }, | ||
263 | TUPLE_EXPR => &SyntaxInfo { name: "TUPLE_EXPR" }, | ||
249 | EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" }, | 264 | EXTERN_BLOCK => &SyntaxInfo { name: "EXTERN_BLOCK" }, |
250 | ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" }, | 265 | ENUM_VARIANT => &SyntaxInfo { name: "ENUM_VARIANT" }, |
251 | NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" }, | 266 | NAMED_FIELD => &SyntaxInfo { name: "NAMED_FIELD" }, |
@@ -265,6 +280,9 @@ impl SyntaxKind { | |||
265 | ABI => &SyntaxInfo { name: "ABI" }, | 280 | ABI => &SyntaxInfo { name: "ABI" }, |
266 | NAME => &SyntaxInfo { name: "NAME" }, | 281 | NAME => &SyntaxInfo { name: "NAME" }, |
267 | NAME_REF => &SyntaxInfo { name: "NAME_REF" }, | 282 | NAME_REF => &SyntaxInfo { name: "NAME_REF" }, |
283 | VALUE_PARAMETER => &SyntaxInfo { name: "VALUE_PARAMETER" }, | ||
284 | BLOCK => &SyntaxInfo { name: "BLOCK" }, | ||
285 | LET_STMT => &SyntaxInfo { name: "LET_STMT" }, | ||
268 | 286 | ||
269 | TOMBSTONE => &SyntaxInfo { name: "TOMBSTONE" }, | 287 | TOMBSTONE => &SyntaxInfo { name: "TOMBSTONE" }, |
270 | EOF => &SyntaxInfo { name: "EOF" }, | 288 | EOF => &SyntaxInfo { name: "EOF" }, |
@@ -301,6 +319,8 @@ pub(crate) fn ident_to_keyword(ident: &str) -> Option<SyntaxKind> { | |||
301 | "mut" => Some(MUT_KW), | 319 | "mut" => Some(MUT_KW), |
302 | "unsafe" => Some(UNSAFE_KW), | 320 | "unsafe" => Some(UNSAFE_KW), |
303 | "type" => Some(TYPE_KW), | 321 | "type" => Some(TYPE_KW), |
322 | "ref" => Some(REF_KW), | ||
323 | "let" => Some(LET_KW), | ||
304 | _ => None, | 324 | _ => None, |
305 | } | 325 | } |
306 | } | 326 | } |