From 9db55f741e283d0e52f2cd07090d9403378cd6a5 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Thu, 18 Jul 2019 09:35:44 +0200 Subject: Rename Highlighter to HighlighterAsm to preare for alternative C highlighter. Signed-off-by: Pavel Pisa --- qtmips_gui/highlighter.cpp | 150 ------------------------------------------ qtmips_gui/highlighter.h | 79 ---------------------- qtmips_gui/highlighterasm.cpp | 150 ++++++++++++++++++++++++++++++++++++++++++ qtmips_gui/highlighterasm.h | 79 ++++++++++++++++++++++ qtmips_gui/qtmips_gui.pro | 4 +- qtmips_gui/srceditor.cpp | 4 +- qtmips_gui/srceditor.h | 4 +- 7 files changed, 235 insertions(+), 235 deletions(-) delete mode 100644 qtmips_gui/highlighter.cpp delete mode 100644 qtmips_gui/highlighter.h create mode 100644 qtmips_gui/highlighterasm.cpp create mode 100644 qtmips_gui/highlighterasm.h (limited to 'qtmips_gui') diff --git a/qtmips_gui/highlighter.cpp b/qtmips_gui/highlighter.cpp deleted file mode 100644 index 463bbb3..0000000 --- a/qtmips_gui/highlighter.cpp +++ /dev/null @@ -1,150 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/******************************************************************************* - * QtMips - MIPS 32-bit Architecture Subset Simulator - * - * Implemented to support following courses: - * - * B35APO - Computer Architectures - * https://cw.fel.cvut.cz/wiki/courses/b35apo - * - * B4M35PAP - Advanced Computer Architectures - * https://cw.fel.cvut.cz/wiki/courses/b4m35pap/start - * - * Copyright (c) 2017-2019 Karel Koci - * Copyright (c) 2019 Pavel Pisa - * - * Faculty of Electrical Engineering (http://www.fel.cvut.cz) - * Czech Technical University (http://www.cvut.cz/) - * - * 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 2 - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - ******************************************************************************/ -/* Based on Qt example released under BSD license */ - -#include "QStringList" -#include "highlighter.h" -#include "instruction.h" - -Highlighter::Highlighter(QTextDocument *parent) - : QSyntaxHighlighter(parent) -{ - HighlightingRule rule; - - keywordFormat.setForeground(Qt::darkBlue); - keywordFormat.setFontWeight(QFont::Bold); - const QString keywordPatterns[] = { - QStringLiteral("\\.org\\b"), QStringLiteral("\\.word\\b"), - QStringLiteral("\\.text\\b"), QStringLiteral("\\.data\\b"), - QStringLiteral("\\.globl\\b"), QStringLiteral("\\.set\\b"), - QStringLiteral("\\.equ\\b"), QStringLiteral("\\.end\\b"), - QStringLiteral("\\.ent\\b") - }; - - for (const QString &pattern : keywordPatterns) { - rule.pattern = QRegularExpression(pattern); - rule.format = keywordFormat; - highlightingRules.append(rule); - } - - QStringList inst_list; - machine::Instruction::append_recognized_instructions(inst_list); - foreach (const QString &str, inst_list) { - rule.pattern = QRegularExpression("\\b" + str + "\\b"); - rule.format = keywordFormat; - highlightingRules.append(rule); - rule.pattern = QRegularExpression("\\b" + str.toLower() + "\\b"); - rule.format = keywordFormat; - highlightingRules.append(rule); - } - - registerFormat.setFontWeight(QFont::Bold); - registerFormat.setForeground(Qt::darkMagenta); - QStringList reg_list; - machine::Instruction::append_recognized_registers(reg_list); - foreach (const QString &str, reg_list) { - rule.pattern = QRegularExpression("\\$" + str + "\\b"); - rule.format = registerFormat; - highlightingRules.append(rule); - } - rule.pattern = QRegularExpression("\\$[0-9]+\\b"); - rule.format = registerFormat; - highlightingRules.append(rule); - - singleLineCommentFormat.setForeground(Qt::red); - rule.pattern = QRegularExpression(QStringLiteral(";[^\n]*")); - rule.format = singleLineCommentFormat; - highlightingRules.append(rule); - rule.pattern = QRegularExpression(QStringLiteral("#[^\n]*")); - rule.format = singleLineCommentFormat; - highlightingRules.append(rule); - rule.pattern = QRegularExpression(QStringLiteral("//[^\n]*")); - rule.format = singleLineCommentFormat; - highlightingRules.append(rule); - - multiLineCommentFormat.setForeground(Qt::red); - - quotationFormat.setForeground(Qt::darkGreen); - rule.pattern = QRegularExpression(QStringLiteral("\".*\"")); - rule.format = quotationFormat; - highlightingRules.append(rule); - - //functionFormat.setFontItalic(true); - //functionFormat.setForeground(Qt::blue); - //rule.pattern = QRegularExpression(QStringLiteral("\\b[A-Za-z0-9_]+(?=\\()")); - //rule.format = functionFormat; - //highlightingRules.append(rule); - - //commentStartExpression = QRegularExpression(QStringLiteral("/\\*")); - //commentEndExpression = QRegularExpression(QStringLiteral("\\*/")); -} - -void Highlighter::highlightBlock(const QString &text) -{ -#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) - foreach(const HighlightingRule &rule, highlightingRules) -#else - for (const HighlightingRule &rule : qAsConst(highlightingRules)) -#endif - { - QRegularExpressionMatchIterator matchIterator = rule.pattern.globalMatch(text); - while (matchIterator.hasNext()) { - QRegularExpressionMatch match = matchIterator.next(); - setFormat(match.capturedStart(), match.capturedLength(), rule.format); - } - } - setCurrentBlockState(0); - -#if 0 - int startIndex = 0; - if (previousBlockState() != 1) - startIndex = text.indexOf(commentStartExpression); - - while (startIndex >= 0) { - QRegularExpressionMatch match = commentEndExpression.match(text, startIndex); - int endIndex = match.capturedStart(); - int commentLength = 0; - if (endIndex == -1) { - setCurrentBlockState(1); - commentLength = text.length() - startIndex; - } else { - commentLength = endIndex - startIndex - + match.capturedLength(); - } - setFormat(startIndex, commentLength, multiLineCommentFormat); - startIndex = text.indexOf(commentStartExpression, startIndex + commentLength); - } -#endif -} diff --git a/qtmips_gui/highlighter.h b/qtmips_gui/highlighter.h deleted file mode 100644 index 93f1d77..0000000 --- a/qtmips_gui/highlighter.h +++ /dev/null @@ -1,79 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/******************************************************************************* - * QtMips - MIPS 32-bit Architecture Subset Simulator - * - * Implemented to support following courses: - * - * B35APO - Computer Architectures - * https://cw.fel.cvut.cz/wiki/courses/b35apo - * - * B4M35PAP - Advanced Computer Architectures - * https://cw.fel.cvut.cz/wiki/courses/b4m35pap/start - * - * Copyright (c) 2017-2019 Karel Koci - * Copyright (c) 2019 Pavel Pisa - * - * Faculty of Electrical Engineering (http://www.fel.cvut.cz) - * Czech Technical University (http://www.cvut.cz/) - * - * 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 2 - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - ******************************************************************************/ -/* Based on Qt example released under BSD license */ - -#ifndef HIGHLIGHTER_H -#define HIGHLIGHTER_H - -#include -#include -#include - -QT_BEGIN_NAMESPACE -class QTextDocument; -QT_END_NAMESPACE - -//! [0] -class Highlighter : public QSyntaxHighlighter -{ - Q_OBJECT - -public: - Highlighter(QTextDocument *parent = 0); - -protected: - void highlightBlock(const QString &text) override; - -private: - struct HighlightingRule - { - QRegularExpression pattern; - QTextCharFormat format; - }; - QVector highlightingRules; - - QRegularExpression commentStartExpression; - QRegularExpression commentEndExpression; - - QTextCharFormat keywordFormat; - QTextCharFormat registerFormat; - QTextCharFormat singleLineCommentFormat; - QTextCharFormat multiLineCommentFormat; - QTextCharFormat quotationFormat; - QTextCharFormat functionFormat; -}; -//! [0] - -#endif // HIGHLIGHTER_H diff --git a/qtmips_gui/highlighterasm.cpp b/qtmips_gui/highlighterasm.cpp new file mode 100644 index 0000000..b996e20 --- /dev/null +++ b/qtmips_gui/highlighterasm.cpp @@ -0,0 +1,150 @@ +// SPDX-License-Identifier: GPL-2.0+ +/******************************************************************************* + * QtMips - MIPS 32-bit Architecture Subset Simulator + * + * Implemented to support following courses: + * + * B35APO - Computer Architectures + * https://cw.fel.cvut.cz/wiki/courses/b35apo + * + * B4M35PAP - Advanced Computer Architectures + * https://cw.fel.cvut.cz/wiki/courses/b4m35pap/start + * + * Copyright (c) 2017-2019 Karel Koci + * Copyright (c) 2019 Pavel Pisa + * + * Faculty of Electrical Engineering (http://www.fel.cvut.cz) + * Czech Technical University (http://www.cvut.cz/) + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + ******************************************************************************/ +/* Based on Qt example released under BSD license */ + +#include "QStringList" +#include "highlighterasm.h" +#include "instruction.h" + +HighlighterAsm::HighlighterAsm(QTextDocument *parent) + : QSyntaxHighlighter(parent) +{ + HighlightingRule rule; + + keywordFormat.setForeground(Qt::darkBlue); + keywordFormat.setFontWeight(QFont::Bold); + const QString keywordPatterns[] = { + QStringLiteral("\\.org\\b"), QStringLiteral("\\.word\\b"), + QStringLiteral("\\.text\\b"), QStringLiteral("\\.data\\b"), + QStringLiteral("\\.globl\\b"), QStringLiteral("\\.set\\b"), + QStringLiteral("\\.equ\\b"), QStringLiteral("\\.end\\b"), + QStringLiteral("\\.ent\\b") + }; + + for (const QString &pattern : keywordPatterns) { + rule.pattern = QRegularExpression(pattern); + rule.format = keywordFormat; + highlightingRules.append(rule); + } + + QStringList inst_list; + machine::Instruction::append_recognized_instructions(inst_list); + foreach (const QString &str, inst_list) { + rule.pattern = QRegularExpression("\\b" + str + "\\b"); + rule.format = keywordFormat; + highlightingRules.append(rule); + rule.pattern = QRegularExpression("\\b" + str.toLower() + "\\b"); + rule.format = keywordFormat; + highlightingRules.append(rule); + } + + registerFormat.setFontWeight(QFont::Bold); + registerFormat.setForeground(Qt::darkMagenta); + QStringList reg_list; + machine::Instruction::append_recognized_registers(reg_list); + foreach (const QString &str, reg_list) { + rule.pattern = QRegularExpression("\\$" + str + "\\b"); + rule.format = registerFormat; + highlightingRules.append(rule); + } + rule.pattern = QRegularExpression("\\$[0-9]+\\b"); + rule.format = registerFormat; + highlightingRules.append(rule); + + singleLineCommentFormat.setForeground(Qt::red); + rule.pattern = QRegularExpression(QStringLiteral(";[^\n]*")); + rule.format = singleLineCommentFormat; + highlightingRules.append(rule); + rule.pattern = QRegularExpression(QStringLiteral("#[^\n]*")); + rule.format = singleLineCommentFormat; + highlightingRules.append(rule); + rule.pattern = QRegularExpression(QStringLiteral("//[^\n]*")); + rule.format = singleLineCommentFormat; + highlightingRules.append(rule); + + multiLineCommentFormat.setForeground(Qt::red); + + quotationFormat.setForeground(Qt::darkGreen); + rule.pattern = QRegularExpression(QStringLiteral("\".*\"")); + rule.format = quotationFormat; + highlightingRules.append(rule); + + //functionFormat.setFontItalic(true); + //functionFormat.setForeground(Qt::blue); + //rule.pattern = QRegularExpression(QStringLiteral("\\b[A-Za-z0-9_]+(?=\\()")); + //rule.format = functionFormat; + //highlightingRules.append(rule); + + //commentStartExpression = QRegularExpression(QStringLiteral("/\\*")); + //commentEndExpression = QRegularExpression(QStringLiteral("\\*/")); +} + +void HighlighterAsm::highlightBlock(const QString &text) +{ +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) + foreach(const HighlightingRule &rule, highlightingRules) +#else + for (const HighlightingRule &rule : qAsConst(highlightingRules)) +#endif + { + QRegularExpressionMatchIterator matchIterator = rule.pattern.globalMatch(text); + while (matchIterator.hasNext()) { + QRegularExpressionMatch match = matchIterator.next(); + setFormat(match.capturedStart(), match.capturedLength(), rule.format); + } + } + setCurrentBlockState(0); + +#if 0 + int startIndex = 0; + if (previousBlockState() != 1) + startIndex = text.indexOf(commentStartExpression); + + while (startIndex >= 0) { + QRegularExpressionMatch match = commentEndExpression.match(text, startIndex); + int endIndex = match.capturedStart(); + int commentLength = 0; + if (endIndex == -1) { + setCurrentBlockState(1); + commentLength = text.length() - startIndex; + } else { + commentLength = endIndex - startIndex + + match.capturedLength(); + } + setFormat(startIndex, commentLength, multiLineCommentFormat); + startIndex = text.indexOf(commentStartExpression, startIndex + commentLength); + } +#endif +} diff --git a/qtmips_gui/highlighterasm.h b/qtmips_gui/highlighterasm.h new file mode 100644 index 0000000..7f27144 --- /dev/null +++ b/qtmips_gui/highlighterasm.h @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: GPL-2.0+ +/******************************************************************************* + * QtMips - MIPS 32-bit Architecture Subset Simulator + * + * Implemented to support following courses: + * + * B35APO - Computer Architectures + * https://cw.fel.cvut.cz/wiki/courses/b35apo + * + * B4M35PAP - Advanced Computer Architectures + * https://cw.fel.cvut.cz/wiki/courses/b4m35pap/start + * + * Copyright (c) 2017-2019 Karel Koci + * Copyright (c) 2019 Pavel Pisa + * + * Faculty of Electrical Engineering (http://www.fel.cvut.cz) + * Czech Technical University (http://www.cvut.cz/) + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + ******************************************************************************/ +/* Based on Qt example released under BSD license */ + +#ifndef HIGHLIGHTERASM_H +#define HIGHLIGHTERASM_H + +#include +#include +#include + +QT_BEGIN_NAMESPACE +class QTextDocument; +QT_END_NAMESPACE + +//! [0] +class HighlighterAsm : public QSyntaxHighlighter +{ + Q_OBJECT + +public: + HighlighterAsm(QTextDocument *parent = 0); + +protected: + void highlightBlock(const QString &text) override; + +private: + struct HighlightingRule + { + QRegularExpression pattern; + QTextCharFormat format; + }; + QVector highlightingRules; + + QRegularExpression commentStartExpression; + QRegularExpression commentEndExpression; + + QTextCharFormat keywordFormat; + QTextCharFormat registerFormat; + QTextCharFormat singleLineCommentFormat; + QTextCharFormat multiLineCommentFormat; + QTextCharFormat quotationFormat; + QTextCharFormat functionFormat; +}; +//! [0] + +#endif // HIGHLIGHTERASM_H diff --git a/qtmips_gui/qtmips_gui.pro b/qtmips_gui/qtmips_gui.pro index 0f8cab0..1be139e 100644 --- a/qtmips_gui/qtmips_gui.pro +++ b/qtmips_gui/qtmips_gui.pro @@ -76,7 +76,7 @@ SOURCES += \ hinttabledelegate.cpp \ coreview/minimux.cpp \ srceditor.cpp \ - highlighter.cpp \ + highlighterasm.cpp \ messagesdock.cpp \ messagesmodel.cpp \ messagesview.cpp @@ -124,7 +124,7 @@ HEADERS += \ hinttabledelegate.h \ coreview/minimux.h \ srceditor.h \ - highlighter.h \ + highlighterasm.h \ messagesdock.h \ messagesmodel.h \ messagesview.h diff --git a/qtmips_gui/srceditor.cpp b/qtmips_gui/srceditor.cpp index 55f372a..e7502ac 100644 --- a/qtmips_gui/srceditor.cpp +++ b/qtmips_gui/srceditor.cpp @@ -40,7 +40,7 @@ #include #include "srceditor.h" -#include "highlighter.h" +#include "highlighterasm.h" void SrcEditor::setup_common() { QFont font; @@ -49,7 +49,7 @@ void SrcEditor::setup_common() { font.setPointSize(10); setFont(font); tname = "Unknown"; - highlighter = new Highlighter(document()); + highlighter = new HighlighterAsm(document()); } SrcEditor::SrcEditor(QWidget *parent) : Super(parent) { diff --git a/qtmips_gui/srceditor.h b/qtmips_gui/srceditor.h index 1fdbb98..02650e5 100644 --- a/qtmips_gui/srceditor.h +++ b/qtmips_gui/srceditor.h @@ -38,8 +38,8 @@ #include #include +#include #include "qtmipsmachine.h" -#include "highlighter.h" class SrcEditor : public QTextEdit { Q_OBJECT @@ -56,7 +56,7 @@ public: void setCursorToLine(int ln); void setFileName(QString filename); private: - Highlighter *highlighter; + QSyntaxHighlighter *highlighter; void setup_common(); QString fname; QString tname; -- cgit v1.2.3