Deal with warnings for Ellipsis and Rarrow

cthulahoops · cthulahoops · commit 12a3ff5e7e21 · 2018-07-29T09:06:56.000+01:00
diff --git a/parser/src/lexer.rs b/parser/src/lexer.rs
@@ -56,6 +56,7 @@ impl<'input> Lexer<'input> {
         let mut keywords: HashMap<String, Tok> = HashMap::new();
 
         // Alphabetical keywords:
+        keywords.insert(String::from("..."), Tok::Ellipsis);
         keywords.insert(String::from("False"), Tok::False);
         keywords.insert(String::from("None"), Tok::None);
         keywords.insert(String::from("True"), Tok::True);
@@ -433,6 +434,10 @@ impl<'input> Lexer<'input> {
                             self.next_char();
                             return Some(Ok((tok_start, Tok::MinusEqual, self.location + 1)));
                         }
+                        Some('>') => {
+                            self.next_char();
+                            return Some(Ok((tok_start, Tok::Rarrow, self.location + 1)));
+                        }
                         _ => return Some(Ok((tok_start, Tok::Minus, self.location + 1))),
                     }
                 }
diff --git a/parser/src/token.rs b/parser/src/token.rs
@@ -54,7 +54,7 @@ pub enum Tok {
     At,
     AtEqual,
     Rarrow,
-    Ellipses,
+    Ellipsis,
 
     // Keywords (alphabetically):
 

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ impl<'input> Lexer<'input> {`
`56`	`56`	`let mut keywords: HashMap<String, Tok> = HashMap::new();`
`57`	`57`
`58`	`58`	`// Alphabetical keywords:`
	`59`	`+ keywords.insert(String::from("..."), Tok::Ellipsis);`
`59`	`60`	`keywords.insert(String::from("False"), Tok::False);`
`60`	`61`	`keywords.insert(String::from("None"), Tok::None);`
`61`	`62`	`keywords.insert(String::from("True"), Tok::True);`
`@@ -433,6 +434,10 @@ impl<'input> Lexer<'input> {`
`433`	`434`	`self.next_char();`
`434`	`435`	`return Some(Ok((tok_start, Tok::MinusEqual, self.location + 1)));`
`435`	`436`	`}`
	`437`	`+ Some('>') => {`
	`438`	`+ self.next_char();`
	`439`	`+ return Some(Ok((tok_start, Tok::Rarrow, self.location + 1)));`
	`440`	`+ }`
`436`	`441`	`_ => return Some(Ok((tok_start, Tok::Minus, self.location + 1))),`
`437`	`442`	`}`
`438`	`443`	`}`