Port to KTextTemplate

Author: wengxt

CMakeLists.txt

@@ -2,11 +2,15 @@ cmake_minimum_required(VERSION 3.10)
 project(fcitx5-wayland-binding-generator)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Xml)
+find_package(KF6TextTemplate REQUIRED)
 
-set(CMAKE_CXX_STANDARD_REQUIRED 20)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 add_subdirectory(src)
+add_subdirectory(templates)

src/CMakeLists.txt

@@ -1,2 +1,3 @@
 add_executable(fcitx5-wayland-binding-generator main.cpp protocol.cpp parser.cpp)
-target_link_libraries(fcitx5-wayland-binding-generator Qt6::Core Qt6::Xml)
+target_link_libraries(fcitx5-wayland-binding-generator Qt6::Core Qt6::Xml KF6::TextTemplate templateResources)
+

src/main.cpp

@@ -6,13 +6,15 @@
  */
 
 #include <cstdlib>
-#include "protocol.h"
 #include <QCommandLineOption>
 #include <QCommandLineParser>
 #include <QCoreApplication>
+#include <QLatin1String>
 #include <QLoggingCategory>
 #include <QtLogging>
-#include <QLatin1String>
+#include <ktexttemplate/metatype.h>
+#include <qcontainerfwd.h>
+#include "protocol.h"
 
 Q_LOGGING_CATEGORY(generator, "generator");
 
@@ -38,7 +40,8 @@ int main(int argc, char *argv[]) {
   parser.addOption(
       QCommandLineOption("directory", "Output directory.", "directory", "."));
   parser.addHelpOption();
-  parser.addPositionalArgument("files", "Input files.", "[files...]");
+  parser.addPositionalArgument("files", "Input files.",
+                               "[deps_protocol_file] main_protocol_file");
   parser.process(app);
 
   EmitOptions options;
@@ -52,9 +55,12 @@ int main(int argc, char *argv[]) {
 
   const auto filenames = parser.positionalArguments();
 
+  KTextTemplate::registerMetaType<Message>();
+  KTextTemplate::registerMetaType<Message *>();
+  KTextTemplate::registerMetaType<Argument>();
+
   Protocol protocol(filenames);
-  protocol.emitHeader(options);
-  protocol.emitSource(options);
+  protocol.generate(options);
 
   return 0;
 }

src/parser.cpp

@@ -35,8 +35,9 @@ Q_DECLARE_LOGGING_CATEGORY(generator);
 
 #define XML_BUFFER_SIZE 4096
 
-ParseContext::ParseContext(Protocol *protocol, const QString &filename)
-    : protocol_(protocol) {
+ParseContext::ParseContext(Protocol *protocol, const QString &filename,
+                           bool main)
+    : protocol_(protocol), main_(main) {
 
     if (filename.isEmpty()) {
 
@@ -124,7 +125,7 @@ void ParseContext::startElement(QStringView element_name,
             qCCritical(generator) << "no interface version given";
         }
 
-        protocol_->interfaces_.emplace_back(loc_, name, version);
+        protocol_->interfaces_.emplace_back(loc_, name, version, main_);
         interface_ = &protocol_->interfaces_.back();
     } else if (element_name == "request" || element_name == "event") {
         if (name.empty()) {
@@ -137,11 +138,11 @@ void ParseContext::startElement(QStringView element_name,
         } else {
             messageList = &interface_->eventsList_;
         }
-        messageList->emplace_back(loc_, name);
+        messageList->emplace_back(name);
         message_ = &messageList->back();
 
         if (type == "destructor") {
-            message_->destructor_ = 1;
+            message_->destructor_ = true;
         }
 
         if (!since.isEmpty()) {
@@ -235,25 +236,6 @@ void ParseContext::startElement(QStringView element_name,
         entry = &enumeration_->entryList_.back();
 
         entry->summary_ = summary.toString();
-    } else if (element_name == "description") {
-        if (summary.isEmpty()) {
-            qCCritical(generator) << "description without summary";
-        }
-
-        std::unique_ptr<Description> description =
-            std::make_unique<Description>();
-        description_ = description.get();
-        description->summary = summary.toString();
-
-        if (message_) {
-            message_->description_ = std::move(description);
-        } else if (enumeration_) {
-            enumeration_->description_ = std::move(description);
-        } else if (interface_) {
-            interface_->description_ = std::move(description);
-        } else {
-            protocol_->description_ = std::move(description);
-        }
     }
 }
 
@@ -293,8 +275,17 @@ void ParseContext::endElement(QStringView name) {
     if (name == "copyright") {
         protocol_->copyright_ = characterData_;
     } else if (name == "description") {
-        description_->text = characterData_;
-        description_ = nullptr;
+        Description description;
+        description.text = characterData_;
+        if (message_) {
+            message_->description_ = std::move(description);
+        } else if (enumeration_) {
+            enumeration_->description_ = std::move(description);
+        } else if (interface_) {
+            interface_->description_ = std::move(description);
+        } else {
+            protocol_->description_ = std::move(description);
+        }
     } else if (name == "request" || name == "event") {
         message_ = nullptr;
     } else if (name == "enum") {

src/parser.h

@@ -21,7 +21,7 @@ struct Interface;
 struct Description;
 
 struct ParseContext {
-    ParseContext(Protocol *protocol, const QString &filename);
+    ParseContext(Protocol *protocol, const QString &filename, bool main);
 
     ~ParseContext();
 
@@ -41,14 +41,14 @@ struct ParseContext {
         return loc_;
     }
 
+    bool main_;
     QXmlStreamReader reader_;
     QFile input_;
     Location loc_;
     Protocol *protocol_ = nullptr;
     Interface *interface_ = nullptr;
     Message *message_ = nullptr;
     Enumeration *enumeration_ = nullptr;
-    Description *description_ = nullptr;
     QString characterData_;
 };