[CPP-340] Remove colons and extraenous QLDoc comments; add a few more classes.

Author: zlaski-semmle

cpp/ql/src/semmle/code/cpp/Class.qll

@@ -15,7 +15,6 @@ class Class extends UserType {
     isClass(underlyingElement(this))
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "Class" }
 
   /** Gets a child declaration of this class. */
@@ -824,7 +823,7 @@ class LocalClass extends Class {
   LocalClass() {
     isLocal()
   }
-  /** Canonical QL class corresponding to this element. */
+
   override string getCanonicalQLClass() { result = "LocalClass" }
 
   override Function getEnclosingAccessHolder() {
@@ -840,7 +839,6 @@ class NestedClass extends Class {
     this.isMember()
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "NestedClass" }
 
   /** Holds if this member is private. */
@@ -988,7 +986,6 @@ class VirtualBaseClass extends Class {
     exists(VirtualClassDerivation cd | cd.getBaseClass() = this)
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "VirtualBaseClass" }
 
   /** A virtual class derivation of which this class is the base. */
@@ -1015,7 +1012,6 @@ class ProxyClass extends UserType {
     usertypes(underlyingElement(this),_,9)
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "ProxyClass" }
 
   /** Gets the location of the proxy class. */

cpp/ql/src/semmle/code/cpp/Enum.qll

@@ -9,7 +9,6 @@ class Enum extends UserType, IntegralOrEnumType {
   EnumConstant getAnEnumConstant() { result.getDeclaringEnum() = this }
   EnumConstant getEnumConstant(int index) { enumconstants(unresolveElement(result),underlyingElement(this),index,_,_,_) }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "Enum" }
 
   /**
@@ -53,7 +52,7 @@ class LocalEnum extends Enum {
   LocalEnum() {
     isLocal()
   }
-  /** Canonical QL class corresponding to this element. */
+
   override string getCanonicalQLClass() { result = "LocalEnum" }
 }
 
@@ -66,7 +65,6 @@ class NestedEnum extends Enum {
     this.isMember()
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "NestedEnum" }
 
   /** Holds if this member is private. */
@@ -89,7 +87,7 @@ class ScopedEnum extends Enum {
   ScopedEnum() {
     usertypes(underlyingElement(this),_,13)
   }
-  /** Canonical QL class corresponding to this element. */
+
   override string getCanonicalQLClass() { result = "ScopedEnum" }
 }
 
@@ -106,7 +104,6 @@ class EnumConstant extends Declaration, @enumconstant {
    */
   Enum getDeclaringEnum() { enumconstants(underlyingElement(this),unresolveElement(result),_,_,_,_) }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "EnumConstant" }
 
   override Class getDeclaringType() {

cpp/ql/src/semmle/code/cpp/Function.qll

@@ -503,6 +503,8 @@ class FunctionDeclarationEntry extends DeclarationEntry, @fun_decl {
   /** Gets the function which is being declared or defined. */
   override Function getDeclaration() { result = getFunction() }
 
+  override string getCanonicalQLClass() { result = "FunctionDeclarationEntry" }
+
   /** Gets the function which is being declared or defined. */
   Function getFunction() { fun_decls(underlyingElement(this),unresolveElement(result),_,_,_) }
 
@@ -707,7 +709,7 @@ class TopLevelFunction extends Function {
   TopLevelFunction() {
     not this.isMember()
   }
-  /** Canonical QL class corresponding to this element. */
+
   override string getCanonicalQLClass() { result = "TopLevelFunction" }
 }
 
@@ -720,7 +722,6 @@ class MemberFunction extends Function {
     this.isMember()
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "MemberFunction" }
 
   /**
@@ -774,7 +775,6 @@ class VirtualFunction extends MemberFunction {
     this.hasSpecifier("virtual") or purefunctions(underlyingElement(this))
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "VirtualFunction" }
 
   /** Holds if this virtual function is pure. */
@@ -794,7 +794,6 @@ class PureVirtualFunction extends VirtualFunction {
 
   PureVirtualFunction() { purefunctions(underlyingElement(this)) }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "PureVirtualFunction" }
 }
 
@@ -807,7 +806,6 @@ class ConstMemberFunction extends MemberFunction {
 
   ConstMemberFunction() { this.hasSpecifier("const") }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "ConstMemberFunction" }
 }
 
@@ -818,7 +816,6 @@ class Constructor extends MemberFunction {
 
   Constructor() { functions(underlyingElement(this),_,2) }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "Constructor" }
 
   /**
@@ -866,7 +863,6 @@ class ConversionConstructor extends Constructor, ImplicitConversionFunction {
     and not(this instanceof CopyConstructor)
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "ConversionConstructor" }
 
   /** Gets the type this `ConversionConstructor` takes as input. */
@@ -924,7 +920,6 @@ class CopyConstructor extends Constructor {
     not exists(getATemplateArgument())
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "CopyConstructor" }
 
   /**
@@ -975,7 +970,6 @@ class MoveConstructor extends Constructor {
     not exists(getATemplateArgument())
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "MoveConstructor" }
 
   /**
@@ -1010,7 +1004,6 @@ class NoArgConstructor extends Constructor {
 class Destructor extends MemberFunction {
   Destructor() { functions(underlyingElement(this),_,3) }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "Destructor" }
 
   /**
@@ -1038,6 +1031,8 @@ class ConversionOperator extends MemberFunction, ImplicitConversionFunction {
 
   ConversionOperator() { functions(underlyingElement(this),_,4) }
 
+  override string getCanonicalQLClass() { result = "ConversionOperator" }
+
   override Type getSourceType() { result = this.getDeclaringType() }
   override Type getDestType() { result = this.getType() }
 
@@ -1050,6 +1045,7 @@ class Operator extends Function {
 
   Operator() { functions(underlyingElement(this),_,5) }
 
+  override string getCanonicalQLClass() { result = "Operator" }
 }
 
 /**
@@ -1072,7 +1068,7 @@ class CopyAssignmentOperator extends Operator {
     not exists(this.getParameter(1)) and
     not exists(getATemplateArgument())
   }
-  /** Canonical QL class corresponding to this element. */
+
   override string getCanonicalQLClass() { result = "CopyAssignmentOperator" }
 }
 
