Swift: move generated code to generated directory

Author: AlexDenisov

swift/codegen/cppgen.py

@@ -66,7 +66,7 @@ def generate(opts, renderer):
     processor = Processor({cls.name: cls for cls in schema.load(opts.schema).classes}, opts.trap_affix)
     out = opts.cpp_output
     renderer.render(cpp.ClassList(processor.get_classes(), opts.cpp_namespace, opts.trap_affix,
-                                  opts.cpp_include_dir), out / f"{opts.trap_affix}Classes.h")
+                                  opts.cpp_include_dir, opts.schema), out / f"{opts.trap_affix}Classes.h")
 
 
 tags = ("cpp", "schema")

swift/codegen/lib/cpp.py

@@ -104,6 +104,7 @@ class TrapList:
     namespace: str
     trap_affix: str
     include_dir: str
+    source: str
 
 
 @dataclass
@@ -112,6 +113,7 @@ class TagList:
 
     tags: List[Tag]
     namespace: str
+    source: str
 
 
 @dataclass
@@ -150,3 +152,4 @@ class ClassList:
     namespace: str
     trap_affix: str
     include_dir: str
+    source: str

swift/codegen/templates/cpp_classes.mustache

@@ -1,4 +1,4 @@
-// generated by {{generator}}
+// generated by {{generator}} from {{source}}
 // clang-format off
 #pragma once
 

swift/codegen/templates/trap_tags.mustache

@@ -1,4 +1,4 @@
-// generated by {{generator}}
+// generated by {{generator}} from {{source}}
 // clang-format off
 #pragma once
 

swift/codegen/templates/trap_traps.mustache

@@ -1,4 +1,4 @@
-// generated by {{generator}}
+// generated by {{generator}} from {{source}}
 // clang-format off
 #pragma once
 

swift/codegen/trapgen.py

@@ -68,7 +68,7 @@ def generate(opts, renderer):
             for d in e.rhs:
                 tag_graph.setdefault(d.type, set()).add(e.lhs)
 
-    renderer.render(cpp.TrapList(traps, opts.cpp_namespace, opts.trap_affix, opts.cpp_include_dir),
+    renderer.render(cpp.TrapList(traps, opts.cpp_namespace, opts.trap_affix, opts.cpp_include_dir, opts.dbscheme),
                     out / f"{opts.trap_affix}Entries.h")
 
     tags = []
@@ -79,7 +79,7 @@ def generate(opts, renderer):
             index=index,
             id=tag,
         ))
-    renderer.render(cpp.TagList(tags, opts.cpp_namespace), out / f"{opts.trap_affix}Tags.h")
+    renderer.render(cpp.TagList(tags, opts.cpp_namespace, opts.dbscheme), out / f"{opts.trap_affix}Tags.h")
 
 
 tags = ("cpp", "dbscheme")

swift/extractor/SwiftDispatcher.h

@@ -2,8 +2,7 @@
 
 #include "swift/extractor/trap/TrapArena.h"
 #include "swift/extractor/trap/TrapLabelStore.h"
-// autogenerated file
-#include "swift/extractor/trap/TrapClasses.h"
+#include "swift/extractor/trap/generated/TrapClasses.h"
 #include "swift/extractor/SwiftTagTraits.h"
 #include <swift/AST/SourceFile.h>
 #include <swift/Basic/SourceManager.h>

swift/extractor/SwiftExtractor.cpp

@@ -12,7 +12,7 @@
 #include <llvm/Support/FileSystem.h>
 #include <llvm/Support/Path.h>
 
-#include "swift/extractor/trap/TrapClasses.h"
+#include "swift/extractor/trap/generated/TrapClasses.h"
 #include "swift/extractor/trap/TrapOutput.h"
 #include "swift/extractor/SwiftDispatcher.h"
 

swift/extractor/SwiftTagTraits.h

@@ -1,9 +1,7 @@
 #pragma once
 
 #include <swift/AST/ASTVisitor.h>
-
-// autogenerated header
-#include "swift/extractor/trap/TrapTags.h"
+#include "swift/extractor/trap/generated/TrapTags.h"
 
 namespace codeql {
 

swift/extractor/trap/BUILD.bazel

@@ -2,14 +2,14 @@ genrule(
     name = "trapgen",
     srcs = ["//swift:dbscheme"],
     outs = [
-        "TrapEntries.h",
-        "TrapTags.h",
+        "generated/TrapEntries.h",
+        "generated/TrapTags.h",
     ],
     cmd = " ".join([
         "$(location //swift/codegen:trapgen)",
         "--dbscheme $<",
         "--cpp-include-dir " + package_name(),
-        "--cpp-output $(RULEDIR)",
+        "--cpp-output $(RULEDIR)/generated",
     ]),
     exec_tools = ["//swift/codegen:trapgen"],
 )
@@ -21,13 +21,13 @@ genrule(
         "//swift/codegen:schema_includes",
     ],
     outs = [
-        "TrapClasses.h",
+        "generated/TrapClasses.h",
     ],
     cmd = " ".join([
         "$(location //swift/codegen:cppgen)",
         "--schema $(location //swift/codegen:schema)",
         "--cpp-include-dir " + package_name(),
-        "--cpp-output $(RULEDIR)",
+        "--cpp-output $(RULEDIR)/generated",
     ]),
     exec_tools = ["//swift/codegen:cppgen"],
 )