PS: Create a common subclass for non-member and member functions.

Author: MathiasVP

powershell/ql/lib/powershell.qll

@@ -47,7 +47,7 @@ import semmle.code.powershell.UsingStmt
 import semmle.code.powershell.Type
 import semmle.code.powershell.Member
 import semmle.code.powershell.PropertyMember
-import semmle.code.powershell.FunctionMember
+import semmle.code.powershell.Function
 import semmle.code.powershell.TryStmt
 import semmle.code.powershell.IfStmt
 import semmle.code.powershell.ExitStmt
@@ -65,6 +65,5 @@ import semmle.code.powershell.ParenExpression
 import semmle.code.powershell.Chainable
 import semmle.code.powershell.Pipeline
 import semmle.code.powershell.StringConstantExpression
-import semmle.code.powershell.FunctionDefinition
 import semmle.code.powershell.InvokeMemberExpression
 import semmle.code.powershell.CommentEntity

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

@@ -0,0 +1,69 @@
+import powershell
+
+abstract private class AbstractFunction extends Ast {
+  abstract string getName();
+
+  abstract ScriptBlock getBody();
+
+  abstract Parameter getFunctionParameter(int i);
+
+  final Parameter getAFunctionParameter() { result = this.getFunctionParameter(_) }
+
+  final int getNumberOfFunctionParameters() { result = count(this.getAFunctionParameter()) }
+
+  final int getNumberOfParameters() { result = count(this.getAParameter()) }
+
+  final Parameter getParameter(int i) {
+    result = this.getFunctionParameter(i)
+    or
+    result = this.getBody().getParamBlock().getParameter(i)
+  }
+
+  final Parameter getAParameter() { result = this.getParameter(_) }
+}
+
+class NonMemberFunction extends @function_definition, Stmt, AbstractFunction {
+  override string toString() { result = this.getName() }
+
+  override SourceLocation getLocation() { function_definition_location(this, result) }
+
+  override string getName() { function_definition(this, _, result, _, _) }
+
+  override ScriptBlock getBody() { function_definition(this, result, _, _, _) }
+
+  predicate isFilter() { function_definition(this, _, _, true, _) }
+
+  predicate isWorkflow() { function_definition(this, _, _, _, true) }
+
+  override Parameter getFunctionParameter(int i) { function_definition_parameter(this, i, result) }
+}
+
+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 predicate isPublic() { function_member(this, _, _, _, _, true, _, _, _) }
+
+  override predicate isStatic() { function_member(this, _, _, _, _, _, true, _, _) }
+
+  predicate isConstructor() { function_member(this, _, true, _, _, _, _, _, _) }
+
+  override Parameter getFunctionParameter(int i) { function_member_parameter(this, i, result) }
+
+  TypeConstraint getTypeConstraint() { function_member_return_type(this, result) }
+}
+
+class Constructor extends MemberFunction {
+  Constructor() { this.isConstructor() }
+}
+
+final class Function = AbstractFunction;