2 files changed, 4 insertions, 3 deletions
diff --git a/src/lang/parser.rs b/src/lang/parser.rs
index d068b07..5264554 100644
--- a/src/lang/parser.rs
+++ b/src/lang/parser.rs
@@ -169,7 +169,7 @@ impl<T: Iterator<Item=char>> Parser<T> {
         };
 
         let tp = self.token.to_type();
-        self.expect(tp);
+        self.expect(tp)?;
         ret
     }
 }
diff --git a/src/lang/tokenizer.rs b/src/lang/tokenizer.rs
index 4f2858c..9b408d2 100644
--- a/src/lang/tokenizer.rs
+++ b/src/lang/tokenizer.rs
@@ -2,6 +2,7 @@ use std::collections::HashMap;
 use std::error::Error;
 use std::fmt;
 use super::*;
+use unicode_xid::UnicodeXID;
 
 pub struct Lexemes {
     radix_point: char,
@@ -368,7 +369,7 @@ impl<T: Iterator<Item=char>> Tokenizer<T> {
         }
 
         /* Identifiers */
-        if cc.is_xid_start() {
+        if UnicodeXID::is_xid_start(cc) {
             let mut buffer = String::new();
             buffer.push(cc);
 
@@ -379,7 +380,7 @@ impl<T: Iterator<Item=char>> Tokenizer<T> {
                 }
                 let ncc = nc.unwrap();
 
-                if ncc.is_xid_continue() {
+                if UnicodeXID::is_xid_continue(ncc) {
                     buffer.push(ncc);
                 } else {
                     self.push_back(ncc);