From 9598e4ff43a8fd4bc2aa2af75ff1094c2ef96258 Mon Sep 17 00:00:00 2001
From: NanoTech
Date: Wed, 7 Dec 2016 18:11:05 -0600
Subject: Reference input strings without copying

---
 src/lexer.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/lexer.rs')

diff --git a/src/lexer.rs b/src/lexer.rs
index beb3b83..ca181ce 100644
--- a/src/lexer.rs
+++ b/src/lexer.rs
@@ -2,6 +2,8 @@ use nom;
 
 use core::Const;
 
+use std::borrow::Cow;
+
 #[derive(Debug, PartialEq, Eq)]
 pub enum Keyword {
     Let,
@@ -40,8 +42,8 @@ pub enum Builtin {
 }
 
 #[derive(Debug, PartialEq, Eq)]
-pub enum Tok {
-    Identifier(String),
+pub enum Tok<'i> {
+    Identifier(Cow<'i, str>),
     Keyword(Keyword),
     Builtin(Builtin),
     ListLike(ListLike),
@@ -258,7 +260,7 @@ named!(token<&str, Tok>, alt!(
     map!(list_like, Tok::ListLike) |
     map!(natural, Tok::Natural) |
     map!(integer, Tok::Integer) |
-    map!(identifier, |s: &str| Tok::Identifier(s.to_owned())) |
+    map!(identifier, |s| Tok::Identifier(Cow::Borrowed(s))) |
     map!(string_lit, Tok::Text) |
 
     value!(Tok::BraceL, tag!("{")) |
@@ -334,7 +336,7 @@ impl<'input> Lexer<'input> {
 }
 
 impl<'input> Iterator for Lexer<'input> {
-    type Item = Spanned<Tok, usize, LexicalError>;
+    type Item = Spanned<Tok<'input>, usize, LexicalError>;
 
     fn next(&mut self) -> Option<Self::Item> {
         use nom::IResult::*;
@@ -369,12 +371,12 @@ fn test_lex() {
     let s = "λ(b : Bool) → b == False";
     let expected = [Lambda,
                     ParenL,
-                    Identifier("b".to_owned()),
+                    Identifier(Cow::Borrowed("b")),
                     Ascription,
                     Builtin(self::Builtin::Bool),
                     ParenR,
                     Arrow,
-                    Identifier("b".to_owned()),
+                    Identifier(Cow::Borrowed("b")),
                     CompareEQ,
                     Bool(false)];
     let lexer = Lexer::new(s);
-- 
cgit v1.2.3