merge, by hand, Christopher Olah's syntax highlighter code

1 files changed, 20 insertions, 1 deletions

diff --git a/src/highlighter.h b/src/highlighter.h
index 2eead6d..a6e2dc3 100644
--- a/src/highlighter.h
+++ b/src/highlighter.h
@@ -6,7 +6,26 @@
 class Highlighter : public QSyntaxHighlighter
 {
 public:
-	Highlighter(QTextDocument *parent);
+	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);
 	void highlightBlock(const QString &text);
 };