diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-31 10:11:48 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-31 10:11:48 +0100 |
commit | c5ca49678f129045e59438df279829902034ec71 (patch) | |
tree | 3fd54185e0c064fbd6f718ac345064ce9c559efb /crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt | |
parent | 23dd53eb35ff50508d0c0fc5878a55754b12d381 (diff) | |
parent | 55dcdb7d094f473c73f87ecf997b24f8e35f2a5e (diff) |
Merge #1077
1077: Improve parsing of type bounds r=matklad a=vipentti
This adds new TYPE_BOUND_LIST and TYPE_BOUND syntax kinds. These are now used when parsing type bounds. In addition parsing paths inside a bound now does not recursively parse paths, rather they are treated as separate bounds, separated by +.
Basically now the generic params `struct S<T: 'a + ?Sized + (Copy)>;` in will be parsed as
```
TYPE_PARAM_LIST@[8; 33)
L_ANGLE@[8; 9)
TYPE_PARAM@[9; 32)
NAME@[9; 10)
IDENT@[9; 10) "T"
COLON@[10; 11)
WHITESPACE@[11; 12)
TYPE_BOUND_LIST@[12; 32)
TYPE_BOUND@[12; 14)
LIFETIME@[12; 14) "'a"
WHITESPACE@[14; 15)
PLUS@[15; 16)
WHITESPACE@[16; 17)
TYPE_BOUND@[17; 23)
QUESTION@[17; 18)
PATH_TYPE@[18; 23)
PATH@[18; 23)
PATH_SEGMENT@[18; 23)
NAME_REF@[18; 23)
IDENT@[18; 23) "Sized"
WHITESPACE@[23; 24)
PLUS@[24; 25)
WHITESPACE@[25; 26)
TYPE_BOUND@[26; 32)
L_PAREN@[26; 27)
PATH_TYPE@[27; 31)
PATH@[27; 31)
PATH_SEGMENT@[27; 31)
NAME_REF@[27; 31)
IDENT@[27; 31) "Copy"
R_PAREN@[31; 32)
R_ANGLE@[32; 33)
```
Previously it was parsed, with the paths nested:
```
TYPE_PARAM_LIST@[8; 33)
L_ANGLE@[8; 9)
TYPE_PARAM@[9; 32)
NAME@[9; 10)
IDENT@[9; 10) "T"
COLON@[10; 11)
WHITESPACE@[11; 12)
LIFETIME@[12; 14) "'a"
WHITESPACE@[14; 15)
PLUS@[15; 16)
WHITESPACE@[16; 17)
QUESTION@[17; 18)
PATH_TYPE@[18; 32)
PATH@[18; 23)
PATH_SEGMENT@[18; 23)
NAME_REF@[18; 23)
IDENT@[18; 23) "Sized"
WHITESPACE@[23; 24)
PLUS@[24; 25)
WHITESPACE@[25; 26)
L_PAREN@[26; 27)
PATH_TYPE@[27; 31)
PATH@[27; 31)
PATH_SEGMENT@[27; 31)
NAME_REF@[27; 31)
IDENT@[27; 31) "Copy"
R_PAREN@[31; 32)
R_ANGLE@[32; 33)
```
Looking for feedback.
Co-authored-by: Ville Penttinen <[email protected]>
Diffstat (limited to 'crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt')
-rw-r--r-- | crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt b/crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt index 208e5e51c..93e26aaf6 100644 --- a/crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt +++ b/crates/ra_syntax/tests/data/parser/ok/0036_fully_qualified.txt | |||
@@ -16,11 +16,13 @@ SOURCE_FILE@[0; 157) | |||
16 | IDENT@[73; 74) "S" | 16 | IDENT@[73; 74) "S" |
17 | COLON@[74; 75) | 17 | COLON@[74; 75) |
18 | WHITESPACE@[75; 76) | 18 | WHITESPACE@[75; 76) |
19 | PATH_TYPE@[76; 84) | 19 | TYPE_BOUND_LIST@[76; 84) |
20 | PATH@[76; 84) | 20 | TYPE_BOUND@[76; 84) |
21 | PATH_SEGMENT@[76; 84) | 21 | PATH_TYPE@[76; 84) |
22 | NAME_REF@[76; 84) | 22 | PATH@[76; 84) |
23 | IDENT@[76; 84) "Iterator" | 23 | PATH_SEGMENT@[76; 84) |
24 | NAME_REF@[76; 84) | ||
25 | IDENT@[76; 84) "Iterator" | ||
24 | R_ANGLE@[84; 85) | 26 | R_ANGLE@[84; 85) |
25 | PARAM_LIST@[85; 87) | 27 | PARAM_LIST@[85; 87) |
26 | L_PAREN@[85; 86) | 28 | L_PAREN@[85; 86) |
@@ -64,11 +66,13 @@ SOURCE_FILE@[0; 157) | |||
64 | IDENT@[125; 129) "Item" | 66 | IDENT@[125; 129) "Item" |
65 | COLON@[129; 130) | 67 | COLON@[129; 130) |
66 | WHITESPACE@[130; 131) | 68 | WHITESPACE@[130; 131) |
67 | PATH_TYPE@[131; 133) | 69 | TYPE_BOUND_LIST@[131; 133) |
68 | PATH@[131; 133) | 70 | TYPE_BOUND@[131; 133) |
69 | PATH_SEGMENT@[131; 133) | 71 | PATH_TYPE@[131; 133) |
70 | NAME_REF@[131; 133) | 72 | PATH@[131; 133) |
71 | IDENT@[131; 133) "Eq" | 73 | PATH_SEGMENT@[131; 133) |
74 | NAME_REF@[131; 133) | ||
75 | IDENT@[131; 133) "Eq" | ||
72 | COMMA@[133; 134) | 76 | COMMA@[133; 134) |
73 | WHITESPACE@[134; 135) | 77 | WHITESPACE@[134; 135) |
74 | BLOCK@[135; 156) | 78 | BLOCK@[135; 156) |