Java/C#: Update conversion script to also produce negative models.

michaelnebel · michaelnebel · commit b2dd29ff0590 · 2022-12-02T12:18:50.000+01:00
diff --git a/misc/scripts/models-as-data/convert_extensions.py b/misc/scripts/models-as-data/convert_extensions.py
@@ -74,7 +74,8 @@ def makeContent(self):
         summaries = self.getAddsTo("ExtractSummaries.ql", helpers.summaryModelPredicate)
         sources = self.getAddsTo("ExtractSources.ql", helpers.sourceModelPredicate)
         sinks = self.getAddsTo("ExtractSinks.ql", helpers.sinkModelPredicate)
-        return merge(sources, sinks, summaries)
+        negativeSummaries = self.getAddsTo("ExtractNegativeSummaries.ql", helpers.negativeSummaryModelPredicate)
+        return merge(sources, sinks, summaries, negativeSummaries)
 
 
     def save(self, extensions):
diff --git a/misc/scripts/models-as-data/generate_flow_model_extensions.py b/misc/scripts/models-as-data/generate_flow_model_extensions.py
@@ -169,7 +169,7 @@ def makeContent(self):
             sourceAddsTo = ""
 
         if self.generateNegativeSummaries:
-            negativeSummaryAddsTo = self.getAddsTo("CaptureNegativeSummaryModels.ql", "extNegativeSummaryModel")
+            negativeSummaryAddsTo = self.getAddsTo("CaptureNegativeSummaryModels.ql", helpers.negativeSummaryModelPredicate)
         else:
             negativeSummaryAddsTo = ""
         
diff --git a/misc/scripts/models-as-data/helpers.py b/misc/scripts/models-as-data/helpers.py
@@ -7,6 +7,7 @@
 summaryModelPredicate = "extSummaryModel"
 sinkModelPredicate = "extSinkModel"
 sourceModelPredicate = "extSourceModel"
+negativeSummaryModelPredicate = "extNegativeSummaryModel"
 addsToTemplate = """  - addsTo:
       pack: {0}
       extensible: {1}
