diff --git a/SanityCheck.jar b/SanityCheck.jar
index 478417de473b6dd0de5575eef4d474e2ef3d7073..46bb2a6935a37fa61c09e968f0ae46e3bf88b5e3 100644
Binary files a/SanityCheck.jar and b/SanityCheck.jar differ
diff --git a/devTools/javaSanityCheck/src/element/AngleBracketElement.java b/devTools/javaSanityCheck/src/element/AngleBracketElement.java
index e129ee20cf401a23d83e520474a4aaa5a1b69991..4b3f2526a3979154d571ddf3fdbdb131e949878f 100644
--- a/devTools/javaSanityCheck/src/element/AngleBracketElement.java
+++ b/devTools/javaSanityCheck/src/element/AngleBracketElement.java
@@ -6,374 +6,372 @@ import java.util.Arrays;
import java.util.List;
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
+ 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 ???>
+ HTML
+ -9 - </
+ 10 - trying to complete HTML tag: <tag ???>
-10 - trying to complete HTML tag: </tag>
- 11 - waiting for >
+ 11 - waiting for >
-11 - expecting >
- 12 - waiting for > with KnownElement
- */
+ 12 - waiting for > with KnownElement
+ */
- private TagSearchTree<Tag> tree;
+ private TagSearchTree<Tag> tree;
- public AngleBracketElement(int line, int pos) {
- super(line, pos);
- }
+ 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 '>':
- throw new SyntaxError("Empty Statement?", 2);
- case '/':
- state = -9;
- return 1;
- case ' ':// assume comparison
- case '=':// "
- return 2;
- 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);
+ @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 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;
- }
+ 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;
- }
+ 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);
- }
+ tree = tree.getBranch(c);
+ if (tree == null) {
+ state = 11;
+ throw new SyntaxError("Unknown HTML tag or closing \">\" missing, found " + c, 1);
+ }
- return 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;
- }
+ 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);
- }
+ tree = tree.getBranch(c);
+ if (tree == null) {
+ state = -11;
+ throw new SyntaxError("Unknown HTML tag or closing \">\" missing, found " + c, 1);
+ }
- return 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;
- }
+ 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;
- }
+ tree = tree.getBranch(c);
+ if (tree == null) {
+ //assuming not listed means widget until better solution
+ state = 3;
+ }
- return 1;
- }
+ 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;
- }
+ 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);
- }
+ tree = tree.getBranch(c);
+ if (tree == null) {
+ state = 3;
+ throw new SyntaxError("Unknown Twine closing tag or closing \">>\" missing, found " + c, 1);
+ }
- return 1;
- }
+ return 1;
+ }
- @Override
- public String getShortDescription() {
- StringBuilder builder = new StringBuilder();
- builder.append('[').append(line).append(":").append(pos).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();
- }
+ @Override
+ public String getShortDescription() {
+ StringBuilder builder = new StringBuilder();
+ builder.append('[').append(line).append(":").append(pos).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/CommentElement.java b/devTools/javaSanityCheck/src/element/CommentElement.java
index 0ae0908201c914db2284087e89079760d42ae245..a1c80c7004233c1d620d389788213d33398a6c27 100644
--- a/devTools/javaSanityCheck/src/element/CommentElement.java
+++ b/devTools/javaSanityCheck/src/element/CommentElement.java
@@ -4,67 +4,69 @@ import org.arkerthan.sanityCheck.SyntaxError;
import org.arkerthan.sanityCheck.UnknownStateException;
public class CommentElement extends Element {
- private int state = 0;
- /*
- 0 - /
- 1 - /*???
- 2 - /*???*
- 3 - /%???
- 4 - /%???%
- */
+ 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);
- }
+ /**
+ * @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;
- }
- 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 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 null;
- }
+ @Override
+ public String getShortDescription() {
+ return null;
+ }
}