From 2c3b5f24877079532f49fc67469e7bdecf229574 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Fri, 27 Dec 2019 20:38:14 +0100 Subject: [PATCH] updated resource folder location --- .../brainfuck/interpreter/BfInterpreter.java | 127 +----------------- .../brainfuck/interpreter/Controller.java | 1 + src/main/{java => }/resources/art.bf | 0 src/main/{java => }/resources/chess.bf | 0 .../{java => }/resources/christmastree.bf | 0 .../{java => }/resources/fxml/layout.fxml | 0 .../{java => }/resources/mandelbrot-tiny.bf | 0 .../resources/mandelbrot-titanic.bf | 0 src/main/{java => }/resources/math/collatz.bf | 0 9 files changed, 2 insertions(+), 126 deletions(-) rename src/main/{java => }/resources/art.bf (100%) rename src/main/{java => }/resources/chess.bf (100%) rename src/main/{java => }/resources/christmastree.bf (100%) rename src/main/{java => }/resources/fxml/layout.fxml (100%) rename src/main/{java => }/resources/mandelbrot-tiny.bf (100%) rename src/main/{java => }/resources/mandelbrot-titanic.bf (100%) rename src/main/{java => }/resources/math/collatz.bf (100%) diff --git a/src/main/java/brainfuck/interpreter/BfInterpreter.java b/src/main/java/brainfuck/interpreter/BfInterpreter.java index b302bd7..1e94fcd 100644 --- a/src/main/java/brainfuck/interpreter/BfInterpreter.java +++ b/src/main/java/brainfuck/interpreter/BfInterpreter.java @@ -35,7 +35,7 @@ public class BfInterpreter { public void setCodeFromFile(String fileName) throws IOException, NullPointerException { String res = ""; - FileInputStream fis = new FileInputStream("src/main/java/resources/" + fileName); + FileInputStream fis = new FileInputStream(fileName); code = IOUtils.toString(fis, "UTF-8"); // System.out.println("code is: " + code); @@ -104,129 +104,4 @@ public class BfInterpreter { } - public void interpretAgain(String code) { - final int LENGTH = 65535; - byte[] mem = new byte[LENGTH]; - int dataPointer = 0; - int l = 0; - for (int i = 0; i < code.length(); i++) { - if (code.charAt(i) == '>') { - dataPointer = (dataPointer == LENGTH - 1) ? 0 : dataPointer + 1; - } else if (code.charAt(i) == '<') { - dataPointer = (dataPointer == 0) ? LENGTH - 1 : dataPointer - 1; - } else if (code.charAt(i) == '+') { - mem[dataPointer]++; - } else if (code.charAt(i) == '-') { - mem[dataPointer]--; - } else if (code.charAt(i) == '.') { - System.out.print((char) mem[dataPointer]); - } else if (code.charAt(i) == ',') { - mem[dataPointer] = (byte) sc.next().charAt(0); - } else if (code.charAt(i) == '[') { - if (mem[dataPointer] == 0) { - i++; - while (l > 0 || code.charAt(i) != ']') { - if (code.charAt(i) == '[') - l++; - if (code.charAt(i) == ']') - l--; - i++; - } - } - } else if (code.charAt(i) == ']') { - if (mem[dataPointer] != 0) { - i--; - while (l > 0 || code.charAt(i) != '[') { - if (code.charAt(i) == ']') - l++; - if (code.charAt(i) == '[') - l--; - i--; - } - i--; - } - } - } - } - - @Deprecated - public void interpretSwitch() { - int pointer = 0; - int c = 0; - for (int i = 0; i < codeArray.length; i++) { - - switch (this.codeArray[i]) { - case '+': - memory[pointer]++; - break; - case '-': - memory[pointer]--; - break; - case '>': - pointer++; - break; - case '<': - pointer--; - break; - case '.': - System.out.print(String.valueOf((char) memory[pointer])); - break; - case ',': - memory[pointer] = sc.next().trim().getBytes()[0]; - break; - case '[': - - if (memory[pointer] == 0) { - i++; - while (c > 0 || this.codeArray[i] != ']') { - if (this.codeArray[i] == '[') { - c++; - } else if (this.codeArray[i] == ']') { - c--; - } - i++; - } - } - // int endLoopPos = i; - // // search for next ']' - // while (code[endLoopPos] != ']') { - // // keep incrementing until end of loop is found - // endLoopPos++; - // } - // if (memory[pointer] == 0) { - // i = endLoopPos + 1; - // } - break; - case ']': - - if (memory[pointer] != 0) { - i--; - while (c > 0 || this.codeArray[i] == '[') { - if (this.codeArray[i] == ']') { - c++; - } else if (this.codeArray[i] == '[') { - c--; - } - i--; - } - i--; - } - // int beginLoopPos = i; - // // search for previous '[' - // while (code[beginLoopPos] != '[') { - // // keep decrementing until begin of loop is found - // beginLoopPos--; - // } - - // if (memory[pointer] != 0) { - // i = beginLoopPos; - // } - break; - - default: - break; - } - } - } - } \ No newline at end of file diff --git a/src/main/java/brainfuck/interpreter/Controller.java b/src/main/java/brainfuck/interpreter/Controller.java index 0899533..27f1007 100644 --- a/src/main/java/brainfuck/interpreter/Controller.java +++ b/src/main/java/brainfuck/interpreter/Controller.java @@ -1,4 +1,5 @@ package brainfuck.interpreter; public class Controller { + } diff --git a/src/main/java/resources/art.bf b/src/main/resources/art.bf similarity index 100% rename from src/main/java/resources/art.bf rename to src/main/resources/art.bf diff --git a/src/main/java/resources/chess.bf b/src/main/resources/chess.bf similarity index 100% rename from src/main/java/resources/chess.bf rename to src/main/resources/chess.bf diff --git a/src/main/java/resources/christmastree.bf b/src/main/resources/christmastree.bf similarity index 100% rename from src/main/java/resources/christmastree.bf rename to src/main/resources/christmastree.bf diff --git a/src/main/java/resources/fxml/layout.fxml b/src/main/resources/fxml/layout.fxml similarity index 100% rename from src/main/java/resources/fxml/layout.fxml rename to src/main/resources/fxml/layout.fxml diff --git a/src/main/java/resources/mandelbrot-tiny.bf b/src/main/resources/mandelbrot-tiny.bf similarity index 100% rename from src/main/java/resources/mandelbrot-tiny.bf rename to src/main/resources/mandelbrot-tiny.bf diff --git a/src/main/java/resources/mandelbrot-titanic.bf b/src/main/resources/mandelbrot-titanic.bf similarity index 100% rename from src/main/java/resources/mandelbrot-titanic.bf rename to src/main/resources/mandelbrot-titanic.bf diff --git a/src/main/java/resources/math/collatz.bf b/src/main/resources/math/collatz.bf similarity index 100% rename from src/main/java/resources/math/collatz.bf rename to src/main/resources/math/collatz.bf