PS: Fixup the corresponding QL to match the state of the dbscheme.

Author: MathiasVP

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

@@ -3,7 +3,7 @@ import powershell
 class Ast extends @ast {
   string toString() { none() }
 
-  Ast getParent() { parent(this, result) } // TODO: Flip parent and child in relation in the extractor
+  Ast getParent() { parent(this, result) }
 
   Location getLocation() { none() }
 }

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

@@ -5,13 +5,15 @@ class CatchClause extends @catch_clause, Ast {
 
   override string toString() { result = "catch {...}" }
 
-  StmtBlock getBody() { catch_clause(this, result, _) } // TODO: Change @ast to @stmt_block in dbscheme
+  StmtBlock getBody() { catch_clause(this, result, _) }
 
-  TypeConstraint getCatchType(int i) { catch_clause_catch_type(this, i, result) } // TODO: Change @ast to @type_constraint in dbscheme
+  TypeConstraint getCatchType(int i) { catch_clause_catch_type(this, i, result) }
+
+  int getNumberOfCatchTypes() { result = count(this.getACatchType()) }
 
   TypeConstraint getACatchType() { result = this.getCatchType(_) }
 
-  predicate isCatchAll() { catch_clause(this, _, true) } // TODO: Should be equivalent to not exists(this.getACatchType())
+  predicate isCatchAll() { not exists(this.getACatchType()) }
 
   TryStmt getTryStmt() { result.getACatchClause() = this }
 }

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

@@ -5,9 +5,9 @@ class Configuration extends @configuration_definition, Stmt {
 
   override string toString() { result = "Configuration" }
 
-  Expr getName() { configuration_definition(this, _, _, result) } // TODO: Change @ast to @expression in dbscheme
+  Expr getName() { configuration_definition(this, _, _, result) }
 
-  ScriptBlockExpr getBody() { configuration_definition(this, result, _, _) } // TODO: Change @ast to @script_block in dbscheme
+  ScriptBlockExpr getBody() { configuration_definition(this, result, _, _) }
 
   predicate isMeta() { configuration_definition(this, _, 1, _) }
 

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

@@ -11,5 +11,5 @@ class DataStmt extends @data_statement, Stmt {
 
   Expr getACmdAllowed() { result = this.getCmdAllowed(_) }
 
-  StmtBlock getBody() { data_statement(this, result) } // TODO: Change @ast to @stmt_block in dbscheme
+  StmtBlock getBody() { data_statement(this, result) }
 }

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

@@ -5,7 +5,7 @@ class DoUntilStmt extends @do_until_statement, LoopStmt {
 
   override string toString() { result = "DoUntil" }
 
-  PipelineBase getCondition() { do_until_statement_condition(this, result) } // TODO: Change @ast to @pipeline_base in dbscheme
+  PipelineBase getCondition() { do_until_statement_condition(this, result) }
 
-  final override StmtBlock getBody() { do_until_statement(this, result) } // TODO: Change @ast to @stmt_block in dbscheme
+  final override StmtBlock getBody() { do_until_statement(this, result) }
 }

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

@@ -5,7 +5,7 @@ class DoWhileStmt extends @do_while_statement, LoopStmt {
 
   override string toString() { result = "DoWhile" }
 
-  PipelineBase getCondition() { do_while_statement_condition(this, result) } // TODO: Change @ast to @pipeline_base in dbscheme
+  PipelineBase getCondition() { do_while_statement_condition(this, result) }
 
-  final override StmtBlock getBody() { do_while_statement(this, result) } // TODO: Change @ast to @stmt_block in dbscheme
+  final override StmtBlock getBody() { do_while_statement(this, result) }
 }

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

@@ -6,7 +6,7 @@ class ExitStmt extends @exit_statement, Stmt {
   override string toString() { if this.hasPipeline() then result = "exit ..." else result = "exit" }
 
   /** ..., if any. */
-  PipelineBase getPipeline() { exit_statement_pipeline(this, result) } // TODO: Change @ast to @pipeline_base in dbscheme
+  PipelineBase getPipeline() { exit_statement_pipeline(this, result) }
 
   predicate hasPipeline() { exists(this.getPipeline()) }
 }

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

@@ -5,11 +5,11 @@ class ForEachStmt extends @foreach_statement, LoopStmt {
 
   override string toString() { result = "forach(... in ...)" }
 
-  final override StmtBlock getBody() { foreach_statement(this, _, _, result, _) } // TODO: Change @ast to @stmt_block in dbscheme
+  final override StmtBlock getBody() { foreach_statement(this, _, _, result, _) }
 
-  VarAccess getVariable() { foreach_statement(this, result, _, _, _) } // TODO: Change @ast to @variable_expression in dbscheme
+  VarAccess getVariable() { foreach_statement(this, result, _, _, _) }
 
-  PipelineBase getIterableExpr() { foreach_statement(this, _, result, _, _) } // TODO: Change @ast to @pipeline_base in dbscheme
+  PipelineBase getIterableExpr() { foreach_statement(this, _, result, _, _) }
 
   predicate isParallel() { foreach_statement(this, _, _, _, 1) }
 }

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

@@ -5,11 +5,11 @@ class ForStmt extends @for_statement, LoopStmt {
 
   override string toString() { result = "for(...;...;...)" }
 
-  PipelineBase getInitializer() { for_statement_initializer(this, result) } // TODO: Change @ast to @pipeline_base in dbscheme
+  PipelineBase getInitializer() { for_statement_initializer(this, result) }
 
-  PipelineBase getCondition() { for_statement_condition(this, result) } // TODO: Change @ast to @pipeline_base in dbscheme
+  PipelineBase getCondition() { for_statement_condition(this, result) }
 
-  PipelineBase getIterator() { for_statement_iterator(this, result) } // TODO: Change @ast to @pipeline_base in dbscheme
+  PipelineBase getIterator() { for_statement_iterator(this, result) }
 
-  final override StmtBlock getBody() { for_statement(this, result) } // TODO: Change @ast to @stmt_block in dbscheme
+  final override StmtBlock getBody() { for_statement(this, result) }
 }

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

@@ -1,8 +1,8 @@
 import powershell
 
 /** A `break` or `continue` statement. */
-class GotoStmt extends @labelled_statement, Stmt { // TODO: Rename @labelled_statement to @goto_statement
+class GotoStmt extends @labelled_statement, Stmt {
 
   /** ..., if any. */
-  Expr getLabel() { statement_label(this, result) } // TODO: Replace @ast with @expression
+  Expr getLabel() { statement_label(this, result) }
 }