Faff about with some tests

Author: ararslan

rust/main.rs

@@ -1,4 +1,5 @@
-use std::io::{Read, Write};
+use std::fs::File;
+use std::io::{Read, Write, BufReader};
 
 fn parse_instructions(code: String) -> Vec<char> {
     let mut instructions = Vec::new();
@@ -34,6 +35,7 @@ fn evaluate(instructions: Vec<char>) {
     let mut tape = vec![0x00];
     let mut ins_ptr = 0; // instruction pointer: index in `instructions` of current instruction
     let mut mem_ptr = 0; // memory pointer: index in `tape` of current memory cell
+    let mut input = std::io::stdin().bytes();
     while ins_ptr != instructions.len() - 1 {
         match instructions[ins_ptr] {
             '-' => {
@@ -52,11 +54,8 @@ fn evaluate(instructions: Vec<char>) {
                 tape[mem_ptr] -= 0x01;
             },
             '?' => {
-                let input: Option<u8> = std::io::stdin().bytes()
-                                                        .next()
-                                                        .and_then(|r| r.ok())
-                                                        .map(|b| b as u8);
-                tape[mem_ptr] = input.unwrap_or(0x00);
+                let next_from_stdin = input.next().and_then(|r| r.ok()).map(|b| b as u8);
+                tape[mem_ptr] = next_from_stdin.unwrap_or(0x00);
             },
             '!' => {
                 print!("{}", tape[mem_ptr] as char);
@@ -97,8 +96,10 @@ fn evaluate(instructions: Vec<char>) {
 }
 
 fn main() {
-    // Just a test, doesn't seem to be working just yet
-    let code = "\"?'\"........'\",;;....\";.;.;.;..;...\"-'\";,\";;;.;.;.'\"-'\"--\";;;;.;....;!;,,,!.......!!'\",;.;.--'\";...!---!--!;;;;....'\",-....;'\"-,!;;!...!;!,,,,,,,,!-----!".to_string();
+    let file = File::open("test/helloworld.qqq").unwrap();
+    let mut buf_reader = BufReader::new(file);
+    let mut code = String::new();
+    buf_reader.read_to_string(&mut code);
     let instr = parse_instructions(code);
     evaluate(instr);
 }