fix: another LC-bug, it does not handle backward case correctly

KisaragiEffective · Oct 22, 2023 · cc336a8 · cc336a8
1 parent 3f4664b
commit cc336a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/package/origlang-compiler/src/lexer.rs b/package/origlang-compiler/src/lexer.rs
@@ -386,11 +386,12 @@ impl Lexer<'_> {
             self.set_line(NonZeroUsize::new(new_line).expect("overflow"));
             self.set_column(NonZeroUsize::new(new_col).expect("overflow"));
         } else {
+            // THIS BRANCH IS IMPORTANT!!! OTHERWISE, RESET OPERATION WILL NOT WORK!!!
             // back
             let new_line = current_line - src[new..old].bytes().filter(|x| *x == b'\n').count();
             let new_col = src[new..old].find('\n').map_or_else(|| {
-                let mut c = self.column.get().get();
-                c += old - new;
+                let mut c = self.column().get();
+                c -= old - new;
 
                 c
             }, |new_relative| {

diff --git a/package/origlang-compiler/src/lexer/token.rs b/package/origlang-compiler/src/lexer/token.rs
@@ -1,3 +1,4 @@
+use std::num::NonZeroUsize;
 use origlang_ast::{Comment, Identifier};
 use crate::chars::boundary::Utf8CharBoundaryStartByte;
 use crate::lexer::Lexer;
@@ -16,7 +17,7 @@ impl TemporalLexerUnwindToken {
     }
 
     pub fn reset(self, lexer: &Lexer) {
-        lexer.source_bytes_nth.set(self.unwind_index);
+        lexer.set_current_index(self.unwind_index).expect("Error during reset");
     }
 }