PS: Use shorter and more standard names.

MathiasVP · MathiasVP · commit 023c88a07337 · 2024-08-26T18:54:51.000+01:00
diff --git a/powershell/ql/lib/semmle/code/powershell/ArrayExpression.qll b/powershell/ql/lib/semmle/code/powershell/ArrayExpression.qll
@@ -1,9 +1,9 @@
 import powershell
 
-class ArrayExpression extends @array_expression, Expression {
+class ArrayExpr extends @array_expression, Expr {
   override SourceLocation getLocation() { array_expression_location(this, result) }
 
-  StatementBlock getStatementBlock() { array_expression(this, result) }
+  StmtBlock getStatementBlock() { array_expression(this, result) }
 
   override string toString() { result = "ArrayExpression at: " + this.getLocation().toString() }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/ArrayLiteral.qll b/powershell/ql/lib/semmle/code/powershell/ArrayLiteral.qll
@@ -1,11 +1,11 @@
 import powershell
 
-class ArrayLiteral extends @array_literal, Expression {
+class ArrayLiteral extends @array_literal, Expr {
   override SourceLocation getLocation() { array_literal_location(this, result) }
 
-  Expression getElement(int index) { array_literal_element(this, index, result) }
+  Expr getElement(int index) { array_literal_element(this, index, result) }
 
-  Expression getAnElement() { array_literal_element(this, _, result) }
+  Expr getAnElement() { array_literal_element(this, _, result) }
 
   override string toString() { result = "ArrayLiteral at: " + this.getLocation().toString() }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/AssignmentStatement.qll b/powershell/ql/lib/semmle/code/powershell/AssignmentStatement.qll
@@ -1,13 +1,13 @@
 import powershell
 
-class AssignmentStatement extends @assignment_statement, Statement {
+class AssignStmt extends @assignment_statement, Stmt {
   override SourceLocation getLocation() { assignment_statement_location(this, result) }
 
   int getKind() { assignment_statement(this, result, _, _) }
 
-  Expression getLeftHandSide() { assignment_statement(this, _, result, _) }
+  Expr getLeftHandSide() { assignment_statement(this, _, result, _) }
 
-  Statement getRightHandSide() { assignment_statement(this, _, _, result) }
+  Stmt getRightHandSide() { assignment_statement(this, _, _, result) }
 
   override string toString() { result = "AssignmentStatement at: " + this.getLocation().toString() }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/Attribute.qll b/powershell/ql/lib/semmle/code/powershell/Attribute.qll
@@ -15,7 +15,7 @@ class Attribute extends @attribute, AttributeBase {
 
   NamedAttributeArgument getANamedArgument() { result = this.getNamedArgument(_) }
 
-  Expression getPositionalArgument(int i) { attribute_positional_argument(this, i, result) }
+  Expr getPositionalArgument(int i) { attribute_positional_argument(this, i, result) }
 
-  Expression getAPositionalArgument() { result = this.getPositionalArgument(_) }
+  Expr getAPositionalArgument() { result = this.getPositionalArgument(_) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/BaseConstantExpression.qll b/powershell/ql/lib/semmle/code/powershell/BaseConstantExpression.qll
@@ -1,3 +1,3 @@
 import powershell
 
-class BaseConstantExpression extends @base_constant_expression, Expression { }
+class BaseConstExpr extends @base_constant_expression, Expr { }
diff --git a/powershell/ql/lib/semmle/code/powershell/BinaryExpression.qll b/powershell/ql/lib/semmle/code/powershell/BinaryExpression.qll
@@ -1,15 +1,15 @@
 import powershell
 
-class BinaryExpression extends @binary_expression, Expression {
+class BinaryExpr extends @binary_expression, Expr {
   override string toString() {
     result = "...+..." // TODO
   }
 
   override SourceLocation getLocation() { binary_expression_location(this, result) }
 
-  int getKind() { binary_expression(this, result, _, _) }
+  private int getKind() { binary_expression(this, result, _, _) }
 
-  Expression getLeftHandSide() { binary_expression(this, _, result, _) }
+  Expr getLeft() { binary_expression(this, _, result, _) }
 
-  Expression getRightHandSide() { binary_expression(this, _, _, result) }
+  Expr getRight() { binary_expression(this, _, _, result) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/Command.qll b/powershell/ql/lib/semmle/code/powershell/Command.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class Command extends @command, CommandBase {
+class Cmd extends @command, CmdBase {
   override string toString() { result = this.getName() }
 
   override SourceLocation getLocation() { command_location(this, result) }
@@ -13,11 +13,11 @@ class Command extends @command, CommandBase {
 
   int getNumRedirection() { command(this, _, _, _, result) }
 
-  CommandElement getElement(int i) { command_command_element(this, i, result) }
+  CmdElement getElement(int i) { command_command_element(this, i, result) }
 
   Redirection getRedirection(int i) { command_redirection(this, i, result) }
 
-  CommandElement getAnElement() { result = this.getElement(_) }
+  CmdElement getAnElement() { result = this.getElement(_) }
 
   Redirection getARedirection() { result = this.getRedirection(_) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/CommandBase.qll b/powershell/ql/lib/semmle/code/powershell/CommandBase.qll
@@ -1,3 +1,3 @@
 import powershell
 
-class CommandBase extends @command_base, Statement { }
+class CmdBase extends @command_base, Stmt { }
diff --git a/powershell/ql/lib/semmle/code/powershell/CommandElement.qll b/powershell/ql/lib/semmle/code/powershell/CommandElement.qll
@@ -1,3 +1,3 @@
 import powershell
 
-class CommandElement extends @command_element, Ast { }
+class CmdElement extends @command_element, Ast { }
diff --git a/powershell/ql/lib/semmle/code/powershell/CommandExpression.qll b/powershell/ql/lib/semmle/code/powershell/CommandExpression.qll
@@ -1,9 +1,9 @@
 import powershell
 
-class CommandExpression extends @command_expression, CommandBase {
+class CmdExpr extends @command_expression, CmdBase {
   override SourceLocation getLocation() { command_expression_location(this, result) }
 
-  Expression getExpression() { command_expression(this, result, _) }
+  Expr getExpression() { command_expression(this, result, _) }
 
   int getNumRedirections() { command_expression(this, _, result) }
 
diff --git a/powershell/ql/lib/semmle/code/powershell/CommandParameter.qll b/powershell/ql/lib/semmle/code/powershell/CommandParameter.qll
@@ -1,11 +1,11 @@
 import powershell
 
-class CommandParameter extends @command_parameter, CommandElement {
+class CmdParameter extends @command_parameter, CmdElement {
   override SourceLocation getLocation() { command_parameter_location(this, result) }
 
   string getName() { command_parameter(this, result) }
 
-  Expression getArgument() { command_parameter_argument(this, result) }
+  Expr getArgument() { command_parameter_argument(this, result) }
 
   override string toString() { command_parameter(this, result) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/CommentEntity.qll b/powershell/ql/lib/semmle/code/powershell/CommentEntity.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class CommentEntity extends @comment_entity {
+class Comment extends @comment_entity {
   SourceLocation getLocation() { comment_entity_location(this, result) }
 
   StringLiteral getCommentContents() { comment_entity(this, result) }
diff --git a/powershell/ql/lib/semmle/code/powershell/ConstantExpression.qll b/powershell/ql/lib/semmle/code/powershell/ConstantExpression.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class ConstantExpression extends @constant_expression, BaseConstantExpression {
+class ConstExpr extends @constant_expression, BaseConstExpr {
   override SourceLocation getLocation() { constant_expression_location(this, result) }
 
   string getType() { constant_expression(this, result) }
diff --git a/powershell/ql/lib/semmle/code/powershell/ExpandableStringExpression.qll b/powershell/ql/lib/semmle/code/powershell/ExpandableStringExpression.qll
@@ -1,19 +1,17 @@
 import powershell
 
-class ExpandableStringExpression extends @expandable_string_expression, Expression {
+class ExpandableStringExpression extends @expandable_string_expression, Expr {
   override SourceLocation getLocation() { expandable_string_expression_location(this, result) }
 
   override string toString() {
     result = "ExpandableStringExpression at: " + this.getLocation().toString()
   }
 
-  int getKind() { expandable_string_expression(this, _, result, _) }
+  private int getKind() { expandable_string_expression(this, _, result, _) }
 
-  int getNumExpressions() { expandable_string_expression(this, _, _, result) }
+  int getNumExprs() { expandable_string_expression(this, _, _, result) }
 
-  Expression getExpression(int i) {
-    expandable_string_expression_nested_expression(this, i, result)
-  }
+  Expr getExpr(int i) { expandable_string_expression_nested_expression(this, i, result) }
 
-  Expression getAExpression() { result = this.getExpression(_) }
+  Expr getAnExpr() { result = this.getExpr(_) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/Expression.qll b/powershell/ql/lib/semmle/code/powershell/Expression.qll
@@ -1,3 +1,3 @@
 import powershell
 
-class Expression extends @expression, CommandElement { }
+class Expr extends @expression, CmdElement { }
diff --git a/powershell/ql/lib/semmle/code/powershell/FunctionDefinition.qll b/powershell/ql/lib/semmle/code/powershell/FunctionDefinition.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class FunctionDefinition extends @function_definition, Statement {
+class Function extends @function_definition, Stmt {
   override string toString() { result = "FunctionDefinition at: " + this.getLocation().toString() }
 
   override SourceLocation getLocation() { function_definition_location(this, result) }
diff --git a/powershell/ql/lib/semmle/code/powershell/InvokeMemberExpression.qll b/powershell/ql/lib/semmle/code/powershell/InvokeMemberExpression.qll
@@ -1,15 +1,15 @@
 import powershell
 
-class InvokeMemberExpression extends @invoke_member_expression, MemberExpressionBase {
+class InvokeMemberExpression extends @invoke_member_expression, MemberExprBase {
   override SourceLocation getLocation() { invoke_member_expression_location(this, result) }
 
-  Expression getExpression() { invoke_member_expression(this, result, _) }
+  Expr getExpression() { invoke_member_expression(this, result, _) }
 
-  CommandElement getMember() { invoke_member_expression(this, _, result) }
+  CmdElement getMember() { invoke_member_expression(this, _, result) }
 
-  Expression getArgument(int i) { invoke_member_expression_argument(this, i, result) }
+  Expr getArgument(int i) { invoke_member_expression_argument(this, i, result) }
 
-  Expression getAnArgument() { invoke_member_expression_argument(this, _, result) }
+  Expr getAnArgument() { invoke_member_expression_argument(this, _, result) }
 
   override string toString() { result = "ArrayExpression at: " + this.getLocation().toString() }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/MemberExpressionBase.qll b/powershell/ql/lib/semmle/code/powershell/MemberExpressionBase.qll
@@ -1,3 +1,3 @@
 import powershell
 
-class MemberExpressionBase extends @member_expression_base, Expression { }
+class MemberExprBase extends @member_expression_base, Expr { }
diff --git a/powershell/ql/lib/semmle/code/powershell/NamedAttributeArgument.qll b/powershell/ql/lib/semmle/code/powershell/NamedAttributeArgument.qll
@@ -7,5 +7,5 @@ class NamedAttributeArgument extends @named_attribute_argument {
 
   string getName() { named_attribute_argument(this, result, _) }
 
-  Expression getValue() { named_attribute_argument(this, _, result) }
+  Expr getValue() { named_attribute_argument(this, _, result) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/NamedBlock.qll b/powershell/ql/lib/semmle/code/powershell/NamedBlock.qll
@@ -9,11 +9,11 @@ class NamedBlock extends @named_block, Ast {
 
   int getNumTraps() { named_block(this, _, result) }
 
-  Statement getStatement(int i) { named_block_statement(this, i, result) }
+  Stmt getStatement(int i) { named_block_statement(this, i, result) }
 
-  Statement getAStatement() { result = this.getStatement(_) }
+  Stmt getAStatement() { result = this.getStatement(_) }
 
-  TrapStatement getTrap(int i) { named_block_trap(this, i, result) }
+  TrapStmt getTrap(int i) { named_block_trap(this, i, result) }
 
-  TrapStatement getATrap() { result = this.getTrap(_) }
+  TrapStmt getATrap() { result = this.getTrap(_) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/Parameter.qll b/powershell/ql/lib/semmle/code/powershell/Parameter.qll
@@ -3,17 +3,17 @@ import powershell
 class Parameter extends @parameter, Ast {
   override string toString() { result = this.getName().toString() }
 
-  VariableExpression getName() { parameter(this, result, _, _) }
+  VarAccess getName() { parameter(this, result, _, _) }
 
   string getStaticType() { parameter(this, _, result, _) }
 
   int getNumAttributes() { parameter(this, _, _, result) }
 
   AttributeBase getAttribute(int i) { parameter_attribute(this, i, result) }
 
-  AttributeBase getAAttribute() { result = this.getAttribute(_) }
+  AttributeBase getAnAttribute() { result = this.getAttribute(_) }
 
-  Expression getDefaultValue() { parameter_default_value(this, result) }
+  Expr getDefaultValue() { parameter_default_value(this, result) }
 
   override SourceLocation getLocation() { parameter_location(this, result) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/ParenExpression.qll b/powershell/ql/lib/semmle/code/powershell/ParenExpression.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class ParenExpression extends @paren_expression, Expression {
+class ParenExpression extends @paren_expression, Expr {
   PipelineBase getExpression() { paren_expression(this, result) }
 
   override SourceLocation getLocation() { paren_expression_location(this, result) }
diff --git a/powershell/ql/lib/semmle/code/powershell/Pipeline.qll b/powershell/ql/lib/semmle/code/powershell/Pipeline.qll
@@ -7,7 +7,7 @@ class Pipeline extends @pipeline, Chainable {
 
   int getNumComponents() { pipeline(this, result) }
 
-  CommandBase getComponent(int i) { pipeline_component(this, i, result) }
+  CmdBase getComponent(int i) { pipeline_component(this, i, result) }
 
-  CommandBase getAComponent() { result = this.getComponent(_) }
+  CmdBase getAComponent() { result = this.getComponent(_) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/PipelineBase.qll b/powershell/ql/lib/semmle/code/powershell/PipelineBase.qll
@@ -1,3 +1,3 @@
 import powershell
 
-class PipelineBase extends @pipeline_base, Statement { }
+class PipelineBase extends @pipeline_base, Stmt { }
diff --git a/powershell/ql/lib/semmle/code/powershell/ScriptBlock.qll b/powershell/ql/lib/semmle/code/powershell/ScriptBlock.qll
@@ -15,9 +15,9 @@ class ScriptBlock extends @script_block, Ast {
 
   int getNumRequiredPsSnapIns() { script_block(this, _, _, _, _, result) }
 
-  Statement getUsing(int i) { script_block_using(this, i, result) }
+  Stmt getUsing(int i) { script_block_using(this, i, result) }
 
-  Statement getAUsing() { result = this.getUsing(_) }
+  Stmt getAUsing() { result = this.getUsing(_) }
 
   ParamBlock getParamBlock() { script_block_param_block(this, result) }
 
diff --git a/powershell/ql/lib/semmle/code/powershell/Statement.qll b/powershell/ql/lib/semmle/code/powershell/Statement.qll
@@ -1,3 +1,3 @@
 import powershell
 
-class Statement extends @statement, Ast { }
+class Stmt extends @statement, Ast { }
diff --git a/powershell/ql/lib/semmle/code/powershell/StatementBlock.qll b/powershell/ql/lib/semmle/code/powershell/StatementBlock.qll
@@ -1,19 +1,19 @@
 import powershell
 
-class StatementBlock extends @statement_block, Ast {
+class StmtBlock extends @statement_block, Ast {
   override SourceLocation getLocation() { statement_block_location(this, result) }
 
   int getNumStatements() { statement_block(this, result, _) }
 
   int getNumTraps() { statement_block(this, _, result) }
 
-  Statement getStatement(int index) { statement_block_statement(this, index, result) }
+  Stmt getStatement(int index) { statement_block_statement(this, index, result) }
 
-  Statement getAStatement() { result = this.getStatement(_) }
+  Stmt getAStatement() { result = this.getStatement(_) }
 
-  TrapStatement getTrapStatement(int index) { statement_block_trap(this, index, result) }
+  TrapStmt getTrapStatement(int index) { statement_block_trap(this, index, result) }
 
-  TrapStatement getATrapStatement() { result = this.getTrapStatement(_) }
+  TrapStmt getATrapStatement() { result = this.getTrapStatement(_) }
 
   override string toString() { result = "StatementBlock at: " + this.getLocation().toString() }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/StringConstantExpression.qll b/powershell/ql/lib/semmle/code/powershell/StringConstantExpression.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class StringConstantExpression extends @string_constant_expression, BaseConstantExpression {
+class StringConstExpression extends @string_constant_expression, BaseConstExpr {
   StringLiteral getValue() { string_constant_expression(this, result) }
 
   /** Get the full string literal with all its parts concatenated */
diff --git a/powershell/ql/lib/semmle/code/powershell/TernaryExpression.qll b/powershell/ql/lib/semmle/code/powershell/TernaryExpression.qll
@@ -1,13 +1,13 @@
 import powershell
 
-class TernaryExpression extends @ternary_expression, Expression {
+class ConditionalExpr extends @ternary_expression, Expr {
   override string toString() { result = "...?...:..." }
 
   override SourceLocation getLocation() { ternary_expression_location(this, result) }
 
-  Expression getCondition() { ternary_expression(this, result, _, _) }
+  Expr getCondition() { ternary_expression(this, result, _, _) }
 
-  Expression getIfFalse() { ternary_expression(this, _, result, _) }
+  Expr getIfFalse() { ternary_expression(this, _, result, _) }
 
-  Expression getIfTrue() { ternary_expression(this, _, _, result) }
+  Expr getIfTrue() { ternary_expression(this, _, _, result) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/TrapStatement.qll b/powershell/ql/lib/semmle/code/powershell/TrapStatement.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class TrapStatement extends @trap_statement, Statement {
+class TrapStmt extends @trap_statement, Stmt {
   override SourceLocation getLocation() { trap_statement_location(this, result) }
 
   override string toString() { result = "TrapStatement at: " + this.getLocation().toString() }
diff --git a/powershell/ql/lib/semmle/code/powershell/TypeExpression.qll b/powershell/ql/lib/semmle/code/powershell/TypeExpression.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class TypeExpression extends @type_expression, Expression {
+class TypeExpression extends @type_expression, Expr {
   string getName() { type_expression(this, result, _) }
 
   string getFullyQualifiedName() { type_expression(this, _, result) }
diff --git a/powershell/ql/lib/semmle/code/powershell/VariableExpression.qll b/powershell/ql/lib/semmle/code/powershell/VariableExpression.qll
@@ -1,6 +1,6 @@
 import powershell
 
-class VariableExpression extends @variable_expression, Expression {
+class VarAccess extends @variable_expression, Expr {
   override string toString() { result = this.getUserPath() }
 
   override SourceLocation getLocation() { variable_expression_location(this, result) }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`import powershell`
`2`	`2`
`3`		`-class ArrayExpression extends @array_expression, Expression {`
	`3`	`+class ArrayExpr extends @array_expression, Expr {`
`4`	`4`	`override SourceLocation getLocation() { array_expression_location(this, result) }`
`5`	`5`
`6`		`- StatementBlock getStatementBlock() { array_expression(this, result) }`
	`6`	`+ StmtBlock getStatementBlock() { array_expression(this, result) }`
`7`	`7`
`8`	`8`	`override string toString() { result = "ArrayExpression at: " + this.getLocation().toString() }`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Attribute extends @attribute, AttributeBase {`
`15`	`15`
`16`	`16`	`NamedAttributeArgument getANamedArgument() { result = this.getNamedArgument(_) }`
`17`	`17`
`18`		`- Expression getPositionalArgument(int i) { attribute_positional_argument(this, i, result) }`
	`18`	`+ Expr getPositionalArgument(int i) { attribute_positional_argument(this, i, result) }`
`19`	`19`
`20`		`- Expression getAPositionalArgument() { result = this.getPositionalArgument(_) }`
	`20`	`+ Expr getAPositionalArgument() { result = this.getPositionalArgument(_) }`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`import powershell`
`2`	`2`
`3`		`-class BaseConstantExpression extends @base_constant_expression, Expression { }`
	`3`	`+class BaseConstExpr extends @base_constant_expression, Expr { }`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`import powershell`
`2`	`2`
`3`		`-class CommandBase extends @command_base, Statement { }`
	`3`	`+class CmdBase extends @command_base, Stmt { }`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`import powershell`
`2`	`2`
`3`		`-class CommandElement extends @command_element, Ast { }`
	`3`	`+class CmdElement extends @command_element, Ast { }`