C#/Java: Add model generator option for making content based summaries.

Author: michaelnebel

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

@@ -33,6 +33,7 @@ def __init__ (self, language):
         self.generateSources = False
         self.generateSummaries = False
         self.generateNeutrals = False
+        self.generateContentSummaries = False
         self.generateTypeBasedSummaries = False
         self.dryRun = False
         self.dirname = "modelgenerator"
@@ -50,6 +51,7 @@ def printHelp(self):
     --with-sources
     --with-summaries
     --with-neutrals
+    --with-content-summaries (Experimental). May not 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.
 
@@ -81,6 +83,10 @@ def make(language):
             generator.printHelp()
             sys.exit(0)
 
+        if "--with-summaries" in sys.argv and "--with-content-summaries" in sys.argv:
+            generator.printHelp()
+            sys.exit(0)
+
         if "--with-sinks" in sys.argv:
             sys.argv.remove("--with-sinks")
             generator.generateSinks = True
@@ -97,6 +103,10 @@ def make(language):
             sys.argv.remove("--with-neutrals")
             generator.generateNeutrals = True
 
+        if "--with-content-summaries" in sys.argv:
+            sys.argv.remove("--with-content-summaries")
+            generator.generateContentSummaries = True
+
         if "--with-typebased-summaries" in sys.argv:
             sys.argv.remove("--with-typebased-summaries")
             generator.generateTypeBasedSummaries = True
@@ -105,7 +115,7 @@ def make(language):
             sys.argv.remove("--dry-run")
             generator.dryRun = True
 
-        if not generator.generateSinks and not generator.generateSources and not generator.generateSummaries and not generator.generateNeutrals and not generator.generateTypeBasedSummaries:
+        if not generator.generateSinks and not generator.generateSources and not generator.generateSummaries and not generator.generateNeutrals and not generator.generateTypeBasedSummaries and not generator.generateContentSummaries:
             generator.generateSinks = generator.generateSources = generator.generateSummaries = generator.generateNeutrals = True
 
         n = len(sys.argv)
@@ -162,8 +172,13 @@ def makeContent(self):
             neutralAddsTo = self.getAddsTo("CaptureNeutralModels.ql", helpers.neutralModelPredicate)
         else:
             neutralAddsTo = { }
-        
-        return helpers.merge(summaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo)
+
+        if self.generateContentSummaries:
+            contentSummaryAddsTo = self.getAddsTo("CaptureContentSummaryModels.ql", helpers.summaryModelPredicate)
+        else:
+            contentSummaryAddsTo = { }
+
+        return helpers.merge(summaryAddsTo, contentSummaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo)
 
     def makeTypeBasedContent(self):
         if self.generateTypeBasedSummaries: