Merge pull request github#3514 from hvitved/csharp/remove-more-deprecated

C#: Remove more deprecated classes and predicates

Author: calumgrant

csharp/ql/src/csharp.qll

@@ -35,11 +35,5 @@ import semmle.code.csharp.dataflow.DataFlow
 import semmle.code.csharp.dataflow.TaintTracking
 import semmle.code.csharp.dataflow.SSA
 
-/** DEPRECATED: Use `ControlFlow` instead. */
-deprecated module ControlFlowGraph {
-  import semmle.code.csharp.controlflow.ControlFlowGraph
-  import ControlFlow
-}
-
 /** Whether the source was extracted without a build command. */
 predicate extractionIsStandalone() { exists(SourceFile f | f.extractedStandalone()) }

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

@@ -25,12 +25,6 @@ class Callable extends DotNet::Callable, Parameterizable, ExprOrStmtParent, @cal
   /** Gets the annotated return type of this callable. */
   final AnnotatedType getAnnotatedReturnType() { result.appliesTo(this) }
 
-  /** DEPRECATED: Use `getAnnotatedReturnType().isRef()` instead. */
-  deprecated predicate returnsRef() { this.getAnnotatedReturnType().isRef() }
-
-  /** DEPRECATED: Use `getAnnotatedReturnType().isReadonlyRef()` instead. */
-  deprecated predicate returnsRefReadonly() { this.getAnnotatedReturnType().isReadonlyRef() }
-
   override Callable getSourceDeclaration() { result = Parameterizable.super.getSourceDeclaration() }
 
   /**

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

@@ -197,24 +197,6 @@ class TypeParameter extends DotNet::TypeParameter, Type, @type_parameter {
  * ```
  */
 class TypeParameterConstraints extends Element, @type_parameter_constraints {
-  /**
-   * DEPRECATED: Use `getATypeConstraint()` instead.
-   * Gets a specific interface constraint, if any.
-   */
-  deprecated Interface getAnInterfaceConstraint() { result = getATypeConstraint() }
-
-  /**
-   * DEPRECATED: Use `getATypeConstraint()` instead.
-   * Gets a specific type parameter constraint, if any.
-   */
-  deprecated TypeParameter getATypeParameterConstraint() { result = getATypeConstraint() }
-
-  /**
-   * DEPRECATED: Use `getATypeConstraint()` instead.
-   * Gets the specific class constraint, if any.
-   */
-  deprecated Class getClassConstraint() { result = getATypeConstraint() }
-
   /** Gets a specific type constraint, if any. */
   Type getATypeConstraint() { specific_type_parameter_constraints(this, getTypeRef(result)) }
 

csharp/ql/src/semmle/code/csharp/Stmt.qll

@@ -178,9 +178,6 @@ class SwitchStmt extends SelectionStmt, Switch, @switch_stmt {
   /** Gets the default case of this `switch` statement, if any. */
   DefaultCase getDefaultCase() { result = this.getACase() }
 
-  /** Gets a type case of this `switch` statement, if any. */
-  deprecated TypeCase getATypeCase() { result = this.getACase() }
-
   override string toString() { result = "switch (...) {...}" }
 
   /**
@@ -310,73 +307,6 @@ class ConstCase extends CaseStmt, LabeledStmt {
   override string toString() { result = CaseStmt.super.toString() }
 }
 
-/**
- * A type matching case in a `switch` statement, for example `case int i:` on line 3 or
- * `case string s when s.Length > 0:` on line 4 in
- *
- * ```
- * switch(p)
- * {
- *     case int i:
- *     case string s when s.Length > 0:
- *         break;
- *     ...
- * }
- * ```
- */
-deprecated class TypeCase extends CaseStmt {
-  private TypeAccess ta;
-
-  TypeCase() { expr_parent(ta, 1, this) }
-
-  /**
-   * Gets the local variable declaration of this type case, if any. For example,
-   * the local variable declaration of the type case on line 3 is `string s` in
-   *
-   * ```
-   * switch(p) {
-   *   case int i:
-   *   case string s when s.Length>0:
-   *     break;
-   *   case bool _:
-   *     break;
-   *   ...
-   * }
-   * ```
-   */
-  LocalVariableDeclExpr getVariableDeclExpr() { result = this.getPattern() }
-
-  /**
-   * Gets the type access of this case, for example access to `string` or
-   * access to `int` in
-   *
-   * ```
-   * switch(p) {
-   *   case int i:
-   *   case string s when s.Length>0:
-   *     break;
-   *   ...
-   * }
-   * ```
-   */
-  TypeAccess getTypeAccess() { result = ta }
-
-  /**
-   * Gets the type being checked by this case. For example, the type being checked
-   * by the type case on line 3 is `string` in
-   *
-   * ```
-   * switch(p) {
-   *   case int i:
-   *   case string s when s.Length>0:
-   *     break;
-   *   ...
-   * }
-   * ```
-   */
-  Type getCheckedType() { result = this.getTypeAccess().getType() }
-}
-
 /**
  * A default case of a `switch` statement, for example `default:` on
  * line 3 in

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

@@ -769,12 +769,6 @@ class DelegateType extends RefType, Parameterizable, @delegate_type {
 
   /** Gets the annotated return type of this delegate. */
   AnnotatedType getAnnotatedReturnType() { result.appliesTo(this) }
-
-  /** Holds if this delegate returns a `ref`. */
-  deprecated predicate returnsRef() { this.getAnnotatedReturnType().isRef() }
-
-  /** Holds if this delegate returns a `ref readonly`. */
-  deprecated predicate returnsRefReadonly() { this.getAnnotatedReturnType().isReadonlyRef() }
 }
 
 /**

csharp/ql/src/semmle/code/csharp/dataflow/flowsources/PublicCallableParameter.qll

@@ -1,6 +1,4 @@
 /**
- * DEPRECATED.
- *
  * Provides classes representing data flow sources for parameters of public callables.
  */
 

csharp/ql/src/semmle/code/csharp/exprs/Expr.qll

@@ -441,65 +441,6 @@ class IsExpr extends Expr, PatternMatch, @is_expr {
   override string toString() { result = "... is ..." }
 }
 
-/** An `is` type expression, for example, `x is string` or `x is string s`. */
-deprecated class IsTypeExpr extends IsExpr {
-  TypeAccess typeAccess;
-
-  IsTypeExpr() { typeAccess = this.getChild(1) }
-
-  /**
-   * Gets the type being accessed in this `is` expression, for example `string`
-   * in `x is string`.
-   */
-  Type getCheckedType() { result = typeAccess.getTarget() }
-
-  /**
-   * Gets the type access in this `is` expression, for example `string` in
-   * `x is string`.
-   */
-  TypeAccess getTypeAccess() { result = typeAccess }
-}
-
-/** An `is` pattern expression, for example `x is string s`. */
-deprecated class IsPatternExpr extends IsExpr {
-  LocalVariableDeclExpr typeDecl;
-
-  IsPatternExpr() { typeDecl = this.getChild(2) }
-
-  /**
-   * Gets the local variable declaration in this `is` pattern expression.
-   * For example `string s` in `x is string s`.
-   */
-  LocalVariableDeclExpr getVariableDeclExpr() { result = typeDecl }
-
-  /**
-   * Gets the type being accessed in this `is` expression, for example `string`
-   * in `x is string`.
-   */
-  Type getCheckedType() { result = getTypeAccess().getTarget() }
-
-  /**
-   * Gets the type access in this `is` expression, for example `string` in
-   * `x is string`.
-   */
-  TypeAccess getTypeAccess() { result = this.getChild(1) }
-}
-
-/**
- * An `is` constant expression, for example `x is 5`.
- */
-deprecated class IsConstantExpr extends IsExpr {
-  ConstantPatternExpr constant;
-
-  IsConstantExpr() { constant = this.getPattern() }
-
-  /** Gets the constant expression, for example `5` in `x is 5`. */
-  Expr getConstant() { result = constant }
-
-  /** Gets the value of the constant, for example 5 in `x is 5`. */
-  string getConstantValue() { result = constant.getValue() }
-}
-
 /** A `switch` expression or statement. */
 class Switch extends ControlFlowElement, @switch {
   /** Gets the `i`th case of this `switch`. */