PS: Refactor the way we do 'internal' AST related classes.

Author: MathiasVP

powershell/ql/lib/powershell.qll

@@ -79,4 +79,5 @@ import semmle.code.powershell.IndexExpr
 import semmle.code.powershell.HashTable
 import semmle.code.powershell.SplitExpr
 import semmle.code.powershell.CommentEntity
-import semmle.code.powershell.Variable
+import semmle.code.powershell.Variable
+import semmle.code.powershell.internal.Internal::Public

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

@@ -65,30 +65,3 @@ class Cmd extends @command, CmdBase {
 
   Redirection getARedirection() { result = this.getRedirection(_) }
 }
-
-/**
- * An argument to a command.
- *
- * The argument may be named or positional.
- */
-class Argument extends Expr {
-  Cmd cmd;
-
-  Argument() { cmd.getAnArgument() = this }
-
-  Cmd getCmd() { result = cmd }
-
-  int getPosition() { cmd.getPositionalArgument(result) = this }
-
-  string getName() { cmd.getNamedArgument(result) = this }
-}
-
-/** A positional argument to a command. */
-class PositionalArgument extends Argument {
-  PositionalArgument() { not this instanceof NamedArgument }
-}
-
-/** A named argument to a command. */
-class NamedArgument extends Argument {
-  NamedArgument() { this = cmd.getNamedArgument(_) }
-}

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

@@ -1,5 +1,5 @@
 import powershell
-private import internal.ExplicitWrite
+private import internal.ExplicitWrite::Private
 
 class IndexExpr extends @index_expression, Expr {
   override string toString() { result = "...[...]" }

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

@@ -1,6 +1,6 @@
 private import powershell
 private import semmle.code.powershell.controlflow.internal.Scope
-private import internal.Internal as Internal
+private import internal.Parameter::Private as Internal
 
 private predicate isFunctionParameterImpl(Internal::Parameter p, Function f, int i) {
   function_definition_parameter(f, i, p)

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

@@ -1,5 +1,5 @@
 import powershell
-private import internal.ExplicitWrite
+private import internal.ExplicitWrite::Private
 
 private predicate isParameterName(@variable_expression ve) { parameter(_, ve, _, _) }
 

powershell/ql/lib/semmle/code/powershell/internal/ExplicitWrite.qll

@@ -1,15 +1,19 @@
 private import powershell
 
-/**
- * Holds if `e` is written to by `assign`.
- *
- * Note there may be more than one `e` for which `isExplicitWrite(e, assign)`
- * holds if the left-hand side is an array literal.
- */
-predicate isExplicitWrite(Expr e, AssignStmt assign) {
-  e = assign.getLeftHandSide()
-  or
-  e = any(ConvertExpr convert | isExplicitWrite(convert, assign)).getExpr()
-  or
-  e = any(ArrayLiteral array | isExplicitWrite(array, assign)).getAnElement()
+module Private {
+  /**
+   * Holds if `e` is written to by `assign`.
+   *
+   * Note there may be more than one `e` for which `isExplicitWrite(e, assign)`
+   * holds if the left-hand side is an array literal.
+   */
+  predicate isExplicitWrite(Expr e, AssignStmt assign) {
+    e = assign.getLeftHandSide()
+    or
+    e = any(ConvertExpr convert | isExplicitWrite(convert, assign)).getExpr()
+    or
+    e = any(ArrayLiteral array | isExplicitWrite(array, assign)).getAnElement()
+  }
 }
+
+module Public { }

powershell/ql/lib/semmle/code/powershell/internal/Internal.qll

@@ -1,2 +1,9 @@
-import Parameter
-import ExplicitWrite
+module Private {
+  import Parameter::Private
+  import ExplicitWrite::Private
+}
+
+module Public {
+  import Parameter::Public
+  import ExplicitWrite::Public
+}

powershell/ql/lib/semmle/code/powershell/internal/Parameter.qll

@@ -1,24 +1,28 @@
 import powershell
 
-class Parameter extends @parameter, Ast {
-  override string toString() { result = this.getName().toString() }
-
-  string getName() {
-    exists(@variable_expression ve |
-      parameter(this, ve, _, _) and
-      variable_expression(ve, result, _, _, _, _, _, _, _, _, _, _)
-    )
-  }
+module Private {
+  class Parameter extends @parameter, Ast {
+    override string toString() { result = this.getName().toString() }
+
+    string getName() {
+      exists(@variable_expression ve |
+        parameter(this, ve, _, _) and
+        variable_expression(ve, result, _, _, _, _, _, _, _, _, _, _)
+      )
+    }
 
-  string getStaticType() { parameter(this, _, result, _) }
+    string getStaticType() { parameter(this, _, result, _) }
 
-  int getNumAttributes() { parameter(this, _, _, result) }
+    int getNumAttributes() { parameter(this, _, _, result) }
 
-  AttributeBase getAttribute(int i) { parameter_attribute(this, i, result) }
+    AttributeBase getAttribute(int i) { parameter_attribute(this, i, result) }
 
-  AttributeBase getAnAttribute() { result = this.getAttribute(_) }
+    AttributeBase getAnAttribute() { result = this.getAttribute(_) }
 
-  Expr getDefaultValue() { parameter_default_value(this, result) }
+    Expr getDefaultValue() { parameter_default_value(this, result) }
 
-  override SourceLocation getLocation() { parameter_location(this, result) }
+    override SourceLocation getLocation() { parameter_location(this, result) }
+  }
 }
+
+module Public { }