Use while-match construct instead of loop in skip_whitespace

chr4 · Dec 12, 2016 · d3f3b5d · d3f3b5d
1 parent 3f6afc2
commit d3f3b5d
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/lexer.rs b/src/lexer.rs
@@ -93,15 +93,11 @@ impl<'a> Lexer<'a> {
 
     fn skip_whitespace(&mut self) {
         // Loop read_char() until non-whitespace is found
-        loop {
+        while match self.ch {
-            match self.ch {
+            Some(ch) => ch.is_whitespace(),
-                Some(' ') => self.read_char(),
+            _ => false,
-                Some('\t') => self.read_char(),
+        } {
-                Some('\n') => self.read_char(),
+            self.read_char();
-                Some('\r') => self.read_char(),
-                Some(_) => return,
-                None => return, // EOF is handled by caller
-            }
         }
     }