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

Author: michaelnebel

Diff for: misc/scripts/models-as-data/generate_flow_model.py

@@ -34,7 +34,6 @@ def __init__ (self, language):
         self.generateSources = False
         self.generateSummaries = False
         self.generateNeutrals = False
-        self.generateMixedNeutrals = False
         self.generateTypeBasedSummaries = False
         self.dryRun = False
         self.dirname = "modelgenerator"
@@ -52,7 +51,6 @@ def printHelp(self):
     --with-sources
     --with-summaries
     --with-neutrals
-    --with-mixed-neutrals. Should only be used in conjunction with --with-summaries.
     --with-typebased-summaries (Experimental)
 If none of these flags are specified, all models are generated except for the type based models.
 
@@ -100,10 +98,6 @@ def make(language):
             sys.argv.remove("--with-neutrals")
             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:
             sys.argv.remove("--with-typebased-summaries")
             generator.generateTypeBasedSummaries = True
@@ -116,8 +110,7 @@ def make(language):
            not generator.generateSources and
            not generator.generateSummaries and
            not generator.generateNeutrals and
-           not generator.generateTypeBasedSummaries and
-           not generator.generateMixedNeutrals):
+           not generator.generateTypeBasedSummaries):
             generator.generateSinks = generator.generateSources = generator.generateSummaries = generator.generateNeutrals = True
 
         n = len(sys.argv)
@@ -171,11 +164,7 @@ def makeContent(self):
         if self.generateNeutrals:
             neutralAddsTo = self.getAddsTo("CaptureNeutralModels.ql", helpers.neutralModelPredicate)
 
-        mixedNeutralAddsTo = {}
-        if self.generateMixedNeutrals:
-            mixedNeutralAddsTo = self.getAddsTo("CaptureMixedNeutralModels.ql", helpers.neutralModelPredicate)
-
-        return helpers.merge(summaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo, mixedNeutralAddsTo)
+        return helpers.merge(summaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo)
 
     def makeTypeBasedContent(self):
         if self.generateTypeBasedSummaries:
@@ -210,8 +199,7 @@ def run(self):
         if (self.generateSinks or
            self.generateSources or
            self.generateSummaries or
-           self.generateNeutrals or
-           self.generateMixedNeutrals):
+           self.generateNeutrals):
             self.save(content, ".model.yml")
 
         if self.generateTypeBasedSummaries: