From 255b744217526e13b9b514b17c342ebd2ae661f3 Mon Sep 17 00:00:00 2001
From: Windel Bouwman <windel@windel.nl>
Date: Sun, 21 Jul 2019 22:11:37 +0200
Subject: [PATCH] Minor tweak on lexer to fix the REPL.

---
 parser/src/lexer.rs | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/parser/src/lexer.rs b/parser/src/lexer.rs
index edf5e219f..2cd114865 100644
--- a/parser/src/lexer.rs
+++ b/parser/src/lexer.rs
@@ -636,6 +636,22 @@ where
         }
     }
 
+    /// This is the main entry point. Call this function to retrieve the next token.
+    /// This function is used by the iterator implementation.
+    fn inner_next(&mut self) -> LexResult {
+        // top loop, keep on processing, until we have something pending.
+        while self.pending.is_empty() {
+            // Detect indentation levels
+            if self.at_begin_of_line {
+                self.handle_indentations()?;
+            }
+
+            self.consume_normal()?;
+        }
+
+        Ok(self.pending.remove(0))
+    }
+
     /// Given we are at the start of a line, count the number of spaces and/or tabs until the first character.
     fn eat_indentation(&mut self) -> Result<IndentationLevel, LexicalError> {
         // Determine indentation:
@@ -684,7 +700,11 @@ where
                     spaces = 0;
                     tabs = 0;
                 }
+                None => {
+                    break;
+                }
                 _ => {
+                    self.at_begin_of_line = false;
                     break;
                 }
             }
@@ -693,23 +713,6 @@ where
         Ok(IndentationLevel { spaces, tabs })
     }
 
-    /// This is the main entry point. Call this function to retrieve the next token.
-    /// This function is used by the iterator implementation.
-    fn inner_next(&mut self) -> LexResult {
-        // top loop, keep on processing, until we have something pending.
-        while self.pending.is_empty() {
-            // Detect indentation levels
-            if self.at_begin_of_line {
-                self.at_begin_of_line = false;
-                self.handle_indentations()?;
-            }
-
-            self.consume_normal()?;
-        }
-
-        Ok(self.pending.remove(0))
-    }
-
     fn handle_indentations(&mut self) -> Result<(), LexicalError> {
         let indentation_level = self.eat_indentation()?;
 
@@ -756,7 +759,7 @@ where
                                     location: self.get_pos(),
                                 });
                             }
-                        };
+                        }
                     }
                 }
             }
@@ -1456,7 +1459,6 @@ mod tests {
                         Tok::Int { value: BigInt::from(99) },
                         Tok::Newline,
                         Tok::Dedent,
-                        Tok::Newline,
                     ]
                 );
             }
@@ -1501,7 +1503,6 @@ mod tests {
                         Tok::Newline,
                         Tok::Dedent,
                         Tok::Dedent,
-                        Tok::Newline,
                     ]
                 );
             }
@@ -1540,7 +1541,6 @@ mod tests {
                         Tok::Newline,
                         Tok::Dedent,
                         Tok::Dedent,
-                        Tok::Newline,
                     ]
                 );
             }
@@ -1580,7 +1580,6 @@ mod tests {
                         Tok::Int { value: BigInt::from(2) },
                         Tok::Rsqb,
                         Tok::Newline,
-                        Tok::Newline,
                     ]
                 );
             }