mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make name_ref to accept numeric names optionally

Browse source
This commit is contained in:
Evgenii P 2019-08-09 16:08:36 +07:00
parent 957b5ed23a
commit fa24e20867
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_parser/src/grammar.rs
View file

@ -273,8 +273,8 @@ fn name(p: &mut Parser) {
name_r(p, TokenSet::empty())
}
fn name_ref(p: &mut Parser) {
if p.at(IDENT) || p.at(INT_NUMBER) {
fn name_ref(p: &mut Parser, allow_numeric_names: bool) {
if p.at(IDENT) || (allow_numeric_names && p.at(INT_NUMBER)) {
let m = p.start();
p.bump();
m.complete(p, NAME_REF);

6
crates/ra_parser/src/grammar/expressions.rs
View file

@ -458,7 +458,7 @@ fn method_call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
assert!(p.at(T![.]) && p.nth(1) == IDENT && (p.nth(2) == T!['('] || p.nth(2) == T![::]));
let m = lhs.precede(p);
p.bump();
name_ref(p);
name_ref(p, false);
type_args::opt_type_arg_list(p, true);
if p.at(T!['(']) {
arg_list(p);
@ -485,7 +485,7 @@ fn field_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
let m = lhs.precede(p);
p.bump();
if p.at(IDENT) {
name_ref(p)
name_ref(p, false)
} else if p.at(INT_NUMBER) {
p.bump();
} else if p.at(FLOAT_NUMBER) {
@ -587,7 +587,7 @@ pub(crate) fn named_field_list(p: &mut Parser) {
IDENT | INT_NUMBER | T![#] => {
let m = p.start();
attributes::outer_attributes(p);
name_ref(p);
name_ref(p, true);
if p.eat(T![:]) {
expr(p);
}

2
crates/ra_parser/src/grammar/items.rs
View file

@ -279,7 +279,7 @@ fn extern_crate_item(p: &mut Parser, m: Marker) {
p.bump();
assert!(p.at(T![crate]));
p.bump();
name_ref(p);
name_ref(p, false);
opt_alias(p);
p.expect(T![;]);
m.complete(p, EXTERN_CRATE_ITEM);

2
crates/ra_parser/src/grammar/paths.rs
View file

@ -71,7 +71,7 @@ fn path_segment(p: &mut Parser, mode: Mode, first: bool) {
}
match p.current() {
IDENT => {
name_ref(p);
name_ref(p, false);
opt_path_type_args(p, mode);
}
// test crate_path

4
crates/ra_parser/src/grammar/type_args.rs
View file

@ -38,12 +38,12 @@ fn type_arg(p: &mut Parser) {
// test associated_type_bounds
// fn print_all<T: Iterator<Item: Display>>(printables: T) {}
IDENT if p.nth(1) == T![:] => {
name_ref(p);
name_ref(p, false);
type_params::bounds(p);
m.complete(p, ASSOC_TYPE_ARG);
}
IDENT if p.nth(1) == T![=] => {
name_ref(p);
name_ref(p, false);
p.bump();
types::type_(p);
m.complete(p, ASSOC_TYPE_ARG);