rewrite large bit of syntax highlighter, add 'manual' test instructions

1 files changed, 10 insertions, 19 deletions

diff --git a/src/highlighter.h b/src/highlighter.h
index a6e2dc3..043c34e 100644
--- a/src/highlighter.h
+++ b/src/highlighter.h
@@ -7,26 +7,17 @@ class Highlighter : public QSyntaxHighlighter
 {
 public:
 	enum state_e {NORMAL=-1,QUOTE,COMMENT};
-	enum mode_e {NORMAL_MODE, ERROR_MODE};
-	mode_e mode;
-
-	QStringList operators;
-	QStringList KeyWords;
-	QStringList Primitives3D;
-	QStringList Primitives2D;
-	QStringList Transforms;
-	QStringList Imports;
-	QTextCharFormat ErrorStyle;
-	QTextCharFormat OperatorStyle;
-	QTextCharFormat CommentStyle;
-	QTextCharFormat QuoteStyle;
-	QTextCharFormat KeyWordStyle;
-	QTextCharFormat PrimitiveStyle3D;
-	QTextCharFormat PrimitiveStyle2D;
-	QTextCharFormat TransformStyle;
-	QTextCharFormat ImportStyle;
-	Highlighter(QTextDocument *parent, mode_e mode);
+	QHash<QString, QTextCharFormat> formatMap;
+	QTextCharFormat errorFormat, commentFormat, quoteFormat;
+	Highlighter(QTextDocument *parent);
 	void highlightBlock(const QString &text);
+	void highlightError(int error_pos);
+	void unhighlightLastError();
+private:
+	QTextBlock lastErrorBlock;
+	int errorPos = -1;
+	bool errorState = false;
+	QStringList separators;
 };
 
 #endif