created delimited string validator

4 files changed, 108 insertions, 2 deletions

diff --git a/src/data/delimitedstringvalidator.cpp b/src/data/delimitedstringvalidator.cpp
new file mode 100644
index 0000000..9f1057e
--- /dev/null
+++ b/src/data/delimitedstringvalidator.cpp
@@ -0,0 +1,58 @@
+/*
+    TikZiT - a GUI diagram editor for TikZ
+    Copyright (C) 2018 Aleks Kissinger
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "delimitedstringvalidator.h"
+
+DelimitedStringValidator::DelimitedStringValidator(QObject *parent) : QValidator(parent)
+{
+}
+
+QValidator::State DelimitedStringValidator::validate(QString &input, int &/*pos*/) const
+{
+    int depth = braceDepth(input);
+    if (depth == 0) return Acceptable;
+    else if (depth > 0) return Intermediate;
+    else return Invalid;
+}
+
+void DelimitedStringValidator::fixup(QString &input) const
+{
+    int depth = braceDepth(input);
+    if (depth > 0) input.append(QString("}").repeated(depth));
+}
+
+int DelimitedStringValidator::braceDepth(QString input) const
+{
+    int depth = 0;
+    bool escape = false;
+    for (int i = 0; i < input.length(); ++i) {
+        QCharRef c = input[i];
+        if (escape) {
+            escape = false;
+        } else if (c == '\\') {
+            escape = true;
+        } else if (c == '{') {
+            depth++;
+        } else if (c == '}') {
+            depth--;
+            if (depth < 0) return -1;
+        }
+    }
+
+    return depth;
+}
diff --git a/src/data/delimitedstringvalidator.h b/src/data/delimitedstringvalidator.h
new file mode 100644
index 0000000..654e4ab
--- /dev/null
+++ b/src/data/delimitedstringvalidator.h
@@ -0,0 +1,42 @@
+/*
+    TikZiT - a GUI diagram editor for TikZ
+    Copyright (C) 2018 Aleks Kissinger
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+/*!
+  * A string validator which keeps curly braces matched. Used in various places
+  * to ensure the user doesn't make non-parseable .tikz or .tikzstyles files.
+  */
+
+#ifndef DELIMITEDSTRINGVALIDATOR_H
+#define DELIMITEDSTRINGVALIDATOR_H
+
+
+#include <QObject>
+#include <QValidator>
+
+
+class DelimitedStringValidator : public QValidator
+{
+public:
+    DelimitedStringValidator(QObject *parent);
+    QValidator::State validate(QString &input, int &/*pos*/) const override;
+    void fixup(QString &input) const override;
+private:
+    int braceDepth(QString input) const;
+};
+
+#endif // DELIMITEDSTRINGVALIDATOR_H
diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp
index 29192d6..804a12b 100644
--- a/src/gui/styleeditor.cpp
+++ b/src/gui/styleeditor.cpp
@@ -4,6 +4,7 @@
 
 #include "tikzit.h"
 #include "styleeditor.h"
+#include "delimitedstringvalidator.h"
 #include "ui_styleeditor.h"
 
 StyleEditor::StyleEditor(QWidget *parent) :
@@ -18,6 +19,9 @@ StyleEditor::StyleEditor(QWidget *parent) :
         ui->leftArrow << ui->rightArrow <<
         ui->properties;
 
+    DelimitedStringValidator *v = new DelimitedStringValidator(this);
+    ui->name->setValidator(v);
+
     setWindowIcon(QIcon(":/images/tikzit.png"));
     _styles = nullptr;
     _activeStyle = nullptr;
diff --git a/tikzit.pro b/tikzit.pro
index 8b15534..ce6a99a 100644
--- a/tikzit.pro
+++ b/tikzit.pro
@@ -79,7 +79,8 @@ SOURCES += src/gui/mainwindow.cpp \
     src/gui/previewwindow.cpp \
     src/gui/latexprocess.cpp \
     src/data/pdfdocument.cpp \
-    src/gui/exportdialog.cpp
+    src/gui/exportdialog.cpp \
+    src/data/delimitedstringvalidator.cpp
 
 HEADERS  += src/gui/mainwindow.h \
     src/gui/toolpalette.h \
@@ -109,7 +110,8 @@ HEADERS  += src/gui/mainwindow.h \
     src/gui/previewwindow.h \
     src/gui/latexprocess.h \
     src/data/pdfdocument.h \
-    src/gui/exportdialog.h
+    src/gui/exportdialog.h \
+    src/data/delimitedstringvalidator.h
 
 FORMS += src/gui/mainwindow.ui \
     src/gui/propertypalette.ui \