[lexer: single-line-comment] Fix bug when single line comment is last…

… line of file (boa-dev#228)
croraf · Jan 20, 2020 · 496c8fe · 496c8fe
1 parent 1328f49
commit 496c8fe
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/lib/syntax/lexer.rs b/src/lib/syntax/lexer.rs
@@ -154,7 +154,11 @@ impl<'a> Lexer<'a> {
     fn read_line(&mut self) -> Result<String, LexerError> {
         let mut buf = String::new();
         while self.preview_next().is_some() {
+<<<<<<< HEAD
             let ch = self.next();
+=======
+            let ch = self.next()?;
+>>>>>>> [lexer: single-line-comment] Fix bug when single line comment is last line of file  (#228)
             match ch {
                 _ if ch.is_ascii_control() => {
                     break;