C#/Java: Rename Negative Summary Model to Neutral Model in conversion and generator tooling.

java/ql/src/utils/model-generator/RegenerateModels.py

@@ -37,7 +37,7 @@ def regenerateModel(lgtmSlug, extractedDb):
     modelFile = lgtmSlugToModelFile[lgtmSlug]
     codeQlRoot = findGitRoot()
     subprocess.check_call([codeQlRoot + "/java/ql/src/utils/model-generator/GenerateFlowModel.py",
-                           "--with-summaries", "--with-sinks", "--with-negative-summaries",
+                           "--with-summaries", "--with-sinks", "--with-neutrals",
                            extractedDb, modelFile])
     print("Regenerated " + modelFile)
     shutil.rmtree(tmpDir)

misc/scripts/models-as-data/convert_extensions.py

@@ -74,8 +74,8 @@ class Converter:
         summaries = self.getAddsTo("ExtractSummaries.ql", helpers.summaryModelPredicate)
         sources = self.getAddsTo("ExtractSources.ql", helpers.sourceModelPredicate)
         sinks = self.getAddsTo("ExtractSinks.ql", helpers.sinkModelPredicate)
-        negativeSummaries = self.getAddsTo("ExtractNegativeSummaries.ql", helpers.negativeSummaryModelPredicate)
-        return merge(sources, sinks, summaries, negativeSummaries)
+        neutrals = self.getAddsTo("ExtractNeutrals.ql", helpers.neutralModelPredicate)
+        return merge(sources, sinks, summaries, neutrals)
 
 
     def save(self, extensions):

misc/scripts/models-as-data/generate_flow_model.py

@@ -30,7 +30,7 @@ class Generator:
         self.generateSinks = False
         self.generateSources = False
         self.generateSummaries = False
-        self.generateNegativeSummaries = False
+        self.generateNeutrals = False
         self.generateTypeBasedSummaries = False
         self.dryRun = False
         self.dirname = "model-generator"
@@ -49,7 +49,7 @@ Which models are generated is controlled by the flags:
     --with-sinks
     --with-sources
     --with-summaries
-    --with-negative-summaries
+    --with-neutrals
     --with-typebased-summaries (Experimental)
 If none of these flags are specified, all models are generated except for the type based models.
 
@@ -102,9 +102,9 @@ Requirements: `codeql` should both appear on your path.
             sys.argv.remove("--with-summaries")
             generator.generateSummaries = True
 
-        if "--with-negative-summaries" in sys.argv:
-            sys.argv.remove("--with-negative-summaries")
-            generator.generateNegativeSummaries = True
+        if "--with-neutrals" in sys.argv:
+            sys.argv.remove("--with-neutrals")
+            generator.generateNeutrals = True
 
         if "--with-typebased-summaries" in sys.argv:
             sys.argv.remove("--with-typebased-summaries")
@@ -114,8 +114,8 @@ Requirements: `codeql` should both appear on your path.
             sys.argv.remove("--dry-run")
             generator.dryRun = True
 
-        if not generator.generateSinks and not generator.generateSources and not generator.generateSummaries and not generator.generateNegativeSummaries and not generator.generateTypeBasedSummaries:
-            generator.generateSinks = generator.generateSources = generator.generateSummaries = generator.generateNegativeSummaries = True
+        if not generator.generateSinks and not generator.generateSources and not generator.generateSummaries and not generator.generateNeutrals and not generator.generateTypeBasedSummaries:
+            generator.generateSinks = generator.generateSources = generator.generateSummaries = generator.generateNeutrals = True
 
         if len(sys.argv) < 3 or len(sys.argv) > 4:
             generator.printHelp()
@@ -168,10 +168,10 @@ Requirements: `codeql` should both appear on your path.
         else:
             sourceAddsTo = ""
 
-        if self.generateNegativeSummaries:
-            negativeSummaryAddsTo = self.getAddsTo("CaptureNegativeSummaryModels.ql", "extNegativeSummaryModel")
+        if self.generateNeutrals:
+            neutralAddsTo = self.getAddsTo("CaptureNeutralModels.ql", helpers.neutralModelPredicate)
         else:
-            negativeSummaryAddsTo = ""
+            neutralAddsTo = ""
         
         return f""" 
 # THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
@@ -181,7 +181,7 @@ extensions:
 {sinkAddsTo}
 {sourceAddsTo}
 {summaryAddsTo}
-{negativeSummaryAddsTo}
+{neutralAddsTo}
         """
 
     def makeTypeBasedContent(self):

misc/scripts/models-as-data/helpers.py

@@ -7,7 +7,7 @@ import subprocess
 summaryModelPredicate = "extSummaryModel"
 sinkModelPredicate = "extSinkModel"
 sourceModelPredicate = "extSourceModel"
-negativeSummaryModelPredicate = "extNegativeSummaryModel"
+neutralModelPredicate = "extNeutralModel"
 addsToTemplate = """  - addsTo:
       pack: {0}
       extensible: {1}