parsing

18 files changed, 363 insertions, 95 deletions

diff --git a/tikzit/bison.pri b/tikzit/bison.pri
index b5d30da..3fcfc36 100644
--- a/tikzit/bison.pri
+++ b/tikzit/bison.pri
@@ -7,7 +7,7 @@ bison.variable_out = GENERATED_SOURCES
 silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands
 QMAKE_EXTRA_COMPILERS += bison
 bison_header.input = BISONSOURCES
-bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.h
+bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp
 bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN}
 bison_header.CONFIG += target_predeps no_link
 silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands
diff --git a/tikzit/flex.pri b/tikzit/flex.pri
index 0cddec6..6a42c0f 100644
--- a/tikzit/flex.pri
+++ b/tikzit/flex.pri
@@ -1,7 +1,7 @@
 flex.name = Flex ${QMAKE_FILE_IN}
 flex.input = FLEXSOURCES
 flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp
-flex.commands = flex -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
+flex.commands = flex --header-file -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
 flex.CONFIG += target_predeps
 flex.variable_out = GENERATED_SOURCES
 silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands
diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp
index c8d1cfc..67e2061 100644
--- a/tikzit/src/data/edge.cpp
+++ b/tikzit/src/data/edge.cpp
@@ -1,14 +1,18 @@
 #include "edge.h"
 
+#include <QDebug>
+
 Edge::Edge(Node *s, Node *t, QObject *parent) :
     QObject(parent), _source(s), _target(t)
 {
     _data = new GraphElementData();
+    _edgeNode = 0;
 }
 
 Edge::~Edge()
 {
     delete _data;
+    delete _edgeNode;
 }
 
 Node *Edge::source() const
@@ -52,4 +56,15 @@ void Edge::setTargetAnchor(const QString &targetAnchor)
     _targetAnchor = targetAnchor;
 }
 
+Node *Edge::edgeNode() const
+{
+    return _edgeNode;
+}
+
+void Edge::setEdgeNode(Node *edgeNode)
+{
+    if (_edgeNode != 0) delete _edgeNode;
+    _edgeNode = edgeNode;
+}
+
 
diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h
index 5884b90..90e624e 100644
--- a/tikzit/src/data/edge.h
+++ b/tikzit/src/data/edge.h
@@ -26,16 +26,24 @@ public:
     QString targetAnchor() const;
     void setTargetAnchor(const QString &targetAnchor);
 
+    Node *edgeNode() const;
+    void setEdgeNode(Node *edgeNode);
+
 signals:
 
 public slots:
 
 private:
-    Node *_source;
-    Node *_target;
-    GraphElementData *_data;
     QString _sourceAnchor;
     QString _targetAnchor;
+
+    // owned
+    Node *_edgeNode;
+    GraphElementData *_data;
+
+    // referenced
+    Node *_source;
+    Node *_target;
 };
 
 #endif // EDGE_H
diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp
index 8a995d2..9307d62 100644
--- a/tikzit/src/data/graph.cpp
+++ b/tikzit/src/data/graph.cpp
@@ -11,19 +11,25 @@ Graph::~Graph()
 }
 
 void Graph::removeNode(Node *n) {
-    nodes.removeAll(n);
+    _nodes.removeAll(n);
     inEdges.remove(n);
     outEdges.remove(n);
 }
 
 Edge *Graph::addEdge(Node *s, Node *t)
 {
-
+    Edge *e = new Edge(s, t, this);
+    _edges << e;
+    outEdges.insert(s, e);
+    inEdges.insert(t, e);
+    return e;
 }
 
 void Graph::removeEdge(Edge *e)
 {
-
+    _edges.removeAll(e);
+    outEdges.remove(e->source(), e);
+    inEdges.remove(e->target(), e);
 }
 
 GraphElementData *Graph::data() const
@@ -37,9 +43,19 @@ void Graph::setData(GraphElementData *data)
     _data = data;
 }
 
