C#: Rename -> for .

Author: michaelnebel

csharp/ql/lib/semmle/code/asp/AspNet.qll

@@ -185,9 +185,9 @@ class PageDirective extends AspDirective {
    * Gets the 'CodeBehind' class from which this page inherits.
    */
   ValueOrRefType getInheritedType() {
-    exists(string namespace, string type |
-      result.hasQualifiedName(namespace, type) and
-      splitQualifiedName(this.getInheritedTypeQualifiedName(), namespace, type)
+    exists(string qualifier, string type |
+      result.hasQualifiedName(qualifier, type) and
+      splitQualifiedName(this.getInheritedTypeQualifiedName(), qualifier, type)
     )
   }
 

csharp/ql/lib/semmle/code/cil/ConsistencyChecks.qll

@@ -485,11 +485,11 @@ class InvalidOverride extends MethodViolation {
   }
 
   override string getMessage() {
-    exists(string namespace, string type |
-      base.getDeclaringType().hasQualifiedName(namespace, type)
+    exists(string qualifier, string type |
+      base.getDeclaringType().hasQualifiedName(qualifier, type)
     |
       result =
-        "Overridden method from " + getQualifiedName(namespace, type) + " is not in a base type"
+        "Overridden method from " + getQualifiedName(qualifier, type) + " is not in a base type"
     )
   }
 }

csharp/ql/lib/semmle/code/cil/Type.qll

@@ -51,10 +51,10 @@ class Type extends DotNet::Type, Declaration, TypeContainer, @cil_type {
    */
   Type getUnboundType() { cil_type(this, _, _, _, result) }
 
-  override predicate hasQualifiedName(string namespace, string name) {
+  override predicate hasQualifiedName(string qualifier, string name) {
     name = this.getName() and
-    exists(string pnamespace, string pname | this.getParent().hasQualifiedName(pnamespace, pname) |
-      namespace = getQualifiedName(pnamespace, pname)
+    exists(string pqualifier, string pname | this.getParent().hasQualifiedName(pqualifier, pname) |
+      qualifier = getQualifiedName(pqualifier, pname)
     )
   }
 

csharp/ql/lib/semmle/code/cil/Variable.qll

@@ -29,7 +29,7 @@ class Variable extends DotNet::Variable, Declaration, DataFlowNode, @cil_variabl
 
 /** A stack variable. Either a local variable (`LocalVariable`) or a parameter (`Parameter`). */
 class StackVariable extends Variable, @cil_stack_variable {
-  override predicate hasQualifiedName(string namespace, string name) { none() }
+  override predicate hasQualifiedName(string qualifier, string name) { none() }
 }
 
 /**

csharp/ql/lib/semmle/code/csharp/Callable.qll

@@ -456,8 +456,8 @@ class Operator extends Callable, Member, Attributable, @operator {
 
   override Parameter getRawParameter(int i) { result = this.getParameter(i) }
 
-  override predicate hasQualifiedName(string namespace, string name) {
-    super.hasQualifiedName(namespace, _) and
+  override predicate hasQualifiedName(string qualifier, string name) {
+    super.hasQualifiedName(qualifier, _) and
     name = this.getFunctionName()
   }
 
@@ -1001,10 +1001,10 @@ class LocalFunction extends Callable, Modifiable, Attributable, @local_function
 
   override Callable getEnclosingCallable() { result = this.getStatement().getEnclosingCallable() }
 
-  override predicate hasQualifiedName(string namespace, string name) {
-    exists(string cnamespace, string type |
-      this.getEnclosingCallable().hasQualifiedName(cnamespace, type) and
-      namespace = getQualifiedName(cnamespace, type)
+  override predicate hasQualifiedName(string qualifier, string name) {
+    exists(string cqualifier, string type |
+      this.getEnclosingCallable().hasQualifiedName(cqualifier, type) and
+      qualifier = getQualifiedName(cqualifier, type)
     ) and
     name = this.getName()
   }

csharp/ql/lib/semmle/code/csharp/Generics.qll

@@ -100,9 +100,9 @@ private string getTypeArgumentsNames(ConstructedGeneric cg) {
 
 bindingset[t]
 private string getFullName(Type t) {
-  exists(string namespace, string name |
-    t.hasQualifiedName(namespace, name) and
-    result = getQualifiedName(namespace, name)
+  exists(string qualifier, string name |
+    t.hasQualifiedName(qualifier, name) and
+    result = getQualifiedName(qualifier, name)
   )
 }
 
@@ -159,15 +159,15 @@ class UnboundGenericType extends ValueOrRefType, UnboundGeneric {
     result = this.getUndecoratedName() + "<" + getTypeParameterCommas(this) + ">"
   }
 
-  final override predicate hasQualifiedName(string namespace, string name) {
+  final override predicate hasQualifiedName(string qualifier, string name) {
     exists(string name0 | name = name0 + "<" + getTypeParameterCommas(this) + ">" |
       exists(string enclosing |
-        this.getDeclaringType().hasQualifiedName(namespace, enclosing) and
+        this.getDeclaringType().hasQualifiedName(qualifier, enclosing) and
         name0 = enclosing + "+" + this.getUndecoratedName()
       )
       or
       not exists(this.getDeclaringType()) and
-      namespace = this.getNamespace().getFullName() and
+      qualifier = this.getNamespace().getFullName() and
       name0 = this.getUndecoratedName()
     )
   }
@@ -237,8 +237,8 @@ class TypeParameter extends DotNet::TypeParameter, Type, @type_parameter {
   /** Gets the generic that defines this type parameter. */
   UnboundGeneric getGeneric() { type_parameters(this, _, result, _) }
 
-  final override predicate hasQualifiedName(string namespace, string name) {
-    namespace = "" and
+  final override predicate hasQualifiedName(string qualifier, string name) {
+    qualifier = "" and
     name = this.getName()
   }
 
@@ -424,15 +424,15 @@ class ConstructedType extends ValueOrRefType, ConstructedGeneric {
     result = this.getUndecoratedName() + "<" + getTypeArgumentsNames(this) + ">"
   }
 
-  final override predicate hasQualifiedName(string namespace, string name) {
+  final override predicate hasQualifiedName(string qualifier, string name) {
     exists(string name0 | name = name0 + "<" + getTypeArgumentsQualifiedNames(this) + ">" |
       exists(string enclosing |
-        this.getDeclaringType().hasQualifiedName(namespace, enclosing) and
+        this.getDeclaringType().hasQualifiedName(qualifier, enclosing) and
         name0 = enclosing + "+" + this.getUndecoratedName()
       )
       or
       not exists(this.getDeclaringType()) and
-      namespace = this.getNamespace().getFullName() and
+      qualifier = this.getNamespace().getFullName() and
       name0 = this.getUndecoratedName()
     )
   }

csharp/ql/lib/semmle/code/csharp/Type.qll

@@ -57,19 +57,19 @@ private predicate isObjectClass(Class c) { c instanceof ObjectType }
  */
 class ValueOrRefType extends DotNet::ValueOrRefType, Type, Attributable, @value_or_ref_type {
   /**
-   * Holds if this type has the qualified name `namespace`.`name`.
+   * Holds if this type has the qualified name `qualifier`.`name`.
    *
    * For example the class `System.IO.IOException` has
-   * `namespace`=`System.IO` and `name`=`IOException`.
+   * `qualifier`=`System.IO` and `name`=`IOException`.
    */
-  override predicate hasQualifiedName(string namespace, string name) {
+  override predicate hasQualifiedName(string qualifier, string name) {
     exists(string enclosing |
-      this.getDeclaringType().hasQualifiedName(namespace, enclosing) and
+      this.getDeclaringType().hasQualifiedName(qualifier, enclosing) and
       name = enclosing + "+" + this.getUndecoratedName()
     )
     or
     not exists(this.getDeclaringType()) and
-    namespace = this.getNamespace().getFullName() and
+    qualifier = this.getNamespace().getFullName() and
     name = this.getUndecoratedName()
   }
 
@@ -398,8 +398,8 @@ class NonNestedType extends ValueOrRefType {
  * The `void` type.
  */
 class VoidType extends DotNet::ValueOrRefType, Type, @void_type {
-  override predicate hasQualifiedName(string namespace, string name) {
-    namespace = "System" and
+  override predicate hasQualifiedName(string qualifier, string name) {
+    qualifier = "System" and
     name = "Void"
   }
 
@@ -1007,8 +1007,8 @@ class NullableType extends ValueType, DotNet::ConstructedGeneric, @nullable_type
     result = "Nullable<" + this.getUnderlyingType().getName() + ">"
   }
 
-  final override predicate hasQualifiedName(string namespace, string name) {
-    namespace = "System" and
+  final override predicate hasQualifiedName(string qualifier, string name) {
+    qualifier = "System" and
     name = "Nullable<" + this.getUnderlyingType().getQualifiedName() + ">"
   }
 }
@@ -1076,9 +1076,9 @@ class ArrayType extends DotNet::ArrayType, RefType, @array_type {
     result = this.getElementType().getALocation()
   }
 
-  final override predicate hasQualifiedName(string namespace, string name) {
+  final override predicate hasQualifiedName(string qualifier, string name) {
     exists(Type elementType, string name0 |
-      elementType.hasQualifiedName(namespace, name0) and
+      elementType.hasQualifiedName(qualifier, name0) and
       name = name0 + this.getDimensionString(elementType)
     )
   }
@@ -1106,9 +1106,9 @@ class PointerType extends DotNet::PointerType, Type, @pointer_type {
 
   override string getAPrimaryQlClass() { result = "PointerType" }
 
-  final override predicate hasQualifiedName(string namespace, string name) {
+  final override predicate hasQualifiedName(string qualifier, string name) {
     exists(string name0 |
-      this.getReferentType().hasQualifiedName(namespace, name0) and
+      this.getReferentType().hasQualifiedName(qualifier, name0) and
       name = name0 + "*"
     )
   }
@@ -1190,8 +1190,8 @@ class TupleType extends ValueType, @tuple_type {
 
   override Type getChild(int i) { result = this.getUnderlyingType().getChild(i) }
 
-  final override predicate hasQualifiedName(string namespace, string name) {
-    this.getUnderlyingType().hasQualifiedName(namespace, name)
+  final override predicate hasQualifiedName(string qualifier, string name) {
+    this.getUnderlyingType().hasQualifiedName(qualifier, name)
   }
 
   override string getAPrimaryQlClass() { result = "TupleType" }

csharp/ql/lib/semmle/code/csharp/Variable.qll

@@ -71,7 +71,7 @@ class LocalScopeVariable extends Variable, @local_scope_variable {
    */
   predicate isRef() { none() }
 
-  override predicate hasQualifiedName(string namespace, string name) { none() }
+  override predicate hasQualifiedName(string qualifier, string name) { none() }
 }
 
 /**

csharp/ql/lib/semmle/code/csharp/commons/QualifiedName.qll

@@ -3,11 +3,11 @@
  */
 
 /**
- * Returns the concatenation of `namespace` and `name`, separated by a dot.
+ * Returns the concatenation of `qualifier` and `name`, separated by a dot.
  */
-bindingset[namespace, name]
-string getQualifiedName(string namespace, string name) {
-  if namespace = "" then result = name else result = namespace + "." + name
+bindingset[qualifier, name]
+string getQualifiedName(string qualifier, string name) {
+  if qualifier = "" then result = name else result = qualifier + "." + name
 }
 
 /**

csharp/ql/lib/semmle/code/csharp/frameworks/system/security/cryptography/SymmetricAlgorithm.qll

@@ -5,20 +5,20 @@
 import csharp
 
 /**
- * Holds if the object creation `oc` is the creation of the reference type with the specified `namespace` and `type`, or a class derived from
- * the class with the specified `namespace` and `type`.
+ * Holds if the object creation `oc` is the creation of the reference type with the specified `qualifier` and `type`, or a class derived from
+ * the class with the specified `qualifier` and `type`.
  */
-private predicate isCreatingObject(ObjectCreation oc, string namespace, string type) {
-  exists(RefType t | t = oc.getType() | t.getBaseClass*().hasQualifiedName(namespace, type))
+private predicate isCreatingObject(ObjectCreation oc, string qualifier, string type) {
+  exists(RefType t | t = oc.getType() | t.getBaseClass*().hasQualifiedName(qualifier, type))
 }
 
 /**
- * Holds if the method call `mc` is returning the reference type with the specified `namespace` and `type`.
+ * Holds if the method call `mc` is returning the reference type with the specified `qualifier` and `type`.
  * and the target of the method call is a library method.
  */
-private predicate isReturningObject(MethodCall mc, string namespace, string type) {
+private predicate isReturningObject(MethodCall mc, string qualifier, string type) {
   mc.getTarget().fromLibrary() and
-  exists(RefType t | t = mc.getType() | t.hasQualifiedName(namespace, type))
+  exists(RefType t | t = mc.getType() | t.hasQualifiedName(qualifier, type))
 }
 
 /**