Replace preprocessor with code from simplecpp project

Author: usiems

generator/abstractmetabuilder.cpp

@@ -1169,7 +1169,7 @@ void AbstractMetaBuilder::traverseFunctions(ScopeModelItem scope_item, AbstractM
                     ReportHandler::warning(warn);
                 }
 
-                meta_class->addFunction(meta_function);
+                meta_class->addFunction(meta_function, /*check_duplicates=*/true);
             } else if (meta_function->isDestructor()) {
                 meta_class->setDestructorException(meta_function->exception());
                 if (!meta_function->isPublic()) {

generator/generator.pri

@@ -18,6 +18,8 @@ include($$GENERATORPATH/parser/rxx.pri)
 
 include($$GENERATORPATH/parser/rpp/rpp.pri)
 
+include($$GENERATORPATH/simplecpp/simplecpp.pri)
+
 CONFIG += strict_c++
 win32-msvc*{
 #Disable warning C4996 (deprecated declarations)

generator/main.cpp

@@ -49,6 +49,7 @@
 #include "fileout.h"
 #include "control.h"
 #include "pp.h"
+#include "simplecpp.h"
 
 #include <QDir>
 #include <QFileInfo>
@@ -125,7 +126,95 @@ namespace
     }
 
     bool
-    preprocess(const QString &sourceFile, const QString &targetFile, const QString &commandLineIncludes = QString())
+    preprocess(const QString& sourceFile, const QString& targetFile, const QString& commandLineIncludes = QString())
+    {
+      simplecpp::DUI dui; // settings
+
+      foreach(QString include, getIncludeDirectories(commandLineIncludes)) {
+        dui.includePaths.push_back(QDir::toNativeSeparators(include).toStdString());
+      }
+      dui.defines.push_back("__cplusplus=1");
+      dui.defines.push_back("__STDC__");
+      dui.std = "c++17";
+      dui.removeComments = true;
+
+      QFile file(sourceFile);
+      if (!file.open(QFile::ReadOnly))
+      {
+        std::cerr << "Main file not found:" << sourceFile.toUtf8().constData() << std::endl;
+        return false;
+      }
+
+      QByteArray ba = file.readAll();
+      file.close();
+
+      // Perform preprocessing
+      simplecpp::OutputList outputList;
+      std::vector<std::string> files;
+      simplecpp::TokenList* rawtokens = new simplecpp::TokenList(ba.constData(), ba.size(), files, {}, &outputList);
+      rawtokens->removeComments();
+      simplecpp::TokenList outputTokens(files);
+      std::map<std::string, simplecpp::TokenList*> filedata;
+      simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
+      simplecpp::cleanup(filedata);
+      delete rawtokens;
+      rawtokens = nullptr;
+
+      for (const simplecpp::Output& output : outputList) {
+        if (output.type == simplecpp::Output::MISSING_HEADER) {
+          // do not print these messages for now, we are not interested
+          continue;
+        }
+        std::cerr << output.location.file() << ':' << output.location.line << ": ";
+        switch (output.type) {
+        case simplecpp::Output::ERROR:
+          std::cerr << "#error: ";
+          break;
+        case simplecpp::Output::WARNING:
+          std::cerr << "#warning: ";
+          break;
+        case simplecpp::Output::MISSING_HEADER:
+          std::cerr << "missing header: ";
+          break;
+        case simplecpp::Output::INCLUDE_NESTED_TOO_DEEPLY:
+          std::cerr << "include nested too deeply: ";
+          break;
+        case simplecpp::Output::SYNTAX_ERROR:
+          std::cerr << "syntax error: ";
+          break;
+        case simplecpp::Output::PORTABILITY_BACKSLASH:
+          std::cerr << "portability: ";
+          break;
+        case simplecpp::Output::UNHANDLED_CHAR_ERROR:
+          std::cerr << "unhandled char error: ";
+          break;
+        case simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND:
+          std::cerr << "explicit include not found: ";
+          break;
+        case simplecpp::Output::FILE_NOT_FOUND:
+          std::cerr << "file not found: ";
+          break;
+        case simplecpp::Output::DUI_ERROR:
+          std::cerr << "dui error: ";
+          break;
+        }
+        std::cerr << output.msg << std::endl;
+      }
+
+      QFile f(targetFile);
+      if (!f.open(QIODevice::WriteOnly | QIODevice::Text))
+      {
+        fprintf(stderr, "Failed to write preprocessed file: %s\n", qPrintable(targetFile));
+      }
+      std::string result = outputTokens.stringify();
+      f.write(result.c_str(), result.length());
+
+      return true;
+    }
+
+
+    bool
+    preprocess2(const QString &sourceFile, const QString &targetFile, const QString &commandLineIncludes = QString())
     {
       rpp::pp_environment env;
       rpp::pp preprocess(env);

generator/parser/lexer.cpp

@@ -69,6 +69,9 @@ void LocationManager::extract_line(int offset, int *line, QString *filename) con
   const unsigned char *cursor = begin_buffer + offset;
 
   ++cursor; // skip '#'
+  if (cursor[0] == 'l' && cursor[1] == 'i' && cursor[2] == 'n' && cursor[3] == 'e') {
+    cursor += 4;
+  }
   if (std::isspace(*cursor) && std::isdigit(*(cursor + 1)))
     {
       ++cursor;

generator/qtscript_masterinclude.h

@@ -38,6 +38,44 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+
+// Qt
+#define QOBJECTDEFS_H
+#define QTMETAMACROS_H
+
+// not yet supported
+#define Q_SLOTS slots
+#define Q_SIGNALS signals
+#define Q_FLAGS(a)
+#define Q_FLAG(a)
+#define Q_PRIVATE_SLOT(a, b)
+#define Q_DECLARE_INTERFACE(a,b)
+#define Q_INTERFACES(a)
+#define Q_GADGET
+#define Q_OVERRIDE(a)
+#define Q_OS_OS2
+#define Q_NO_USING_KEYWORD
+#define Q_DECL_OVERRIDE override
+
+// There are symbols in Qt that exist in Debug but
+// not in release
+#define QT_NO_DEBUG
+
+#define QT_JAMBI_RUN
+
+// Qt6
+#define Q_NAMESPACE_EXPORT(...)
+#define Q_ENUM_NS(x)
+#define Q_FLAG_NS(x)
+#define Q_MOC_INCLUDE(...)
+
+// ignore static_assert
+#define static_assert(...)
+
+
+
+
 // We need to force the endianess in Qt5
 #define Q_BYTE_ORDER Q_LITTLE_ENDIAN
 
@@ -122,9 +160,11 @@
 #define QDOC_PROPERTY(text) Q_PROPERTY(text)
 
 // don't need this:
-#define Q_REVISION(v)
+#define Q_REVISION(...)
 #define Q_DECLARE_OPERATORS_FOR_FLAGS(x)
 #define Q_GADGET_EXPORT(x)
+#define Q_DECLARE_TYPEINFO(...)
+#define Q_DECLARE_MIXED_ENUM_OPERATORS_SYMMETRIC(...)
 
 #include <QtCore/QMetaType>
 

generator/shellgenerator.cpp

@@ -135,6 +135,20 @@ namespace {
   }
 }
 
+namespace {
+
+  QString trimSpaces(const QString& expr)
+  {
+    QString result = expr;
+    if (!result.contains("\"") && !result.contains("'")) {
+      // assume all spaces are expendable (some new spaces were introduced by the new simplecpp preprocessor)
+      result.replace(" ", "");
+    }
+    return result;
+  }
+
+};
+
 
 void ShellGenerator::writeFunctionArguments(QTextStream &s,
                                             const AbstractMetaFunction *meta_function,
@@ -167,9 +181,9 @@ void ShellGenerator::writeFunctionArguments(QTextStream &s,
           }
         }
         if ((option & IncludeDefaultExpression) && !arg->defaultValueExpression().isEmpty()) {
-            s << " = "; 
+          s << " = "; 
 
-            QString expr = arg->defaultValueExpression();
+          QString expr = trimSpaces(arg->defaultValueExpression());
           if (expr == "NULL")
           {
             expr = "nullptr";

generator/simplecpp/LICENSE

@@ -0,0 +1,14 @@
+BSD Zero Clause License
+
+Copyright (c) 2023 simplecpp team
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

generator/simplecpp/README.txt

@@ -0,0 +1,5 @@
+This code is taken from https://github.com/danmar/simplecpp, version 1.2.0
+
+The code was released under the 0BSD license (see LICENSE file).
+
+The code is lightly patched (see do_not_stop_on_error.patch).