+const QVector<Node*> &Graph::nodes()
+{
+    return _nodes;
+}
+
+const QVector<Edge*> &Graph::edges()
+{
+    return _edges;
+}
+
 Node *Graph::addNode() {
     Node *n = new Node(this);
-    nodes << n;
+    _nodes << n;
     return n;
 }
 
diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h
index 1f26486..8f466a2 100644
--- a/tikzit/src/data/graph.h
+++ b/tikzit/src/data/graph.h
@@ -23,13 +23,16 @@ public:
     GraphElementData *data() const;
     void setData(GraphElementData *data);
 
+    const QVector<Node *> &nodes();
+    const QVector<Edge*> &edges();
+
 signals:
 
 public slots:
 
 private:
-    QVector<Node*> nodes;
-    QVector<Edge*> edges;
+    QVector<Node*> _nodes;
+    QVector<Edge*> _edges;
     QMultiHash<Node*,Edge*> inEdges;
     QMultiHash<Node*,Edge*> outEdges;
     GraphElementData *_data;
diff --git a/tikzit/src/data/tikzgraphassembler.cpp b/tikzit/src/data/tikzgraphassembler.cpp
index d8e3963..c05a5c8 100644
--- a/tikzit/src/data/tikzgraphassembler.cpp
+++ b/tikzit/src/data/tikzgraphassembler.cpp
@@ -1,14 +1,31 @@
 #include "tikzgraphassembler.h"
 
+#include "tikzparserdefs.h"
+#include "tikzparser.parser.hpp"
+#include "tikzlexer.h"
+
+int yyparse(void *scanner);
+
+
 TikzGraphAssembler::TikzGraphAssembler(Graph *graph, QObject *parent) :
-    _graph(graph), QObject(parent)
+    QObject(parent), _graph(graph)
 {
-
+    yylex_init(&scanner);
+    yyset_extra(this, scanner);
 }
 
 void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); }
 Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; }
 
+bool TikzGraphAssembler::parse(const QString &tikz)
+{
+    yy_scan_string(tikz.toLatin1().data(), scanner);
+    int result = yyparse(scanner);
+
+    if (result == 0) return true;
+    else return false;
+}
+
 Graph *TikzGraphAssembler::graph() const
 {
     return _graph;
diff --git a/tikzit/src/data/tikzgraphassembler.h b/tikzit/src/data/tikzgraphassembler.h
index 2ae42fd..79b89b0 100644
--- a/tikzit/src/data/tikzgraphassembler.h
+++ b/tikzit/src/data/tikzgraphassembler.h
@@ -14,6 +14,7 @@ public:
     explicit TikzGraphAssembler(Graph *graph, QObject *parent = 0);
     void addNodeToMap(Node *n);
     Node *nodeWithName(QString name);
+    bool parse(const QString &tikz);
 
     Graph *graph() const;
 
@@ -24,6 +25,7 @@ public slots:
 private:
     QHash<QString,Node*> _nodeMap;
     Graph *_graph;
+    void *scanner;
 };
 
 #endif // TIKZGRAPHASSEMBLER_H
diff --git a/tikzit/src/data/tikzlexer.l b/tikzit/src/data/tikzlexer.l
index adb6fef..8dd23c6 100644
--- a/tikzit/src/data/tikzlexer.l
+++ b/tikzit/src/data/tikzlexer.l
@@ -39,7 +39,6 @@
 %option header-file="tikzlexer.h"
 %option extra-type="TikzGraphAssembler *"
 
-
 %s props
 %s xcoord
 %s ycoord
@@ -80,6 +79,7 @@ to                             {  return TO; }
 	BEGIN(xcoord);
 }
 <xcoord>{FLOAT} {
+    yylval->pt = new QPointF();
     yylval->pt->setX(strtod(yytext,NULL));
 	BEGIN(ycoord);
 }
