Merge pull request #87 from FredTheDino/conflict-markers

Detect conflict markers

1 files changed, 12 insertions, 0 deletions

diff --git a/src/compiler.rs b/src/compiler.rs
index cd4ffda..124606e 100644
--- a/src/compiler.rs
+++ b/src/compiler.rs
@@ -473,6 +473,18 @@ impl Compiler {
     fn eat(&mut self) -> Token {
         let t = self.peek();
         self.curr += 1;
+        match t {
+            Token::GitConflictBegin => {
+                self.curr -= 1;
+                let start = self.line();
+                self.curr += 1;
+                while !matches!(self.eat(), Token::GitConflictEnd) {}
+                self.panic = false;
+                self.error_on_line(ErrorKind::GitConflictError(start, self.line()), start, None);
+                self.panic = true;
+            }
+            _ => {}
+        }
         t
     }