From 1de2f2c5e0c13b0ff6704a426304ba13931732ce Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Mon, 10 Apr 2023 23:15:33 +0200
Subject: [PATCH] move print to buffer, remove useless print

---
 src/buffer.rs | 20 ++++++++++++++++----
 src/main.rs   | 23 ++++-------------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/buffer.rs b/src/buffer.rs
index 2b3c468..6932f99 100644
--- a/src/buffer.rs
+++ b/src/buffer.rs
@@ -1,3 +1,4 @@
+use crate::enums::Address;
 use std::io;
 
 pub struct Buffer {
@@ -17,21 +18,32 @@ impl Buffer {
     }
 
     // Return the actual line of the buffer
-    pub fn act(&self) -> usize {
+    pub fn line(&self) -> usize {
         self.current_line
     }
 
     // change la ligne actuelle
-    pub fn change_act(&mut self, new: usize) {
+    pub fn change_line(&mut self, new: usize) {
         // TODO check si > len
         self.current_line = new;
     }
 
+    pub fn print(&mut self, addr: Address, print_numbers: bool) {
+        match addr {
+            Address::Actual => self.print_line(self.current_line, print_numbers),
+            Address::Line(l) => self.print_line(l.saturating_sub(1), print_numbers),
+            Address::Null => println!("nul !"),
+            _ => println!("coucou2"),
+        }
+    }
+
     // affiche une ligne
-    pub fn print_line(&self, nb: usize, print_numbers: bool) {
+    fn print_line(&mut self, nb: usize, print_numbers: bool) {
         if  nb >= self.buffer.len() {
             println!("?");
         } else if let Ok(line) = &self.buffer[nb] {
+            self.current_line = nb;
+
             if print_numbers {
                 println!("{}\t{}", nb + 1, line);
             } else {
@@ -43,7 +55,7 @@ impl Buffer {
     }
 
     // affiche plusieurs lignes
-    pub fn print_range(&self, first: usize, last: usize, print_numbers: bool) {
+    fn print_range(&mut self, first: usize, last: usize, print_numbers: bool) {
         for i in first..last {
             self.print_line(i, print_numbers);
         }
diff --git a/src/main.rs b/src/main.rs
index 6af5239..88311dd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -67,23 +67,14 @@ fn check_address_complete(c: char) -> bool {
     check_address(c) || c == ','
 }
 
-fn print(buffer: &Buffer, addr: Address, print_numbers: bool) {
-    match addr {
-        Address::Actual => buffer.print_line(buffer.act(), print_numbers),
-        Address::Null => println!("nul !"),
-        _ => println!("coucou2"),
-    }
-}
-
 fn execute_command(buffer: &mut Buffer, c: Command) -> bool {
-    println!("coucou {:?}", c);
     let mut ret = false;
 
     match c {
-        Command::Print(a) => print(buffer, a, false),
-        Command::Number(a) => print(buffer, a, true),
+        Command::Print(a) => buffer.print(a, false),
+        Command::Number(a) => buffer.print(a, true),
         Command::Quit(_) => ret = true,
-        _ => println!("coucou"),
+        _ => (),
     }
 
     ret
@@ -96,14 +87,8 @@ fn parse_line(input: &str) -> Result<Command, String> {
     //if let Ok((input, (a, c))) = alt(address, command).parse(input) {
     let tmp = (address, command).parse(input);
     if let Ok((input, (a, c))) = tmp {
-        println!("Ok");
-        //println!("{:?} - {:?} - {:?}", input, a, c);
         let addr = parse_address(a);
         Ok(parse_command(c, addr))
-    } else if let Err(Error(("bc", ErrorKind::OneOf))) = tmp {
-        //println!("{:?}", e);
-        println!("?");
-        Err(String::from("bruh moment"))
     } else if let Err(Error((_, t))) = tmp {
         println!("?");
         Err(String::from("bruh moment"))
@@ -136,7 +121,7 @@ fn main() {
                         quit = true;
                     }
                 } else {
-                    println!("coucou");
+                    //println!("coucou");
                 }
             },
             Err(e) => println!("error"),