@@ -103,7 +103,9 @@ to                             {  return TO; }
 	property names or values, but in practice this is unlikely and
 	screws up our line counting */
 <props>[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? {
-    yylval->qstr= new QString(yytext);
+    char *str = (char*)malloc(sizeof(char)*yyleng + 1);
+    strncpy(str, yytext, yyleng + 1);
+    yylval->str = str;
 	return PROPSTRING;
 }
 <props>\] {
@@ -121,7 +123,10 @@ to                             {  return TO; }
  /* we assume node names (and anchor names) never contain
 	newlines */
 <noderef>[^\.\{\)\n]+ {
-    yylval->qstr = new QString(yytext);
+    //qDebug() << "nodename: " << yytext << "  size: " << strlen(yytext);
+    char *str = (char*)malloc(sizeof(char)*yyleng + 1);
+    strncpy(str, yytext, yyleng+1);
+    yylval->str = str;
 	return REFSTRING;
 }
 <noderef>\) {
@@ -132,7 +137,7 @@ to                             {  return TO; }
 <INITIAL,props>\{ {
     std::stringstream buf;
 	unsigned int brace_depth = 1;
-	unsigned int escape = 0;
+    unsigned int escape = 0;
 	while (1) {
         char c = yyinput(yyscanner);
 		// eof reached before closing brace
@@ -158,9 +163,11 @@ to                             {  return TO; }
         buf << c;
 	}
 
-
-	
-    yylval->qstr = new QString(QString::fromStdString(buf.str()));
+    char *str = (char*)malloc(sizeof(char) * yyleng + 1);
+    strncpy(str, buf.str().c_str(), yyleng + 1);
+    //str[len] = 0;
+    yylval->str = str;
+    //qDebug() << "got delim string: " << str;
 	return DELIMITEDSTRING;
 }
 
diff --git a/tikzit/src/data/tikzparser.y b/tikzit/src/data/tikzparser.y
index 39d89c6..970f5b4 100644
--- a/tikzit/src/data/tikzparser.y
+++ b/tikzit/src/data/tikzparser.y
@@ -41,7 +41,7 @@
 
 /* possible data types for semantic values */
 %union {
-    QString *qstr;
+    char *str;
     GraphElementProperty *prop;
     GraphElementData *data;
     Node *node;
@@ -65,6 +65,7 @@
 void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) {
 	// TODO: implement reportError()
 	//assembler->reportError(str, yylloc);
+    qDebug() << "parse error: " << str;
 }
 %}
 
@@ -97,9 +98,9 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) {
 %token FULLSTOP "."
 %token EQUALS "="
 %token <pt> COORD "co-ordinate"
-%token <qstr> PROPSTRING "key/value string"
-%token <qstr> REFSTRING "string"
-%token <qstr> DELIMITEDSTRING "{-delimited string"
+%token <str> PROPSTRING "key/value string"
+%token <str> REFSTRING "string"
+%token <str> DELIMITEDSTRING "{-delimited string"
 
 %token UNKNOWN_BEGIN_CMD "unknown \\begin command"
 %token UNKNOWN_END_CMD "unknown \\end command"
@@ -107,9 +108,9 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) {
 %token UNKNOWN_STR "unknown string"
 %token UNCLOSED_DELIM_STR "unclosed {-delimited string"
 
-%type<qstr>   nodename
-%type<qstr>   optanchor
-%type<qstr>   val
+%type<str>   nodename
+%type<str>   optanchor
+%type<str>   val
 %type<prop>    property
 %type<data>    extraproperties
 %type<data>    properties
@@ -121,8 +122,8 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) {
 %%
 
 tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}"
