From 5b43010083d029300230e2ea35e9cce6fd5daea3 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 31 Jul 2018 23:57:14 +0300
Subject: Namerefs in methods&fields

---
 src/grammar/expressions.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/grammar')

diff --git a/src/grammar/expressions.rs b/src/grammar/expressions.rs
index 06f9105c6..00a0ec953 100644
--- a/src/grammar/expressions.rs
+++ b/src/grammar/expressions.rs
@@ -39,6 +39,7 @@ pub(super) fn expr(p: &mut Parser) {
             } else {
                 field_expr(p, lhs)
             },
+            DOT if p.nth(1) == INT_NUMBER => field_expr(p, lhs),
             _ => break,
         }
     }
@@ -202,7 +203,7 @@ fn method_call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
     assert!(p.at(DOT) && p.nth(1) == IDENT && p.nth(2) == L_PAREN);
     let m = lhs.precede(p);
     p.bump();
-    p.bump();
+    name_ref(p);
     arg_list(p);
     m.complete(p, METHOD_CALL_EXPR)
 }
@@ -212,10 +213,14 @@ fn method_call_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
 //     x.foo.bar;
 // }
 fn field_expr(p: &mut Parser, lhs: CompletedMarker) -> CompletedMarker {
-    assert!(p.at(DOT) && p.nth(1) == IDENT);
+    assert!(p.at(DOT) && (p.nth(1) == IDENT || p.nth(1) == INT_NUMBER));
     let m = lhs.precede(p);
     p.bump();
-    p.bump();
+    if p.at(IDENT) {
+        name_ref(p)
+    } else {
+        p.bump()
+    }
     m.complete(p, FIELD_EXPR)
 }
 
-- 
cgit v1.2.3