C#: Adjust the model generator to produce kinds for neutrals.

Author: michaelnebel

csharp/ql/lib/semmle/code/csharp/dataflow/FlowSummary.qll

@@ -111,11 +111,11 @@ module SummaryComponentStack {
   }
 
   /**
-   * DEPRECATED: Use the member predicate `getAccessPath` instead.
+   * DEPRECATED: Use the member predicate `getMadRepresentation` instead.
    *
    * Gets a textual representation of this stack used for flow summaries.
    */
-  deprecated string getComponentStack(SummaryComponentStack s) { result = s.getAccessPath() }
+  deprecated string getComponentStack(SummaryComponentStack s) { result = s.getMadRepresentation() }
 }
 
 class SummarizedCallable = Impl::Public::SummarizedCallable;

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll

@@ -23,9 +23,9 @@ module Public {
    * content type, or a return kind.
    */
   class SummaryComponent extends TSummaryComponent {
-    /** Gets a textual representation of this component used for flow summaries. */
-    string getAccessStep() {
-      result = getAccessStepSpecific(this)
+    /** Gets a textual representation of this component used for MaD models. */
+    string getMadRepresentation() {
+      result = getMadRepresentationSpecific(this)
       or
       exists(ArgumentPosition pos |
         this = TParameterSummaryComponent(pos) and
@@ -46,7 +46,7 @@ module Public {
     }
 
     /** Gets a textual representation of this summary component. */
-    string toString() { result = this.getAccessStep() }
+    string toString() { result = this.getMadRepresentation() }
   }
 
   /** Provides predicates for constructing summary components. */
@@ -127,21 +127,21 @@ module Public {
     }
 
     /** Gets a textual representation of this stack used for MaD models. */
-    string getAccessPath() {
+    string getMadRepresentation() {
       exists(SummaryComponent head, SummaryComponentStack tail |
         head = this.head() and
         tail = this.tail() and
-        result = tail.getAccessPath() + "." + head.getAccessStep()
+        result = tail.getMadRepresentation() + "." + head.getMadRepresentation()
       )
       or
       exists(SummaryComponent c |
         this = TSingletonSummaryComponentStack(c) and
-        result = c.getAccessStep()
+        result = c.getMadRepresentation()
       )
     }
 
     /** Gets a textual representation of this stack. */
-    string toString() { result = this.getAccessPath() }
+    string toString() { result = this.getMadRepresentation() }
   }
 
   /** Provides predicates for constructing stacks of summary components. */
@@ -1350,8 +1350,8 @@ module Private {
         c.relevantSummary(input, output, preservesValue) and
         csv =
           c.getCallableCsv() // Callable information
-            + input.getAccessPath() + ";" // input
-            + output.getAccessPath() + ";" // output
+            + input.getMadRepresentation() + ";" // input
+            + output.getMadRepresentation() + ";" // output
             + renderKind(preservesValue) + ";" // kind
             + renderProvenance(c) // provenance
       )

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -186,7 +186,7 @@ SummaryComponent interpretComponentSpecific(AccessPathToken c) {
   )
 }
 
-/** Gets the textual representation of the content in the format used for flow summaries. */
+/** Gets the textual representation of the content in the format used MaD models. */
 private string getContentSpecific(Content c) {
   c = TElementContent() and result = "Element"
   or
@@ -197,8 +197,8 @@ private string getContentSpecific(Content c) {
   exists(SyntheticField f | c = TSyntheticFieldContent(f) and result = "SyntheticField[" + f + "]")
 }
 
-/** Gets the textual representation of a summary component in the format used for flow summaries. */
-string getAccessStepSpecific(SummaryComponent sc) {
+/** Gets the textual representation of a summary component in the format used for MaD models. */
+string getMadRepresentationSpecific(SummaryComponent sc) {
   exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecific(c))
   or
   sc = TWithoutContentSummaryComponent(_) and result = "WithoutElement"
@@ -212,15 +212,15 @@ string getAccessStepSpecific(SummaryComponent sc) {
   )
 }
 
-/** Gets the textual representation of a parameter position in the format used for flow summaries. */
+/** Gets the textual representation of a parameter position in the format used for MaD models. */
 string getParameterPosition(ParameterPosition pos) {
   result = pos.getPosition().toString()
   or
   pos.isThisParameter() and
   result = "this"
 }
 
-/** Gets the textual representation of an argument position in the format used for flow summaries. */
+/** Gets the textual representation of an argument position in the format used for MaD models. */
 string getArgumentPosition(ArgumentPosition pos) {
   result = pos.getPosition().toString()
   or

csharp/ql/lib/semmle/code/csharp/frameworks/EntityFramework.qll

@@ -410,7 +410,7 @@ module EntityFramework {
     ) {
       this = dbSet.getDbContextClass() and
       this.output(output, mapped, dbSet) and
-      result = dbSet.getFullName() + "#" + output.getAccessPath()
+      result = dbSet.getFullName() + "#" + output.getMadRepresentation()
     }
   }