-	{
-		if ($2) {
+    {
+        if ($2) {
             assembler->graph()->setData($2);
 		}
 	};
@@ -141,27 +142,28 @@ properties: extraproperties property
 	{
         $1->add(*$2);
         delete $2;
-		$$ = $1;
+        $$ = $1;
 	};
 extraproperties:
 	extraproperties property ","
 	{
         $1->add(*$2);
         delete $2;
-		$$ = $1;
+        $$ = $1;
 	}
     | { $$ = new GraphElementData(); };
 property:
 	val "=" val
     {
-        GraphElementProperty *p = new GraphElementProperty(*$1,*$3);
-        delete $1, $3;
+        GraphElementProperty *p = new GraphElementProperty(QString($1),QString($3));
+        free($1);
+        free($3);
         $$ = p;
     }
 	| val
     {
-        GraphElementProperty *a = new GraphElementProperty(*$1);
-        delete $1;
+        GraphElementProperty *a = new GraphElementProperty(QString($1));
+        free($1);
         $$ = a;
     };
 val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; };
@@ -173,18 +175,23 @@ node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";"
         if ($2) {
             node->setData($2);
         }
-        node->setName(*$3);
+        //qDebug() << "node name: " << $3;
+        node->setName(QString($3));
+        node->setLabel(QString($6));
+        free($3);
+        free($6);
+
         node->setPoint(*$5);
-        node->setLabel(*$6);
-        delete $3, $5, $6;
-		assembler->addNodeToMap(node);
+        delete $5;
+
+        assembler->addNodeToMap(node);
 	};
 
 optanchor:  { $$ = 0; } | "." REFSTRING { $$ = $2; };
 noderef: "(" REFSTRING optanchor ")"
 	{
-        $$.node = assembler->nodeWithName(*$2);
-        delete $2;
+        $$.node = assembler->nodeWithName(QString($2));
+        free($2);
         $$.anchor = $3;
 	};
 optnoderef:
@@ -193,42 +200,44 @@ optnoderef:
 optedgenode:
 	{ $$ = 0; }
 	| "node" optproperties DELIMITEDSTRING
-	{
-		// TODO: implement edge-nodes
-		// $$ = [Node node];
-		// if ($2)
-		// 	[$$ setData:$2];
-		// [$$ setLabel:$3];
+    {
+        $$ = new Node();
+        if ($2)
+            $$->setData($2);
+        $$->setLabel(QString($3));
+        free($3);
 	}
 edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";"
 	{
-		Node *s;
-		Node *t;
-		Node *en;
-
-        QString sa;
-        QString ta;
-
-		// TODO: anchors and edge nodes
+        Node *s;
+        Node *t;
 		
-		s = $3.node;
-        sa = *$3.anchor;
-        delete $3.anchor;
-		if ($6.node) {
-			t = $6.node;
-            ta = *$6.anchor;
-            delete $6.anchor;
-		} else {
+        s = $3.node;
+
+        if ($6.node) {
+            t = $6.node;
+        } else {
             t = s;
-            ta = sa;
-		}
+        }
 
-		Edge *edge = assembler->graph()->addEdge(s, t);
-		if ($2)
-			edge->setData($2);
+        Edge *edge = assembler->graph()->addEdge(s, t);
+        if ($2)
+            edge->setData($2);
+        if ($5)
+            edge->setEdgeNode($5);
+        if ($3.anchor) {
+            edge->setSourceAnchor(QString($3.anchor));
+            free($3.anchor);
+        }
 
-        edge->setSourceAnchor(sa);
-        edge->setTargetAnchor(ta);
+        if ($6.node) {
+            if ($6.anchor) {
+                edge->setTargetAnchor(QString($6.anchor));
+                free($6.anchor);
+            }
+        } else {
+            edge->setTargetAnchor(edge->sourceAnchor());
+        }
 	};
 
 ignoreprop: val | val "=" val;
diff --git a/tikzit/src/data/tikzparserdefs.h b/tikzit/src/data/tikzparserdefs.h
index 7ba5bc5..b6a904b 100644
--- a/tikzit/src/data/tikzparserdefs.h
+++ b/tikzit/src/data/tikzparserdefs.h
@@ -7,10 +7,11 @@
 #include "tikzgraphassembler.h"
 
 #include <QString>
+#include <QDebug>
 
 struct noderef {
     Node *node;
-    QString *anchor;
+    char *anchor;
 };
 
 #endif // TIKZPARSERDEFS_H
diff --git a/tikzit/src/test/testmain.cpp b/tikzit/src/test/testmain.cpp
new file mode 100644
index 0000000..613be7a
--- /dev/null
+++ b/tikzit/src/test/testmain.cpp
@@ -0,0 +1,19 @@
+#include "testtest.h"
+#include "testparser.h"
+
+#include <QTest>
+#include <QDebug>
+#include <iostream>
+
+int main(int argc, char *argv[])
+{
+    TestTest test;
+    TestParser parser;
+    int r = QTest::qExec(&test, argc, argv) |
+            QTest::qExec(&parser, argc, argv);
+
+    if (r == 0) std::cout << "***************** All tests passed! *****************\n";
+    else std::cout << "***************** Some tests failed. *****************\n";
+
+    return r;
+}
diff --git a/tikzit/src/test/testparser.cpp b/tikzit/src/test/testparser.cpp
new file mode 100644
index 0000000..e978892
--- /dev/null
+++ b/tikzit/src/test/testparser.cpp
@@ -0,0 +1,73 @@
+#include "testparser.h"
+#include "graph.h"
+#include "tikzgraphassembler.h"
+
+#include <QTest>
+#include <QVector>
+
+//void TestParser::initTestCase()
+//{
+
+//}
+
+//void TestParser::cleanupTestCase()
+//{
+
+//}
+
+void TestParser::parseEmptyGraph()
+{
+    Graph *g = new Graph();
+    TikzGraphAssembler ga(g);
+    bool res = ga.parse("\\begin{tikzpicture}\n\\end{tikzpicture}");
+    QVERIFY(res);
+    QVERIFY(g->nodes().size() == 0);
+    QVERIFY(g->edges().size() == 0);
+    delete g;
+}
+
+void TestParser::parseNodeGraph()
+{
+    Graph *g = new Graph();
+    TikzGraphAssembler ga(g);
+    bool res = ga.parse(
+    "\\begin{tikzpicture}\n"
+    "  \\node (node0) at (1.1, -2.2) {};\n"
+    "  \\node (node1) at (3, 4) {test};\n"
+    "\\end{tikzpicture}");
+    QVERIFY(res);
+    QVERIFY(g->nodes().size() == 2);
+    QVERIFY(g->edges().size() == 0);
+    QVERIFY(g->nodes()[0]->name() == "node0");
+    QVERIFY(g->nodes()[0]->label() == "");
+    QVERIFY(g->nodes()[0]->point() == QPointF(1.1,-2.2));
+    QVERIFY(g->nodes()[1]->name() == "node1");
+    QVERIFY(g->nodes()[1]->label() == "test");
+    QVERIFY(g->nodes()[1]->point() == QPointF(3,4));
+    delete g;
+}
+
+void TestParser::parseEdgeGraph()
+{
+    Graph *g = new Graph();
+    TikzGraphAssembler ga(g);
+    bool res = ga.parse(
+    "\\begin{tikzpicture}\n"
+    "  \\begin{pgfonlayer}{nodelayer}\n"
+    "    \\node [style=none] (0) at (-1, -1) {};\n"
+    "    \\node [style=none] (1) at (0, 1) {};\n"
+    "    \\node [style=none] (2) at (1, -1) {};\n"
+    "  \\end{pgfonlayer}\n"
+    "  \\begin{pgfonlayer}{edgelayer}\n"
+    "    \\draw [style=diredge] (1.center) to (2.center);\n"
+    "    \\draw [style=diredge] (2.center) to (0.center);\n"
+    "    \\draw [style=diredge] (0.center) to (1.center);\n"
+    "  \\end{pgfonlayer}\n"
+    "\\end{tikzpicture}\n");
+    QVERIFY(res);
+    QVERIFY(g->nodes().size() == 3);
+    QVERIFY(g->edges().size() == 3);
+    delete g;
+}
+
+
diff --git a/tikzit/src/test/testparser.h b/tikzit/src/test/testparser.h
new file mode 100644
index 0000000..8e2e589
--- /dev/null
+++ b/tikzit/src/test/testparser.h
@@ -0,0 +1,17 @@
+#ifndef TESTPARSER_H
+#define TESTPARSER_H
+
+#include <QObject>
+
+class TestParser : public QObject
+{
+    Q_OBJECT
+private slots:
+    //void initTestCase();
+    void parseEmptyGraph();
+    void parseNodeGraph();
+    void parseEdgeGraph();
+    //void cleanupTestCase();
+};
+
+#endif // TESTPARSER_H
diff --git a/tikzit/src/test/testtest.cpp b/tikzit/src/test/testtest.cpp
index c6de586..59173c0 100644
--- a/tikzit/src/test/testtest.cpp
+++ b/tikzit/src/test/testtest.cpp
@@ -1,17 +1,10 @@
+#include "testtest.h"
+
 #include <QObject>
 #include <QTest>
 
-class TestTest: public QObject
-{
-    Q_OBJECT
-private slots:
-    void initTestCase()
-    { qDebug("initialising test"); }
-    void myFirstTest()
-    { QVERIFY(1 == 1); }
-    void mySecondTest()
-    { QVERIFY(1 != 2); }
-    void cleanupTestCase()
-    { qDebug("cleaning up test"); }
-};
+void TestTest::initTestCase() { qDebug("initialising test"); }
+void TestTest::myFirstTest() { QVERIFY(1 == 1); }
+void TestTest::mySecondTest() { QVERIFY(1 != 2); }
+void TestTest::cleanupTestCase() { qDebug("cleaning up test"); }
 
diff --git a/tikzit/src/test/testtest.h b/tikzit/src/test/testtest.h
new file mode 100644
index 0000000..69a0bc8
--- /dev/null
+++ b/tikzit/src/test/testtest.h
@@ -0,0 +1,17 @@
+#ifndef TESTTEST_H
+#define TESTTEST_H
+
+#include <QObject>
+#include <QTest>
+
+class TestTest: public QObject
+{
+    Q_OBJECT
+private slots:
+    void initTestCase();
+    void myFirstTest();
+    void mySecondTest();
+    void cleanupTestCase();
+};
+
+#endif // TESTTEST_H
diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro
index 846fd73..3574bfd 100644
--- a/tikzit/tikzit.pro
+++ b/tikzit/tikzit.pro
@@ -4,10 +4,7 @@
 #
 #-------------------------------------------------
 
-include(flex.pri)
-include(bison.pri)
-
-QT       += core gui testlib
+QT       += core gui
 CONFIG   += testcase
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -29,8 +26,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 FLEXSOURCES = src/data/tikzlexer.l
 BISONSOURCES = src/data/tikzparser.y
 
-SOURCES += src/main.cpp\
-    src/gui/mainwindow.cpp \
+include(flex.pri)
+include(bison.pri)
+
+SOURCES += src/gui/mainwindow.cpp \
     src/gui/toolpalette.cpp \
     src/gui/tikzscene.cpp \
     src/data/graph.cpp \
@@ -39,8 +38,7 @@ SOURCES += src/main.cpp\
     src/data/tikzgraphassembler.cpp \
     src/data/graphelementdata.cpp \
     src/data/graphelementproperty.cpp \
-    src/gui/propertypalette.cpp \
-    src/test/testtest.cpp
+    src/gui/propertypalette.cpp
 
 HEADERS  += src/gui/mainwindow.h \
     src/gui/toolpalette.h \
@@ -63,3 +61,16 @@ DISTFILES +=
 
 RESOURCES += \
     tikzit.qrc
+
+test {
+    QT += testlib
+    TARGET = UnitTests
+    SOURCES -= src/main.cpp
+    HEADERS += src/test/testtest.h \
+        src/test/testparser.h
+    SOURCES += src/test/testmain.cpp \
+        src/test/testtest.cpp \
+        src/test/testparser.cpp
+} else {
+    SOURCES += src/main.cpp
+}
diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user
index 058f7ba..397eee1 100644
--- a/tikzit/tikzit.pro.user
+++ b/tikzit/tikzit.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.0, 2017-01-20T11:40:07. -->
+<!-- Written by QtCreator 4.2.0, 2017-01-21T19:04:54. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -62,7 +62,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.1 clang 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.1 clang 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.clang_64_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">3</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -245,7 +245,67 @@
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
-   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">&quot;CONFIG += test&quot;</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Test</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>