hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shared: Remove the --with-mixed-neutrals logic.

Browse Source
This commit is contained in:
Michael Nebel
2025-04-15 13:16:59 +02:00
parent ae70c76a07
commit 2357a69d55
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
misc/scripts/models-as-data/generate_flow_model.py
View File

@@ -34,7 +34,6 @@ class Generator:
self.generateSources = False self.generateSources = False
self.generateSummaries = False self.generateSummaries = False
self.generateNeutrals = False self.generateNeutrals = False
self.generateMixedNeutrals = False
self.generateTypeBasedSummaries = False self.generateTypeBasedSummaries = False
self.dryRun = False self.dryRun = False
self.dirname = "modelgenerator" self.dirname = "modelgenerator"
@@ -52,7 +51,6 @@ Which models are generated is controlled by the flags:
--with-sources --with-sources
--with-summaries --with-summaries
--with-neutrals --with-neutrals
--with-mixed-neutrals. Should only be used in conjunction with --with-summaries.
--with-typebased-summaries (Experimental) --with-typebased-summaries (Experimental)
If none of these flags are specified, all models are generated except for the type based models. If none of these flags are specified, all models are generated except for the type based models.
@@ -100,10 +98,6 @@ Requirements: `codeql` should appear on your path.
sys.argv.remove("--with-neutrals") sys.argv.remove("--with-neutrals")
generator.generateNeutrals = True generator.generateNeutrals = True
if "--with-mixed-neutrals" in sys.argv:
sys.argv.remove("--with-mixed-neutrals")
generator.generateMixedNeutrals = True
if "--with-typebased-summaries" in sys.argv: if "--with-typebased-summaries" in sys.argv:
sys.argv.remove("--with-typebased-summaries") sys.argv.remove("--with-typebased-summaries")
generator.generateTypeBasedSummaries = True generator.generateTypeBasedSummaries = True
@@ -116,8 +110,7 @@ Requirements: `codeql` should appear on your path.
not generator.generateSources and not generator.generateSources and
not generator.generateSummaries and not generator.generateSummaries and
not generator.generateNeutrals and not generator.generateNeutrals and
not generator.generateTypeBasedSummaries and not generator.generateTypeBasedSummaries):
not generator.generateMixedNeutrals):
generator.generateSinks = generator.generateSources = generator.generateSummaries = generator.generateNeutrals = True generator.generateSinks = generator.generateSources = generator.generateSummaries = generator.generateNeutrals = True
n = len(sys.argv) n = len(sys.argv)
@@ -171,11 +164,7 @@ Requirements: `codeql` should appear on your path.
if self.generateNeutrals: if self.generateNeutrals:
neutralAddsTo = self.getAddsTo("CaptureNeutralModels.ql", helpers.neutralModelPredicate) neutralAddsTo = self.getAddsTo("CaptureNeutralModels.ql", helpers.neutralModelPredicate)
mixedNeutralAddsTo = {} return helpers.merge(summaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo)
if self.generateMixedNeutrals:
mixedNeutralAddsTo = self.getAddsTo("CaptureMixedNeutralModels.ql", helpers.neutralModelPredicate)
return helpers.merge(summaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo, mixedNeutralAddsTo)
def makeTypeBasedContent(self): def makeTypeBasedContent(self):
if self.generateTypeBasedSummaries: if self.generateTypeBasedSummaries:
@@ -210,8 +199,7 @@ extensions:
if (self.generateSinks or if (self.generateSinks or
self.generateSources or self.generateSources or
self.generateSummaries or self.generateSummaries or
self.generateNeutrals or self.generateNeutrals):
self.generateMixedNeutrals):
self.save(content, ".model.yml") self.save(content, ".model.yml")
if self.generateTypeBasedSummaries: if self.generateTypeBasedSummaries: