Merge pull request #13 from rensatopc/main

Add Command "clear" & "cls"

Author: 梶塚太智

.gitignore

@@ -11,6 +11,4 @@ Cargo.lock
 **/*.rs.bk
 
 # MSVC Windows builds of rustc generate these, which store debugging information
-*.pdb
-
-hidden/
+*.pdb

Cargo.toml

@@ -12,4 +12,5 @@ regex = "0.1"
 reqwest = { version = "0.11.0", features = ["blocking"] }
 rodio = "0.17.3"
 sys-info = "0.7.0"
-clap = "3.0"
+clap = "3.0"
+clearscreen = "2.0.1"

README.md

@@ -7,6 +7,8 @@ The powerful script language designed with a stack oriented approach for efficie
 
 ### If you don't want to install...
 
+**Launching Stack needs cargo!**
+
 ```bash
 git clone https://github.com/Stack-Programing-Community/Stack-Programing-Language.git
 cd Stack-Programing-Language

src/main.rs

@@ -335,6 +335,8 @@ 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
+                self.stack
+                    .push(Type::String(token[1..token.len() - 1].to_string()));
                 let string = {
                     let mut buffer = String::new(); // Temporary storage
                     let mut brackets = 0; // String's nest structure
@@ -380,6 +382,12 @@ impl Executor {
                                             'r' => buffer.push_str("\\r"),
                                             _ => buffer.push(c),
                                         }
+                                        buffer.push(match c {
+                                            'n' => '\n',
+                                            't' => '\t',
+                                            'r' => '\r',
+                                            _ => c,
+                                        })
                                     } else {
                                         buffer.push(c);
                                     }
@@ -396,6 +404,8 @@ impl Executor {
                     buffer
                 };
                 self.stack.push(Type::String(string));
+                self.stack
+                    .push(Type::String(token[1..token.len() - 1].to_string()));
             } else if chars[0] == '[' && chars[chars.len() - 1] == ']' {
                 // Push list value on the stack
                 let old_len = self.stack.len(); // length of old stack
@@ -700,15 +710,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}");
                 }
             }
 
@@ -868,7 +873,6 @@ impl Executor {
                         return;
                     }
                 }
-
                 self.log_print(String::from("Error! item not found in the list\n"));
                 self.stack.push(Type::Error(String::from("item-not-found")));
             }
@@ -1378,11 +1382,28 @@ impl Executor {
                 })
             }
 
+            "cls" => {
+                self.clearscreen();
+            }
+
+            "clear" => {
+                self.clearscreen();
+            }
+
             // If it is not recognized as a command, use it as a string.
             _ => self.stack.push(Type::String(command)),
         }
     }
 
+    fn clearscreen(&mut self) {
+        let result = clearscreen::clear();
+        if result.is_err() {
+            println!("Error! Failed to clear screen");
+            self.stack
+                .push(Type::Error(String::from("failed-to-clear-screen")));
+        }
+    }
+
     /// Pop stack's top value
     fn pop_stack(&mut self) -> Type {
         if let Some(value) = self.stack.pop() {