@@ -1093,7 +1089,7 @@ class MoveAssignmentOperator extends Operator {
     not exists(this.getParameter(1)) and
     not exists(getATemplateArgument())
   }
-  /** Canonical QL class corresponding to this element. */
+
   override string getCanonicalQLClass() { result = "MoveAssignmentOperator" }
 }
 
@@ -1115,7 +1111,6 @@ class MoveAssignmentOperator extends Operator {
 class TemplateFunction extends Function {
   TemplateFunction() { is_function_template(underlyingElement(this)) and exists(getATemplateArgument()) }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "TemplateFunction" }
   /**
    * Gets a compiler-generated instantiation of this function template.
@@ -1148,7 +1143,6 @@ class FunctionTemplateInstantiation extends Function {
     tf.getAnInstantiation() = this
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "FunctionTemplateInstantiation" }
 
   /**
@@ -1187,7 +1181,6 @@ class FunctionTemplateSpecialization extends Function {
     this.isSpecialization()
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "FunctionTemplateSpecialization" }
 
   /**

cpp/ql/src/semmle/code/cpp/Initializer.qll

@@ -6,7 +6,6 @@ import semmle.code.cpp.controlflow.ControlFlowGraph
 class Initializer extends ControlFlowNode, @initialiser {
   override Location getLocation() { initialisers(underlyingElement(this),_,_,result) }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "Initializer" }
 
   /** Holds if this initializer is explicit in the source. */

cpp/ql/src/semmle/code/cpp/Parameter.qll

@@ -33,7 +33,6 @@ class Parameter extends LocalScopeVariable, @parameter {
      result = "p#" + this.getIndex().toString())
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "Parameter" }
 
   /**

cpp/ql/src/semmle/code/cpp/PrintAST.qll

@@ -153,10 +153,10 @@ class PrintASTNode extends TPrintASTNode {
 /**
  * Retrieves the canonical QL class for entity `el`
  */
-private string qlClass(ElementBase el) { result = "[" + el.getCanonicalQLClass() + "]: " }
+private string qlClass(ElementBase el) { result = "[" + concat(el.getCanonicalQLClass(), ",") + "] " }
 
 // Do not delete this - it is useful for QL class discovery
-//private string qlClass(ElementBase el) { result = "["+ concat(el.getAQlClass(), ",") + "]: " }
+//private string qlClass(ElementBase el) { result = "["+ concat(el.getAQlClass(), ",") + "] " }
 /**
  * A node representing an AST node.
  */

cpp/ql/src/semmle/code/cpp/Struct.qll

@@ -8,7 +8,6 @@ class Struct extends Class {
 
   Struct() { usertypes(underlyingElement(this),_,1) or usertypes(underlyingElement(this),_,3) }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "Struct" }
 
   override string explain() { result =  "struct " + this.getName() }
@@ -23,7 +22,7 @@ class LocalStruct extends Struct {
   LocalStruct() {
     isLocal()
   }
-  /** Canonical QL class corresponding to this element. */
+
   override string getCanonicalQLClass() { result = "LocalStruct" }
 }
 
@@ -35,7 +34,6 @@ class NestedStruct extends Struct {
     this.isMember()
   }
 
-  /** Canonical QL class corresponding to this element. */
   override string getCanonicalQLClass() { result = "NestedStruct" }
 
   /** Holds if this member is private. */