PS: Merge the non-member function and member function classes. Also rename member function to 'Method' since that's the name used by Powershell documentation.

Author: MathiasVP

powershell/ql/lib/semmle/code/powershell/Function.qll

@@ -2,32 +2,58 @@ import powershell
 import semmle.code.powershell.controlflow.BasicBlocks
 
 abstract private class AbstractFunction extends Ast {
+  /** Gets the name of this function. */
   abstract string getName();
 
+  /** Holds if this function has name `name`. */
   final predicate hasName(string name) { this.getName() = name }
 
+  /** Gets the body of this function. */
   abstract ScriptBlock getBody();
 
+  /**
+   * Gets the i'th function parameter, if any.
+   *
+   * Note that this predicate only returns _function_ parameters.
+   * To also get _block_ parameters use the `getParameter` predicate.
+   */
   abstract Parameter getFunctionParameter(int i);
 
+  /** Gets the declaring type of this function, if any. */
+  abstract Type getDeclaringType();
+
+  /**
+   * Gets any function parameter of this function.
+   *
+   * Note that this only gets _function_ paramters. To get any parameter
+   * use the `getAParameter` predicate.
+   */
   final Parameter getAFunctionParameter() { result = this.getFunctionParameter(_) }
 
+  /** Gets the number of function parameters. */
   final int getNumberOfFunctionParameters() { result = count(this.getAFunctionParameter()) }
 
+  /** Gets the number of parameters (both function and block). */
   final int getNumberOfParameters() { result = count(this.getAParameter()) }
 
+  /** Gets the i'th parameter of this function, if any. */
   final Parameter getParameter(int i) {
     result = this.getFunctionParameter(i)
     or
     result = this.getBody().getParamBlock().getParameter(i)
   }
 
+  /** Gets any parameter of this function. */
   final Parameter getAParameter() { result = this.getParameter(_) }
 
+  /** Gets the entry point of this function in the control-flow graph. */
   EntryBasicBlock getEntryBasicBlock() { result.getScope() = this.getBody() }
 }
 
-class NonMemberFunction extends @function_definition, Stmt, AbstractFunction {
+/**
+ * A function definition.
+ */
+private class FunctionBase extends @function_definition, Stmt, AbstractFunction {
   override string toString() { result = this.getName() }
 
   override SourceLocation getLocation() { function_definition_location(this, result) }
@@ -41,34 +67,32 @@ class NonMemberFunction extends @function_definition, Stmt, AbstractFunction {
   predicate isWorkflow() { function_definition(this, _, _, _, true) }
 
   override Parameter getFunctionParameter(int i) { result.isFunctionParameter(this, i) }
-}
-
-class MemberFunction extends @function_member, Member, AbstractFunction {
-  override string getName() { function_member(this, _, _, _, _, _, _, result, _) }
-
-  override SourceLocation getLocation() { function_member_location(this, result) }
-
-  override string toString() { result = this.getName() }
 
-  override ScriptBlock getBody() { function_member(this, result, _, _, _, _, _, _, _) }
-
-  override predicate isHidden() { function_member(this, _, _, true, _, _, _, _, _) }
-
-  override predicate isPrivate() { function_member(this, _, _, _, true, _, _, _, _) }
+  override Type getDeclaringType() { none() }
+}
 
-  override predicate isPublic() { function_member(this, _, _, _, _, true, _, _, _) }
+private predicate isMethod(Member m, ScriptBlock body) {
+  function_member(m, body, _, _, _, _, _, _, _)
+}
 
-  override predicate isStatic() { function_member(this, _, _, _, _, _, true, _, _) }
+/**
+ * A method definition. That is, a function defined inside a class definition.
+ */
+class Method extends FunctionBase {
+  Method() { isMethod(_, super.getBody()) }
 
-  predicate isConstructor() { function_member(this, _, true, _, _, _, _, _, _) }
+  /** Gets the member corresponding to this function definition. */
+  Member getMember() { isMethod(result, super.getBody()) }
 
-  override Parameter getFunctionParameter(int i) { result.isFunctionParameter(this, i) }
+  /** Holds if this method is a constructor. */
+  predicate isConstructor() { function_member(this.getMember(), _, true, _, _, _, _, _, _) }
 
-  TypeConstraint getTypeConstraint() { function_member_return_type(this, result) }
+  final override Type getDeclaringType() { result = this.getMember().getDeclaringType() }
 }
 
-class Constructor extends MemberFunction {
+/** A constructor definition. */
+class Constructor extends Method {
   Constructor() { this.isConstructor() }
 }
 
-final class Function = AbstractFunction;
+final class Function = FunctionBase;

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

@@ -11,10 +11,15 @@ class Type extends @type_definition, Stmt {
 
   Member getAMember() { result = this.getMember(_) }
 
-  MemberFunction getMemberFunction(string name) {
-    result = this.getAMember() and
+  Method getMethod(string name) {
+    result.getMember() = this.getAMember() and
     result.hasName(name)
   }
 
-  MemberFunction getAMemberFunction() { result = this.getMemberFunction(_) }
+  Constructor getAConstructor() {
+    result = this.getAMethod() and
+    result.getName() = this.getName()
+  }
+
+  Method getAMethod() { result = this.getMethod(_) }
 }

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

@@ -4,8 +4,6 @@ private import internal.Internal as Internal
 
 private predicate isFunctionParameterImpl(Internal::Parameter p, Function f, int i) {
   function_definition_parameter(f, i, p)
-  or
-  function_member_parameter(f, i, p)
 }
 
 private predicate hasParameterBlockImpl(Internal::Parameter p, ParamBlock block, int i) {