Add option to reorder declarations in output

Author: tim-dlang

src/cppconv/dwriter/declarationselection.d

@@ -547,6 +547,28 @@ bool includeDeclsForFile(DWriterData data, string filename)
         || data.options.includeDeclFilenamePatterns.match(filename);
 }
 
+long getDeclarationOrder(Declaration d, DWriterData data)
+{
+    foreach_reverse (ref pattern; data.options.declarationOrder)
+    {
+        DeclarationMatch match;
+        if (isDeclarationMatch(pattern.match, match, d, data.semantic))
+        {
+            return pattern.order;
+        }
+    }
+    return 0;
+}
+
+bool cmpDeclarationLoc2(Declaration a, Declaration b, DWriterData data)
+{
+    long orderA = getDeclarationOrder(a, data);
+    long orderB = getDeclarationOrder(b, data);
+    if (orderA != orderB)
+        return orderA < orderB;
+    return cmpDeclarationLoc(a, b, data.semantic);
+}
+
 void selectDeclarations(DWriterData data)
 {
     auto semantic = data.semantic;
@@ -805,7 +827,7 @@ void selectDeclarations(DWriterData data)
 
     foreach (name, ref decls2; data.declsByFile)
     {
-        decls2.sort!((a, b) => cmpDeclarationLoc(a, b, semantic));
+        decls2.sort!((a, b) => cmpDeclarationLoc2(a, b, data));
 
         ImportInfo[string] neededImports;
         bool[string] neededPackages;

src/cppconv/dwriter/dwriter.d

@@ -119,6 +119,12 @@ struct FileHeaderReplacement
     ConfigRegexMultiline expectedLines;
 }
 
+struct DeclarationOrderPattern
+{
+    DeclarationPattern match;
+    long order;
+}
+
 struct DCodeOptions
 {
     DeclarationPattern[] blacklist;
@@ -143,6 +149,7 @@ struct DCodeOptions
     FileHeaderReplacement[] fileHeaderReplacement;
     ConfigRegex allowParameterImplicitCastsFilenamePatterns;
     ConfigRegex transitiveConstFilenamePatterns;
+    DeclarationOrderPattern[] declarationOrder;
 }
 
 class DWriterData

tests/multifile/testinclude110/output-config.json

@@ -0,0 +1,6 @@
+{
+    "includeDeclFilenamePatterns": ".*",
+    "declarationOrder": [
+        {"match": {"name": "func1"}, "order": -1}
+    ]
+}

tests/multifile/testinclude110/testinclude110.cpp

@@ -0,0 +1,28 @@
+#undef TESTINCLUDE10_H
+#include "testinclude110.h"
+
+// Source comment for func1
+void func1()
+{
+}
+
+// Source comment for constructor
+C::C()
+{
+}
+
+// Source comment for destructor
+C::~C()
+{
+}
+
+// Source comment for memberfunc
+int C::memberfunc()
+{
+    return 2;
+}
+
+// Source comment for func2
+void func2()
+{
+}

tests/multifile/testinclude110/testinclude110.d

@@ -0,0 +1,49 @@
+module testinclude110;
+
+import config;
+import cppconvhelpers;
+
+// Header comment for func1
+/+ void func1(); +/
+
+// Source comment for func1
+void func1()
+{
+}
+
+// Header comment for C
+extern(C++, class) struct C
+{
+public:
+    // Header comment for constructor
+    // Source comment for constructor
+    @disable this();
+    /+this()
+    {
+    }+/
+
+    // Header comment for destructor
+    // Source comment for destructor
+    ~this()
+    {
+    }
+
+    // Header comment for inlinefunc
+    int inlinefunc() {return 1;}
+
+    // Header comment for memberfunc
+    // Source comment for memberfunc
+    int memberfunc()
+    {
+        return 2;
+    }
+}
+
+// Header comment for func2
+/+ void func2();
+#undef TESTINCLUDE10_H +/
+// Source comment for func2
+void func2()
+{
+}
+

tests/multifile/testinclude110/testinclude110.h

@@ -0,0 +1,27 @@
+#ifndef TESTINCLUDE10_H
+#define TESTINCLUDE10_H
+
+// Header comment for func1
+void func1();
+
+// Header comment for C
+class C
+{
+public:
+    // Header comment for constructor
+    C();
+
+    // Header comment for destructor
+    ~C();
+
+    // Header comment for inlinefunc
+    int inlinefunc() {return 1;}
+
+    // Header comment for memberfunc
+    int memberfunc();
+};
+
+// Header comment for func2
+void func2();
+
+#endif