From 0c81b9deeed81bfb2cf8142af9d748317d5d71a1 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 20 Feb 2019 21:50:07 +0300
Subject: route parsing via TokenSource trait

---
 crates/ra_syntax/src/parsing/parser_impl/input.rs | 69 ++++++++++-------------
 1 file changed, 31 insertions(+), 38 deletions(-)

(limited to 'crates/ra_syntax/src/parsing/parser_impl')

diff --git a/crates/ra_syntax/src/parsing/parser_impl/input.rs b/crates/ra_syntax/src/parsing/parser_impl/input.rs
index 275d94918..8ebbd3825 100644
--- a/crates/ra_syntax/src/parsing/parser_impl/input.rs
+++ b/crates/ra_syntax/src/parsing/parser_impl/input.rs
@@ -1,10 +1,40 @@
 use crate::{
     SyntaxKind, SyntaxKind::EOF, TextRange, TextUnit,
-    parsing::lexer::Token,
+    parsing::{
+        parser_impl::TokenSource,
+        lexer::Token,
+    },
 };
 
 use std::ops::{Add, AddAssign};
 
+impl<'t> TokenSource for ParserInput<'t> {
+    fn token_kind(&self, pos: InputPosition) -> SyntaxKind {
+        let idx = pos.0 as usize;
+        if !(idx < self.tokens.len()) {
+            return EOF;
+        }
+        self.tokens[idx].kind
+    }
+    fn is_token_joint_to_next(&self, pos: InputPosition) -> bool {
+        let idx_curr = pos.0 as usize;
+        let idx_next = pos.0 as usize;
+        if !(idx_next < self.tokens.len()) {
+            return true;
+        }
+        self.start_offsets[idx_curr] + self.tokens[idx_curr].len == self.start_offsets[idx_next]
+    }
+    fn is_keyword(&self, pos: InputPosition, kw: &str) -> bool {
+        let idx = pos.0 as usize;
+        if !(idx < self.tokens.len()) {
+            return false;
+        }
+        let range = TextRange::offset_len(self.start_offsets[idx], self.tokens[idx].len);
+
+        self.text[range] == *kw
+    }
+}
+
 pub(crate) struct ParserInput<'t> {
     text: &'t str,
     /// start position of each token(expect whitespace and comment)
@@ -41,43 +71,6 @@ impl<'t> ParserInput<'t> {
 
         ParserInput { text, start_offsets, tokens }
     }
-
-    /// Get the syntax kind of token at given input position.
-    pub fn kind(&self, pos: InputPosition) -> SyntaxKind {
-        let idx = pos.0 as usize;
-        if !(idx < self.tokens.len()) {
-            return EOF;
-        }
-        self.tokens[idx].kind
-    }
-
-    /// Get the length of a token at given input position.
-    pub fn token_len(&self, pos: InputPosition) -> TextUnit {
-        let idx = pos.0 as usize;
-        if !(idx < self.tokens.len()) {
-            return 0.into();
-        }
-        self.tokens[idx].len
-    }
-
-    /// Get the start position of a taken at given input position.
-    pub fn token_start_at(&self, pos: InputPosition) -> TextUnit {
-        let idx = pos.0 as usize;
-        if !(idx < self.tokens.len()) {
-            return 0.into();
-        }
-        self.start_offsets[idx]
-    }
-
-    /// Get the raw text of a token at given input position.
-    pub fn token_text(&self, pos: InputPosition) -> &'t str {
-        let idx = pos.0 as usize;
-        if !(idx < self.tokens.len()) {
-            return "";
-        }
-        let range = TextRange::offset_len(self.start_offsets[idx], self.tokens[idx].len);
-        &self.text[range]
-    }
 }
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
-- 
cgit v1.2.3