diff --git a/devTools/javaSanityCheck/SanityCheck.jar b/devTools/javaSanityCheck/SanityCheck.jar
index c2041109e8ab397f6aff8e7bbcf1c19d495baa73..dfa5b22db1171f4165e79f260caad84987e22346 100644
Binary files a/devTools/javaSanityCheck/SanityCheck.jar and b/devTools/javaSanityCheck/SanityCheck.jar differ
diff --git a/devTools/javaSanityCheck/sources.zip b/devTools/javaSanityCheck/sources.zip
new file mode 100644
index 0000000000000000000000000000000000000000..92f59c1b2541717b32c51b197bb8d5c4997b9a2d
Binary files /dev/null and b/devTools/javaSanityCheck/sources.zip differ
diff --git a/devTools/javaSanityCheck/src/DisallowedTagException.java b/devTools/javaSanityCheck/src/DisallowedTagException.java
deleted file mode 100644
index 12d5dfb2974506d0b3a0be713f3b5cf7217944ba..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/DisallowedTagException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.arkerthan.sanityCheck;
-
-/**
- * @author Arkerthan
- */
-public class DisallowedTagException extends RuntimeException {
-
- public DisallowedTagException(String tag) {
- super(tag);
- }
-}
diff --git a/devTools/javaSanityCheck/src/Main.java b/devTools/javaSanityCheck/src/Main.java
deleted file mode 100644
index 1cf56950cc03c88d5ee3e6bf0bf0e82d26b628f3..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/Main.java
+++ /dev/null
@@ -1,331 +0,0 @@
-package org.arkerthan.sanityCheck;
-
-import org.arkerthan.sanityCheck.element.AngleBracketElement;
-import org.arkerthan.sanityCheck.element.CommentElement;
-import org.arkerthan.sanityCheck.element.Element;
-import org.arkerthan.sanityCheck.element.KnownElement;
-
-import java.io.*;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-
-/**
- * @author Arkerthan
- * @version 1.0
- */
-public class Main {
-
- public static TagSearchTree<Tag> htmlTags, twineTags;
- private static String currentFile;
- private static int currentLine, currentPosition;
- private static Stack<Element> stack;
- private static List<SyntaxError> errors = new LinkedList<>();
- private static String[] excluded;
-
- public static void main(String[] args) {
-
- //setup
- setupExclude();
- setupHtmlTags();
- setupTwineTags();
- Path workingDir = Paths.get("").toAbsolutePath();
-
- //actual sanityCheck
- runSanityCheckInDirectory(workingDir, new File("src/"));
-
- //output errors
- for (SyntaxError e :
- errors) {
- System.out.println(e.getError());
- }
- }
-
-
- /**
- * Goes through the whole directory including subdirectories and runs
- * {@link Main#sanityCheck(Path)} on all .tw files
- *
- * @param dir to be checked
- */
- private static void runSanityCheckInDirectory(Path workingDir, File dir) {
- //subdirectories are checked recursively
-
- try {
- for (File file : dir.listFiles()) {
- if (file.isFile()) { //run sanityCheck if file is a .tw file
- String path = file.getAbsolutePath();
- if (path.endsWith(".tw")) {
- sanityCheck(workingDir.relativize(file.toPath()));
- }
- } else if (file.isDirectory()) {
- runSanityCheckInDirectory(workingDir, file.getAbsoluteFile());
- }
- }
- } catch (NullPointerException e) {
- e.printStackTrace();
- System.err.println("Couldn't read directory " + currentFile);
- System.exit(-1);
- }
- }
-
- /**
- * Runs the sanity check for one file. Does not run if file is excluded.
- *
- * @param path file to be checked
- */
- private static void sanityCheck(Path path) {
- File file = path.toFile();
-
- // replace this with a known encoding if possible
- Charset encoding = Charset.defaultCharset();
-
- if (!excluded(file.getPath())) {
- currentFile = file.getPath();
- currentLine = 1;
- stack = new Stack<>();
-
- //actually opening and reading the file
- try (InputStream in = new FileInputStream(file);
- Reader reader = new InputStreamReader(in, encoding);
- // buffer for efficiency
- Reader buffer = new BufferedReader(reader)) {
- handleCharacters(buffer);
- } catch (IOException e) {
- e.printStackTrace();
- System.err.println("Couldn't read " + file);
- }
- }
- }
-
- /**
- * sets up a {@link TagSearchTree<Tag>} for fast access of HTML tags later
- */
- private static void setupHtmlTags() {
- //load HTML tags into a list
- List<Tag> TagsList = loadTags("devTools/javaSanityCheck/htmlTags");
-
- //turn List into alphabetical search tree
- try {
- htmlTags = new TagSearchTree<>(TagsList);
- } catch (ArrayIndexOutOfBoundsException e) {
- System.err.println("Illegal Character in devTools/javaSanityCheck/htmlTags");
- System.exit(-1);
- }
- }
-
- /**
- * sets up a {@link TagSearchTree<Tag>} for fast access of twine tags later
- */
- private static void setupTwineTags() {
- //load twine tags into a list
- List tagsList = loadTags("devTools/javaSanityCheck/twineTags");
-
- //turn List into alphabetical search tree
- try {
- twineTags = new TagSearchTree<>(tagsList);
- } catch (ArrayIndexOutOfBoundsException e) {
- System.err.println("Illegal Character in devTools/javaSanityCheck/twineTags");
- System.exit(-1);
- }
- }
-
- /**
- * Loads a list of tags from a file
- *
- * @param filePath file to load tags from
- * @return loaded tags
- */
- private static List<Tag> loadTags(String filePath) {
- List<Tag> tagsList = new LinkedList<>();
- try {
- Files.lines(new File(filePath).toPath()).map(String::trim)
- .filter(s -> !s.startsWith("#"))
- .forEach(s -> tagsList.add(parseTag(s)));
- } catch (IOException e) {
- System.err.println("Couldn't read " + filePath);
- }
- return tagsList;
- }
-
- /**
- * Turns a string into a Tag
- * ";1" at the end of the String indicates that the tag needs to be closed later
- *
- * @param s tag as String
- * @return tag as Tag
- */
- private static Tag parseTag(String s) {
- String[] st = s.split(";");
- if (st.length > 1 && st[1].equals("1")) {
- return new Tag(st[0], false);
- }
- return new Tag(st[0], true);
- }
-
- /**
- * sets up the excluded files array.
- */
- private static void setupExclude() {
- //load excluded files
- List<String> excludedList = new ArrayList<>();
- try {
- Files.lines(new File("devTools/javaSanityCheck/excluded").toPath()).map(String::trim)
- .filter(s -> !s.startsWith("#"))
- .forEach(excludedList::add);
- } catch (IOException e) {
- System.err.println("Couldn't read devTools/javaSanityCheck/excluded");
- }
-
- //turn excluded files into an array and change path to windows style if needed
- if (isWindows()) {
- excluded = new String[excludedList.size()];
- int i = 0;
- for (String s :
- excludedList) {
- excluded[i++] = s.replaceAll("/", "\\\\");
- }
- } else {
- excluded = excludedList.toArray(new String[0]);
- }
- }
-
- /**
- * @return whether OS is Windows or not
- */
- private static boolean isWindows() {
- return (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows"));
- }
-
- /**
- * checks if a file or directory is excluded from the sanity check
- *
- * @param s file/directory to be checked
- * @return whether it is excluded or not
- */
- private static boolean excluded(String s) {
- for (String ex :
- excluded) {
- if (s.startsWith(ex)) return true;
- }
- return false;
- }
-
- /**
- * Reads the file character by character.
- *
- * @param reader reader that is read
- * @throws IOException thrown if the file can't be read
- */
- private static void handleCharacters(Reader reader) throws IOException {
- int r;
- while ((r = reader.read()) != -1) {
- char c = (char) r;
- handleCharacter(c);
- }
- }
-
- /**
- * Handles a single character
- *
- * @param c next character
- */
- private static void handleCharacter(char c) {
- //updating position
- currentPosition++;
- if (c == '\n') {
- currentLine++;
- currentPosition = 1;
- }
-
- //try applying to the innermost element
- if (!stack.empty()) {
- int change;
- try {
- change = stack.peek().handleChar(c);
- } catch (SyntaxError e) {
- change = e.getChange();
- addError(e);
- }
-
- //change greater 0 means the innermost element did some work
- if (change > 0) {
- //2 means the Element is complete
- if (change == 2) {
- //remove the topmost element from stack since it is complete
- stack.pop();
- return;
- }
- //3 means the Element is complete and part of a two or more tag system
- if (change == 3) {
- //remove the topmost element from stack since it is complete
- KnownElement k = stack.pop().getKnownElement();
- //if KnownElement k is closing another element, check if there is one and remove it
- if (k.isClosing()) {
- if (stack.empty()) { //there are no open elements at all
- addError(new SyntaxError("Closed tag " + k.getShortDescription() + " without " +
- "having any open tags.", -2));
- } else if (stack.peek() instanceof KnownElement) {
- //get opening tag
- KnownElement kFirst = (KnownElement) stack.pop();
- //check if closing element matches the opening element
- if (!kFirst.isMatchingElement(k)) {
- addError(new SyntaxError("Opening tag " + kFirst.getShortDescription() +
- " does not match closing tag " + k.getShortDescription() + ".", -2));
- }
- } else {
- //There closing tag inside another not Known element: <div </html>
- addError(new SyntaxError("Closing tag " + k.getShortDescription() + " inside " +
- "another tag " + stack.peek().getShortDescription() + " without opening first.",
- -2, true));
- }
- }
- //check if the element needs to be closed by another
- if (k.isOpening()) {
- stack.push(k);
- }
- return;
- }
- //means the element couldn't do anything with it and is finished
- if (change == 4) {
- stack.pop();
- } else {
- return;
- }
- }
- }
-
-
- //innermost element was uninterested, trying to find matching element
- switch (c) {
- //case '@':
- //stack.push(new AtElement(currentLine, currentPosition));
- //break;
- case '<':
- stack.push(new AngleBracketElement(currentLine, currentPosition));
- break;
- //case '>':
- //addError(new SyntaxError("Dangling \">\", current innermost: " + (stack.empty() ? "null" : stack.peek().getShortDescription()), -2));
- //break;
- case '/':
- stack.push(new CommentElement(currentLine, currentPosition));
- break;
- //case '(':
- //stack.push(new BracketElement(currentLine, currentPosition));
- }
- }
-
- /**
- * add an error to the error list
- *
- * @param e new error
- */
- private static void addError(SyntaxError e) {
- e.setFile(currentFile);
- e.setLine(currentLine);
- e.setPosition(currentPosition);
- errors.add(e);
- }
-}
diff --git a/devTools/javaSanityCheck/src/SyntaxError.java b/devTools/javaSanityCheck/src/SyntaxError.java
deleted file mode 100644
index ccb49ccf8882a8f10dbbf81e9d78128588d10c7c..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/SyntaxError.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.arkerthan.sanityCheck;
-
-/**
- * @author Arkerthan
- */
-public class SyntaxError extends Exception {
- private String file;
- private int line, position;
- private String description;
- private int change; //see Element for values; -2 means not thrown
- private boolean warning = false;
-
- /**
- * @param description description of error
- * @param change state change as specified in Element
- */
- public SyntaxError(String description, int change) {
- this.description = description;
- this.change = change;
- }
-
- /**
- * @param description description of error
- * @param change state change as specified in Element
- * @param warning whether it is a warning or an error
- */
- public SyntaxError(String description, int change, boolean warning) {
- this(description, change);
- this.warning = warning;
- }
-
- /**
- * @param file at which the error occurred
- */
- public void setFile(String file) {
- this.file = file;
- }
-
- /**
- * @param line in which the error occurred
- */
- public void setLine(int line) {
- this.line = line;
- }
-
- /**
- * @param position at which the error occurred
- */
- public void setPosition(int position) {
- this.position = position;
- }
-
- /**
- * @return error message
- */
- public String getError() {
- String s = warning ? "Warning: " : "Error: ";
- return s + file + ": " + line + ":" + position + " : " + description;
- }
-
- /**
- * @return change that happened in Element before it was thrown. -1 if not thrown.
- */
- public int getChange() {
- return change;
- }
-}
diff --git a/devTools/javaSanityCheck/src/Tag.java b/devTools/javaSanityCheck/src/Tag.java
deleted file mode 100644
index 025cef72c10fda5d3dbe3d45e2af1b907f6841df..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/Tag.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.arkerthan.sanityCheck;
-
-/**
- * @author Arkerthan
- */
-public class Tag {
- public final String tag;
- public final boolean single;
-
- public Tag(String tag, boolean single) {
- this.tag = tag;
- this.single = single;
- }
-}
diff --git a/devTools/javaSanityCheck/src/TagSearchTree.java b/devTools/javaSanityCheck/src/TagSearchTree.java
deleted file mode 100644
index 68165866594478e56b990f822d30edddacf14eef..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/TagSearchTree.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.arkerthan.sanityCheck;
-
-import java.util.List;
-
-/**
- * @param <E> Tag class to be stored
- * @author Arkerthan
- * <p>
- * Tag SearchTree stores Tags in an alphabetical search tree.
- * Once created the search tree can't be changed anymore.
- */
-public class TagSearchTree<E extends Tag> {
- private static final int SIZE = 128;
- private final TagSearchTree<E>[] branches;
- private E element = null;
- private String path;
-
- /**
- * creates a new empty TagSearchTree
- */
- private TagSearchTree() {
- branches = new TagSearchTree[SIZE];
- }
-
- /**
- * Creates a new filled TagSearchTree
- *
- * @param list Tags to be inserted
- */
- public TagSearchTree(List<E> list) {
- this();
- for (E e : list) {
- this.add(e, 0);
- }
- }
-
- /**
- * adds a new Tag to the TagSearchTree
- *
- * @param e Tag to be stored
- * @param index index of relevant char for adding in tag
- */
- private void add(E e, int index) {
- //set the path to here
- path = e.tag.substring(0, index);
- //checks if tag has to be stored here or further down
- if (e.tag.length() == index) {
- element = e;
- } else {
- //store tag in correct branch
- char c = e.tag.charAt(index);
- if (branches[c] == null) {
- branches[c] = new TagSearchTree<>();
- }
- branches[c].add(e, index + 1);
- }
- }
-
- /**
- * @param c character of branch needed
- * @return branch or null if branch doesn't exist
- */
- public TagSearchTree<E> getBranch(char c) {
- if (c >= SIZE) return null;
- return branches[c];
- }
-
- /**
- * @return stored Tag, null if empty
- */
- public E getElement() {
- return element;
- }
-
- /**
- * @return path inside full tree to get to this Branch
- */
- public String getPath() {
- return path;
- }
-}
diff --git a/devTools/javaSanityCheck/src/UnknownStateException.java b/devTools/javaSanityCheck/src/UnknownStateException.java
deleted file mode 100644
index 348a275e20141a6b0fdaefda4b667ca821d305cc..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/UnknownStateException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.arkerthan.sanityCheck;
-
-/**
- * @author Arkerthan
- */
-public class UnknownStateException extends RuntimeException {
-
- public UnknownStateException(int state) {
- super(String.valueOf(state));
- }
-}
diff --git a/devTools/javaSanityCheck/src/element/AngleBracketElement.java b/devTools/javaSanityCheck/src/element/AngleBracketElement.java
deleted file mode 100644
index 124c85954458795262dafd34d96de9064f3965b0..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/AngleBracketElement.java
+++ /dev/null
@@ -1,380 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-import org.arkerthan.sanityCheck.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author Arkerthan
- */
-public class AngleBracketElement extends Element {
- private static final List<String> logicTags = Arrays.asList("if", "elseif", "else", "switch", "case", "default");
- private int state = 0;
- /*
- 0 - initial: <
- TWINE
- 1 - <<
- -1 - <</
- 2 - trying to complete twine tag: <<tag ???>>
- -2 - trying to complete twine tag: <</tag>>
- 3 - waiting for >>
- -3 - expecting > from 3
- 4 - waiting for >> with KnownElement
- -4 - expecting > from 4
- 5 - expecting >>
- -5 - expecting >
- 6 - expecting > with KnownElement opening; comparison?
- -6 - expecting > with KnownElement closing
-
- HTML
- -9 - </
- 10 - trying to complete HTML tag: <tag ???>
- -10 - trying to complete HTML tag: </tag>
- 11 - waiting for >
- -11 - expecting >
- 12 - waiting for > with KnownElement
- */
-
- private TagSearchTree<Tag> tree;
-
- public AngleBracketElement(int line, int pos) {
- super(line, pos);
- }
-
- @Override
- public int handleChar(char c) throws SyntaxError {
- switch (state) {
- case 0:
- switch (c) {
- case '<':
- state = 1;
- return 1;
- case '/':
- state = -9;
- return 1;
- case '>':// empty <>
- case ' ':// assume comparison
- case '=':// " "
- case '3':// a heart: <3
- return 2;
- default:
- try {
- state = 10;
- tree = Main.htmlTags;
- return handleOpeningHTML(c);
- } catch (SyntaxError e) {
- state = 1;
- throw new SyntaxError("Opening \"<\" missing, found " + c, 1);
- }
- }
- case 1:
- if (c == '<') {
- throw new SyntaxError("Too many \"<\".", 1);
- } else if (c == '>') {
- state = 3;
- throw new SyntaxError("Empty Statement?", 1);
- } else if (c == '/') {
- state = -1;
- return 1;
- }
- state = 2;
- tree = Main.twineTags;
- return handleOpeningTwine(c);
- case -1:
- if (c == '>') {
- throw new SyntaxError("Empty Statement?", 2, true);
- }
- state = -2;
- tree = Main.twineTags;
- return handleClosingTwine(c);
-
- case 2:
- return handleOpeningTwine(c);
- case -2:
- return handleClosingTwine(c);
- case 3:
- if (c == '>') {
- state = -3;
- return 1;
- }
- break;
- case -3:
- if (c == '>') {
- return 2;
- } else if (c == ' ' || c == '=') { // assuming comparison
- state = 3;
- return 1;
- } else {
- throw new SyntaxError("Closing \">\" missing, opened tag at [" + line + ":" + pos + "]", 2);
- }
- case 4:
- if (c == '>') {
- state = -4;
- return 1;
- }
- break;
- case -4:
- if (c == '>') {
- return 3;
- } else if (c == ' ' || c == '=') { // assuming comparison
- state = 4;
- return 1;
- } else {
- throw new SyntaxError("Closing \">\" missing, opened tag at[" + line + ":" + pos + "]", 2);
- }
- case 5:
- if (c == '>') {
- state = -5;
- return 1;
- } else {
- throw new SyntaxError("Closing \">\" missing, opened tag at [" + line + ":" + pos + "]", 2);
- }
- case -5:
- if (c == '>') {
- return 2;
- }
- throw new SyntaxError("Closing \">\" missing, opened tag at [" + line + ":" + pos + "]", 2);
- case 6:
- if (c == '>') {
- return 3;
- } else if (c == ' ' || c == '=') {
- state = 3;
- return 1;
- } else {
- throw new SyntaxError("Closing \">\" missing, opened tag at [" + line + ":" + pos + "]", 3);
- }
- case -6:
- if (c == '>') {
- return 3;
- }
- throw new SyntaxError("Closing \">\" missing, opened tag at [" + line + ":" + pos + "]", 3);
-
- case -9:
- if (c == '>') {
- throw new SyntaxError("Empty Statement?", 2, true);
- }
- state = -10;
- tree = Main.htmlTags;
- return handleClosingHTML(c);
- case 10:
- return handleOpeningHTML(c);
- case -10:
- return handleClosingHTML(c);
- case 11:
- if (c == '>')
- return 2;
- if (c == '@') //@ inside HTML tags is allowed
- return 1;
- break;
- case -11:
- if (c == '>')
- return 2;
- throw new SyntaxError("Closing \">\" missing [2]", 2);
- case 12:
- if (c == '>')
- return 3;
- if (c == '@') //@ inside HTML tags is allowed
- return 1;
- break;
- default:
- throw new UnknownStateException(state);
- }
- return 0;
- }
-
- private int handleOpeningHTML(char c) throws SyntaxError {
- if (c == ' ') {
- state = 11;
- if (tree.getElement() == null) {
- throw new SyntaxError("Unknown HTML tag", 1);
- }
- if (!tree.getElement().single) {
- k = new KnownHtmlElement(line, pos, true, tree.getElement().tag);
- state = 12;
- return 1;
- }
- return 1;
- }
- if (c == '>') {
- if (tree.getElement() == null) {
- throw new SyntaxError("Unknown HTML tag", 2);
- }
- if (!tree.getElement().single) {
- k = new KnownHtmlElement(line, pos, true, tree.getElement().tag);
- return 3;
- }
- return 2;
- }
-
- tree = tree.getBranch(c);
- if (tree == null) {
- state = 11;
- throw new SyntaxError("Unknown HTML tag or closing \">\" missing, found " + c, 1);
- }
-
- return 1;
- }
-
- private int handleClosingHTML(char c) throws SyntaxError {
- if (c == '>') {
- if (tree.getElement() == null) {
- throw new SyntaxError("Unknown HTML tag: " + tree.getPath(), 2);
- }
- if (tree.getElement().single) {
- throw new SyntaxError("Single HTML tag used as closing Tag: " + tree.getElement().tag, 2);
- }
- k = new KnownHtmlElement(line, pos, false, tree.getElement().tag);
- return 3;
- }
-
- tree = tree.getBranch(c);
- if (tree == null) {
- state = -11;
- throw new SyntaxError("Unknown HTML tag or closing \">\" missing, found " + c, 1);
- }
-
- return 1;
- }
-
-
- private int handleOpeningTwine(char c) throws SyntaxError {
- if (c == ' ') {
- state = 3;
- if (tree.getElement() == null) {
- //assuming not listed means widget until better solution
- return 1;
- }
- if (!tree.getElement().single) {
- if (logicTags.contains(tree.getElement().tag)) {
- k = new KnownLogicElement(line, pos, tree.getElement().tag, false);
- } else {
- k = new KnownTwineElement(line, pos, true, tree.getElement().tag);
- }
- state = 4;
- return 1;
- }
- return 1;
- }
- if (c == '>') {
- state = -5;
- if (tree.getElement() == null) {
- //assuming not listed means widget until better solution
- return 1;
- }
- if (!tree.getElement().single) {
- if (logicTags.contains(tree.getElement().tag)) {
- k = new KnownLogicElement(line, pos, tree.getElement().tag, false);
- } else {
- k = new KnownTwineElement(line, pos, true, tree.getElement().tag);
- }
- state = 6;
- return 1;
- }
- return 2;
- }
-
- tree = tree.getBranch(c);
- if (tree == null) {
- //assuming not listed means widget until better solution
- state = 3;
- }
-
- return 1;
- }
-
- private int handleClosingTwine(char c) throws SyntaxError {
- if (c == '>') {
- if (tree.getElement() == null) {
- throw new SyntaxError("Unknown Twine tag: " + tree.getPath(), 2);
- }
- if (tree.getElement().single) {
- throw new SyntaxError("Single Twine tag used as closing Tag: " + tree.getElement().tag, 2);
- }
- if (logicTags.contains(tree.getElement().tag)) {
- k = new KnownLogicElement(line, pos, tree.getElement().tag, true);
- } else {
- k = new KnownTwineElement(line, pos, false, tree.getElement().tag);
- }
- state = -6;
- return 1;
- }
-
- tree = tree.getBranch(c);
- if (tree == null) {
- state = 3;
- throw new SyntaxError("Unknown Twine closing tag or closing \">>\" missing, found " + c, 1);
- }
-
- return 1;
- }
-
- @Override
- public String getShortDescription() {
- StringBuilder builder = new StringBuilder();
- builder.append(getPositionAsString()).append(" ");
- switch (state) {
- case 0:
- builder.append("<");
- break;
- //TWINE
- case 1:
- builder.append("<<");
- break;
- case -1:
- builder.append("<</");
- break;
- case 2:
- builder.append("<<").append(tree.getPath());
- break;
- case -2:
- builder.append("<</").append(tree.getPath());
- break;
- case 3:
- builder.append("<<???");
- break;
- case -3:
- builder.append("<<???>");
- break;
- case 4:
- builder.append("<<").append(tree.getPath()).append(" ???");
- break;
- case -4:
- builder.append("<<").append(tree.getPath()).append(" ???>");
- break;
- case 5:
- builder.append("<<???");
- break;
- case -5:
- builder.append("<<").append(tree == null ? "???" : tree.getPath()).append(">");
- break;
- case 6:
- builder.append("<<").append(tree.getPath()).append(" ???>");
- break;
- case -6:
- builder.append("<</").append(tree.getPath()).append(">");
- break;
- //HTML
- case -9:
- builder.append("</");
- break;
- case 10:
- builder.append("<").append(tree.getPath());
- break;
- case -10:
- builder.append("</").append(tree.getPath());
- break;
- case 11:
- builder.append("<?").append(tree == null ? "???" : tree.getPath());
- break;
- case -11:
- builder.append("</").append(tree == null ? "???" : tree.getPath());
- break;
- case 12:
- builder.append("<").append(tree.getPath()).append(" ???");
- default:
- throw new UnknownStateException(state);
- }
- return builder.toString();
- }
-}
diff --git a/devTools/javaSanityCheck/src/element/AtElement.java b/devTools/javaSanityCheck/src/element/AtElement.java
deleted file mode 100644
index f6e39a6ddce230dab16b42b52fbd14b054d20c52..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/AtElement.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-import org.arkerthan.sanityCheck.SyntaxError;
-import org.arkerthan.sanityCheck.UnknownStateException;
-
-/**
- * @author Arkerthan
- */
-public class AtElement extends Element {
- private int state = 0;
- // 0 = @
- // 1 = @@
- // 2 = @@.
- // 3 = @@.a -- @@.ab -- @@.abc
- // 4 = @@.abc;abc
- // 5 = @@.abc;abc@
-
- // example: @@.red;some text@@
-
- public AtElement(int line, int pos) {
- super(line, pos);
- }
-
- @Override
- public int handleChar(char c) throws SyntaxError {
- switch (state) {
- case 0:
- state = 1;
- if (c == '@') {
- return 1;
- } else {
- if (c == '.') {
- state = 2;
- }
- throw new SyntaxError("Opening \"@\" missing.", 1);
- }
- case 1:
- if (c == '.') {
- state = 2;
- return 1;
- } else {
- state = 4;
- throw new SyntaxError("\".\" missing, found \"" + c + "\". This might also indicate a " +
- "missing closure in the previous color code.", 0, true);
- }
- case 2:
- state = 3;
- if (Character.isAlphabetic(c)) {
- return 1;
- } else {
- throw new SyntaxError("Identifier might be wrong.", 1, true);
- }
- case 3:
- if (c == ';') {
- state = 4;
- return 1;
- } else if (c == ' ') {
- state = 4;
- throw new SyntaxError("\";\" missing or wrong space.", 1);
- }
- break;
- case 4:
- if (c == '@') {
- state = 5;
- return 1;
- }
- break;
- case 5:
- if (c == '@') {
- return 2;
- } else {
- throw new SyntaxError("Closing \"@\" missing.", 2);
- }
- default:
- throw new UnknownStateException(state);
- }
- return 0;
- }
-
- @Override
- public String getShortDescription() {
- StringBuilder builder = new StringBuilder();
- builder.append(getPositionAsString()).append(" ");
- switch (state) {
- case 0:
- builder.append("@");
- break;
- case 1:
- builder.append("@@");
- break;
- case 2:
- builder.append("@@.");
- break;
- case 3:
- builder.append("@@.???");
- break;
- case 4:
- builder.append("@@???");
- break;
- case 5:
- builder.append("@@???@");
- break;
- default:
- throw new UnknownStateException(state);
- }
- return builder.toString();
- }
-}
diff --git a/devTools/javaSanityCheck/src/element/BracketElement.java b/devTools/javaSanityCheck/src/element/BracketElement.java
deleted file mode 100644
index 89b0a67ef6a1e031fd4ae0e29808c9d11b8ce33e..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/BracketElement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-import org.arkerthan.sanityCheck.SyntaxError;
-
-/**
- * @author Arkerthan
- */
-public class BracketElement extends Element {
- //int state = 0;
-
- public BracketElement(int line, int pos) {
- super(line, pos);
- }
-
- @Override
- public int handleChar(char c) throws SyntaxError {
- if (c == ')') {
- return 2;
- } else {
- return 0;
- }
- }
-
- @Override
- public String getShortDescription() {
- return getPositionAsString() + " (???";
- }
-}
diff --git a/devTools/javaSanityCheck/src/element/CommentElement.java b/devTools/javaSanityCheck/src/element/CommentElement.java
deleted file mode 100644
index e18e74194320713de6c34379f087929d1665e672..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/CommentElement.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-import org.arkerthan.sanityCheck.SyntaxError;
-import org.arkerthan.sanityCheck.UnknownStateException;
-
-/**
- * @author Arkerthan
- */
-public class CommentElement extends Element {
- private int state = 0;
- /*
- 0 - /
- 1 - /*???
- 2 - /*???*
- 3 - /%???
- 4 - /%???%
- */
-
- /**
- * @param line line in which comment starts
- * @param pos position in line where comment starts
- */
- public CommentElement(int line, int pos) {
- super(line, pos);
- }
-
- @Override
- public int handleChar(char c) throws SyntaxError {
- switch (state) {
- case 0:
- if (c == '*') {
- state = 1;
- } else if (c == '%') {
- state = 3;
- } else if (c == '>') {
- throw new SyntaxError("XHTML style closure", 4, true);
- } else {
- return 4;
- }
- break;
- case 1:
- if (c == '*') {
- state = 2;
- }
- break;
- case 2:
- if (c == '/') {
- return 2;
- } else if (c == '*') {
- return 1;
- }
- state = 1;
- break;
- case 3:
- if (c == '%') {
- state = 4;
- }
- break;
- case 4:
- if (c == '/') {
- return 2;
- }
- state = 3;
- break;
- default:
- throw new UnknownStateException(state);
- }
- return 1;
- }
-
- @Override
- public String getShortDescription() {
- return getPositionAsString() + "comment";
- }
-}
diff --git a/devTools/javaSanityCheck/src/element/Element.java b/devTools/javaSanityCheck/src/element/Element.java
deleted file mode 100644
index 205f700362b56e4616f65f9b92d8961e6118663d..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/Element.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-import org.arkerthan.sanityCheck.SyntaxError;
-
-/**
- * @author Arkerthan
- */
-public abstract class Element {
- protected KnownElement k;
- protected int line, pos;
-
- /**
- * @param line Line the instance was created
- * @param pos Position in line the instance was created
- */
- protected Element(int line, int pos) {
- this.line = line;
- this.pos = pos;
- }
-
- /**
- * Parses a Char and returns an int depending on the state of the element
- * 0 - the Element did nothing
- * 1 - the Element changed state
- * 2 - the Element is finished
- * 3 - the Element is finished and a KnownHtmlElement was generated
- * 4 - the Element is finished and the char is still open for use
- *
- * @param c char to be parsed
- * @return state change
- * @throws SyntaxError thrown when an syntax error is detected
- */
- public abstract int handleChar(char c) throws SyntaxError;
-
- /**
- * @return the constructed KnownElement. null if none was constructed yet.
- */
- public KnownElement getKnownElement() {
- return k;
- }
-
- /**
- * Returns the line and position of the Element in the file it was created in.
- *
- * @return position of Element in file as String
- */
- public String getPositionAsString() {
- return "[" + line + ":" + pos + "]";
- }
-
- /**
- * @return a short description usually based on state and position of the Element
- */
- public abstract String getShortDescription();
-}
diff --git a/devTools/javaSanityCheck/src/element/KnownElement.java b/devTools/javaSanityCheck/src/element/KnownElement.java
deleted file mode 100644
index 709fc3891776e4b6cb0c4fef77590d20fea1b9a6..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/KnownElement.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-import org.arkerthan.sanityCheck.SyntaxError;
-
-/**
- * @author Arkerthan
- */
-public abstract class KnownElement extends Element {
-
- /**
- * @param line at which it begins
- * @param pos at which it begins
- */
- public KnownElement(int line, int pos) {
- super(line, pos);
- }
-
- /**
- * @return true, if it needs another Known Element to close it.
- */
- public abstract boolean isOpening();
-
- /**
- * @return true if it closes another Element.
- */
- public abstract boolean isClosing();
-
- /**
- * @param k Element to be checked
- * @return true if given Element closes Element
- */
- public abstract boolean isMatchingElement(KnownElement k);
-
- @Override
- public int handleChar(char c) throws SyntaxError {
- return 0;
- }
-}
diff --git a/devTools/javaSanityCheck/src/element/KnownHtmlElement.java b/devTools/javaSanityCheck/src/element/KnownHtmlElement.java
deleted file mode 100644
index d7c25299ba4ac3a8e3bed8638597bea2bb0edc30..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/KnownHtmlElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-/**
- * @author Arkerthan
- */
-public class KnownHtmlElement extends KnownElement {
-
- private boolean opening;
- private String statement;
-
- /**
- * @param line at which it begins
- * @param pos at which it begins
- * @param opening if it opens a tag: <tag> or closes it: </tag>
- * @param statement statement inside the tag
- */
- public KnownHtmlElement(int line, int pos, boolean opening, String statement) {
- super(line, pos);
- this.opening = opening;
- this.statement = statement;
- }
-
- @Override
- public String getShortDescription() {
- StringBuilder builder = new StringBuilder();
- builder.append(getPositionAsString()).append(" <");
- if (!opening) {
- builder.append("/");
- }
- return builder.append(statement).append(">").toString();
- }
-
- @Override
- public boolean isOpening() {
- return opening;
- }
-
- @Override
- public boolean isClosing() {
- return !opening;
- }
-
- @Override
- public boolean isMatchingElement(KnownElement k) {
- if (k instanceof KnownHtmlElement) {
- return ((KnownHtmlElement) k).statement.equals(this.statement);
- }
- return false;
- }
-}
diff --git a/devTools/javaSanityCheck/src/element/KnownLogicElement.java b/devTools/javaSanityCheck/src/element/KnownLogicElement.java
deleted file mode 100644
index 5c8496a5c554a0967eb53e5c7e9cd4973f39f51c..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/KnownLogicElement.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-import org.arkerthan.sanityCheck.DisallowedTagException;
-import org.arkerthan.sanityCheck.UnknownStateException;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author Arkerthan
- */
-public class KnownLogicElement extends KnownElement {
- private static final List<String> allowedTags = Arrays.asList("if", "elseif", "else");
- private final int state;
- private boolean last;
- /*
- 0 - if
- 1 - elseif
- 2 - else
- 3 - switch
- 4 - case
- 5 - default
- */
-
- public KnownLogicElement(int line, int pos, String tag, boolean last) {
- this(line, pos, tag);
- this.last = last;
- }
-
- public KnownLogicElement(int line, int pos, String tag) {
- super(line, pos);
- switch (tag) {
- case "if":
- state = 0;
- break;
- case "elseif":
- state = 1;
- break;
- case "else":
- state = 2;
- break;
- case "switch":
- state = 3;
- break;
- case "case":
- state = 4;
- break;
- case "default":
- state = 5;
- break;
- default:
- throw new DisallowedTagException(tag);
- }
- last = false;
- }
-
- @Override
- public boolean isOpening() {
- return !last;
- }
-
- @Override
- public boolean isClosing() {
- return (state != 0 && state != 3) || last;
- }
-
- @Override
- public boolean isMatchingElement(KnownElement k) {
- if (!(k instanceof KnownLogicElement)) {
- return false;
- }
- KnownLogicElement l = (KnownLogicElement) k;
- switch (state) {
- case 0:
- case 1:
- return l.state == 1 || l.state == 2 || (l.state == 0 && l.last);
- case 2:
- return l.state == 0 && l.last;
- case 3:
- case 4:
- return l.state == 3 || l.state == 4;
- case 5:
- return l.state == 3 && l.last;
- default:
- throw new UnknownStateException(state);
- }
- }
-
- @Override
- public String getShortDescription() {
- StringBuilder builder = new StringBuilder();
- builder.append(getPositionAsString()).append(" <<");
- if (last) {
- builder.append('/');
- }
- switch (state) {
- case 0:
- builder.append("if");
- break;
- case 1:
- builder.append("elseif");
- break;
- case 2:
- builder.append("else");
- break;
- case 3:
- builder.append("switch");
- break;
- case 4:
- builder.append("case");
- break;
- case 5:
- builder.append("default");
- break;
- default:
- throw new UnknownStateException(state);
- }
- return builder.append(">>").toString();
- }
-}
diff --git a/devTools/javaSanityCheck/src/element/KnownTwineElement.java b/devTools/javaSanityCheck/src/element/KnownTwineElement.java
deleted file mode 100644
index 9693fb840dfda0338d6d87ad2c602b6769126d3d..0000000000000000000000000000000000000000
--- a/devTools/javaSanityCheck/src/element/KnownTwineElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.arkerthan.sanityCheck.element;
-
-/**
- * @author Arkerthan
- */
-public class KnownTwineElement extends KnownElement {
-
- private boolean opening;
- private String statement;
-
- /**
- * @param line at which it begins
- * @param pos at which it begins
- * @param opening if it opens a tag: <<tag>> or closes it: <</tag>>
- * @param statement statement inside the tag
- */
- public KnownTwineElement(int line, int pos, boolean opening, String statement) {
- super(line, pos);
- this.opening = opening;
- this.statement = statement;
- }
-
- @Override
- public String getShortDescription() {
- StringBuilder builder = new StringBuilder();
- builder.append(getPositionAsString()).append(" <<");
- if (!opening) {
- builder.append("/");
- }
- return builder.append(statement).append(">>").toString();
- }
-
- @Override
- public boolean isOpening() {
- return opening;
- }
-
- @Override
- public boolean isClosing() {
- return !opening;
- }
-
- @Override
- public boolean isMatchingElement(KnownElement k) {
- if (k instanceof KnownTwineElement) {
- return ((KnownTwineElement) k).statement.equals(this.statement);
- }
- return false;
- }
-}