git

	modified:   src/main.rs

Author: thejustcube

src/main.rs

@@ -244,47 +244,44 @@ impl Executor {
 
         let mut syntax = Vec::new(); // Token string
         let mut buffer = String::new(); // Temporary storage
-        let mut brackets = 0; // String's nest structure
-        let mut parentheses = 0; // List's nest structure
-        let mut hash = false; // Is it Comment
-        let mut escape = false; // Flag to indicate next character is escaped
+        let mut in_brackets = 0; // String's nest structure
+        let mut in_parentheses = 0; // List's nest structure
+        let mut in_hash = false; // Is it Comment
 
         for c in code.chars() {
             match c {
-                '\\' if !escape => {
-                    escape = true;
-                }
-                '(' if !hash && !escape => {
-                    brackets += 1;
+                '(' => {
+                    in_brackets += 1;
                     buffer.push('(');
                 }
-                ')' if !hash && !escape => {
-                    brackets -= 1;
+                ')' => {
+                    in_brackets -= 1;
                     buffer.push(')');
                 }
-                '#' if !hash && !escape => {
-                    hash = true;
+                '#' if !in_hash => {
+                    in_hash = true;
                     buffer.push('#');
                 }
-                '#' if hash && !escape => {
-                    hash = false;
+                '#' if in_hash => {
+                    in_hash = false;
                     buffer.push('#');
                 }
-                '[' if !hash && brackets == 0 && !escape => {
-                    parentheses += 1;
+                '[' if in_brackets == 0 => {
+                    in_parentheses += 1;
                     buffer.push('[');
                 }
-                ']' if !hash && brackets == 0 && !escape => {
-                    parentheses -= 1;
+                ']' if in_brackets == 0 => {
+                    in_parentheses -= 1;
                     buffer.push(']');
                 }
-                ' ' if !hash && parentheses == 0 && brackets == 0 && !escape => {
+                ' ' if !in_hash && in_parentheses == 0 && in_brackets == 0 => {
                     if !buffer.is_empty() {
                         syntax.push(buffer.clone());
                         buffer.clear();
                     }
                 }
                 _ => {
+<<<<<<< HEAD
                     if parentheses == 0 && brackets == 0 && !hash {
                         if escape {
 <<<<<<< HEAD
@@ -318,6 +315,9 @@ impl Executor {
                         buffer.push(c);
                     }
                     escape = false; // Reset escape flag for non-escape characters
+=======
+                    buffer.push(c);
+>>>>>>> 76e82be (git)
                 }
             }
         }
@@ -350,6 +350,7 @@ impl Executor {
                 self.stack.push(Type::Bool(token.parse().unwrap_or(true)));
             } else if chars[0] == '(' && chars[chars.len() - 1] == ')' {
                 // Push string value on the stack
+<<<<<<< HEAD
                 let string = {
                     let mut buffer = String::new(); // Temporary storage
                     let mut brackets = 0; // String's nest structure
@@ -426,6 +427,10 @@ impl Executor {
                     buffer
                 };
                 self.stack.push(Type::String(string));
+=======
+                self.stack
+                    .push(Type::String(token[1..token.len() - 1].to_string()));
+>>>>>>> 76e82be (git)
             } else if chars[0] == '[' && chars[chars.len() - 1] == ']' {
                 // Push list value on the stack
                 let old_len = self.stack.len(); // length of old stack
@@ -730,15 +735,10 @@ impl Executor {
             // Standard output
             "print" => {
                 let a = self.pop_stack().get_string();
-
-                let a = a.replace("\\n", "\n");
-                let a = a.replace("\\t", "\t");
-                let a = a.replace("\\r", "\r");
-
                 if let Mode::Debug = self.mode {
                     println!("[Output]: {a}");
                 } else {
-                    print!("{a}");
+                    println!("{a}");
                 }
             }
 
@@ -902,6 +902,7 @@ impl Executor {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> cdb5350 (git)
 
@@ -919,6 +920,10 @@ impl Executor {
 >>>>>>> 0c174e6 (Update main.rs)
 =======
 >>>>>>> cdb5350 (git)
+=======
+
+                self.log_print(String::from("Error! item not found in the list\n"));
+>>>>>>> 76e82be (git)
                 self.stack.push(Type::Error(String::from("item-not-found")));
             }
 
@@ -1431,6 +1436,7 @@ impl Executor {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 <<<<<<< HEAD
@@ -1453,6 +1459,8 @@ impl Executor {
 >>>>>>> ce80cb2 (git)
 >>>>>>> 74bbfe3 (git)
 >>>>>>> e1b0d54 (git)
+=======
+>>>>>>> 76e82be (git)
             "index" => {
                 let findhint = self.pop_stack().get_string();
                 let findtarget = self.pop_stack().get_list();
@@ -1480,6 +1488,7 @@ impl Executor {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> cdb5350 (git)
 =======
@@ -1508,6 +1517,8 @@ impl Executor {
 >>>>>>> cdb5350 (git)
 =======
 >>>>>>> e1b0d54 (git)
+=======
+>>>>>>> 76e82be (git)
             // If it is not recognized as a command, use it as a string.
             _ => self.stack.push(Type::String(command)),
         }