hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 03:05:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename describeQlClass to getAPrimaryQlClass.

Browse Source
This commit is contained in:
Max Schaefer
2020-06-25 15:08:01 +01:00
parent a89e4971ac
commit d290bea39a
8 changed files with 155 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ql/src/semmle/go/AST.qll
View File

@@ -46,10 +46,16 @@ class AstNode extends @node, Locatable {
FuncDef getEnclosingFunction() { result = getParent().parentInSameFunction*() }
/**
* Describes important CodeQL classes for this node. May
* return multiple values.
* Gets the name of a primary CodeQL class to which this node belongs.
*
* For most nodes, this is simply the most precise syntactic category to which they belong;
* for example, `AddExpr` is a primary class, but `BinaryExpr` is not.
*
* For identifiers and selector expressions, the class describing what kind of entity they refer
* to (for example `FunctionName` or `TypeName`) is also considered primary. For such nodes,
* this predicate has multiple values.
*/
string describeQlClass() { result = "???" }
string getAPrimaryQlClass() { result = "???" }
override string toString() { result = "AST node" }
}

12
ql/src/semmle/go/Comments.qll
View File

@@ -28,7 +28,7 @@ class Comment extends @comment, AstNode {
override string toString() { result = "comment" }
override string describeQlClass() { result = "Comment" }
override string getAPrimaryQlClass() { result = "Comment" }
}
/**
@@ -62,7 +62,7 @@ class CommentGroup extends @comment_group, AstNode {
override string toString() { result = "comment group" }
override string describeQlClass() { result = "CommentGroup" }
override string getAPrimaryQlClass() { result = "CommentGroup" }
}
/**
@@ -114,7 +114,7 @@ class DocComment extends CommentGroup {
/** Gets the program element documented by this comment group. */
Documentable getDocumentedElement() { result = node }
override string describeQlClass() { result = "DocComment" }
override string getAPrimaryQlClass() { result = "DocComment" }
}
/**
@@ -127,7 +127,7 @@ class DocComment extends CommentGroup {
* ```
*/
class SlashSlashComment extends @slashslashcomment, Comment {
override string describeQlClass() { result = "SlashSlashComment" }
override string getAPrimaryQlClass() { result = "SlashSlashComment" }
}
/**
@@ -141,7 +141,7 @@ class SlashSlashComment extends @slashslashcomment, Comment {
* </pre>
*/
class SlashStarComment extends @slashstarcomment, Comment {
override string describeQlClass() { result = "SlashStarComment" }
override string getAPrimaryQlClass() { result = "SlashStarComment" }
}
/**
@@ -205,5 +205,5 @@ class BuildConstraintComment extends LineComment {
getText().regexpMatch("\\s*\\+build.*")
}
override string describeQlClass() { result = "BuildConstraintComment" }
override string getAPrimaryQlClass() { result = "BuildConstraintComment" }
}

40
ql/src/semmle/go/Decls.qll
View File

@@ -31,7 +31,7 @@ class Decl extends @decl, ExprParent, StmtParent, FieldParent {
class BadDecl extends @baddecl, Decl {
override string toString() { result = "bad declaration" }
override string describeQlClass() { result = "BadDecl" }
override string getAPrimaryQlClass() { result = "BadDecl" }
}
/**
@@ -49,7 +49,7 @@ class GenDecl extends @gendecl, Decl, Documentable {
override predicate mayHaveSideEffects() { getASpec().mayHaveSideEffects() }
override string describeQlClass() { result = "GenDecl" }
override string getAPrimaryQlClass() { result = "GenDecl" }
}
/**
@@ -58,7 +58,7 @@ class GenDecl extends @gendecl, Decl, Documentable {
class ImportDecl extends @importdecl, GenDecl {
override string toString() { result = "import declaration" }
override string describeQlClass() { result = "ImportDecl" }
override string getAPrimaryQlClass() { result = "ImportDecl" }
}
/**
@@ -67,7 +67,7 @@ class ImportDecl extends @importdecl, GenDecl {
class ConstDecl extends @constdecl, GenDecl {
override string toString() { result = "constant declaration" }
override string describeQlClass() { result = "ConstDecl" }
override string getAPrimaryQlClass() { result = "ConstDecl" }
}
/**
@@ -76,7 +76,7 @@ class ConstDecl extends @constdecl, GenDecl {
class TypeDecl extends @typedecl, GenDecl {
override string toString() { result = "type declaration" }
override string describeQlClass() { result = "TypeDecl" }
override string getAPrimaryQlClass() { result = "TypeDecl" }
}
/**
@@ -85,7 +85,7 @@ class TypeDecl extends @typedecl, GenDecl {
class VarDecl extends @vardecl, GenDecl {
override string toString() { result = "variable declaration" }
override string describeQlClass() { result = "VarDecl" }
override string getAPrimaryQlClass() { result = "VarDecl" }
}
/**
@@ -146,7 +146,7 @@ class FuncDef extends @funcdef, StmtParent, ExprParent {
*/
DataFlow::CallNode getACall() { result.getACallee() = this }
override string describeQlClass() { result = "FuncDef" }
override string getAPrimaryQlClass() { result = "FuncDef" }
}
/**
@@ -170,7 +170,7 @@ class FuncDecl extends @funcdecl, Decl, Documentable, FuncDef {
override string toString() { result = "function declaration" }
override string describeQlClass() { result = "FuncDecl" }
override string getAPrimaryQlClass() { result = "FuncDecl" }
}
/**
@@ -236,7 +236,7 @@ class MethodDecl extends FuncDecl {
*/
ReceiverVariable getReceiver() { result.getFunction() = this }
override string describeQlClass() { result = "MethodDecl" }
override string getAPrimaryQlClass() { result = "MethodDecl" }
}
/**
@@ -262,7 +262,7 @@ class Spec extends @spec, ExprParent, Documentable {
*/
predicate mayHaveSideEffects() { none() }
override string describeQlClass() { result = "Spec" }
override string getAPrimaryQlClass() { result = "Spec" }
}
/**
@@ -283,7 +283,7 @@ class ImportSpec extends @importspec, Spec {
override string toString() { result = "import specifier" }
override string describeQlClass() { result = "ImportSpec" }
override string getAPrimaryQlClass() { result = "ImportSpec" }
}
/**
@@ -367,7 +367,7 @@ class ValueSpec extends @valuespec, Spec {
override string toString() { result = "value declaration specifier" }
override string describeQlClass() { result = "ValueSpec" }
override string getAPrimaryQlClass() { result = "ValueSpec" }
}
/**
@@ -385,7 +385,7 @@ class TypeSpec extends @typespec, Spec {
override string toString() { result = "type declaration specifier" }
override string describeQlClass() { result = "TypeSpec" }
override string getAPrimaryQlClass() { result = "TypeSpec" }
}
/**
@@ -432,7 +432,7 @@ class FieldDecl extends FieldBase, Documentable, ExprParent {
override string toString() { result = "field declaration" }
override string describeQlClass() { result = "FieldDecl" }
override string getAPrimaryQlClass() { result = "FieldDecl" }
}
/**
@@ -441,7 +441,7 @@ class FieldDecl extends FieldBase, Documentable, ExprParent {
class EmbeddedFieldDecl extends FieldDecl {
EmbeddedFieldDecl() { not exists(this.getNameExpr(_)) }
override string describeQlClass() { result = "EmbeddedFieldDecl" }
override string getAPrimaryQlClass() { result = "EmbeddedFieldDecl" }
}
/**
@@ -492,7 +492,7 @@ class ParameterDecl extends ParameterOrResultDecl {
override string toString() { result = "parameter declaration" }
override string describeQlClass() { result = "ParameterDecl" }
override string getAPrimaryQlClass() { result = "ParameterDecl" }
}
/**
@@ -515,7 +515,7 @@ class ReceiverDecl extends FieldBase, Documentable, ExprParent {
override string toString() { result = "receiver declaration" }
override string describeQlClass() { result = "ReceiverDecl" }
override string getAPrimaryQlClass() { result = "ReceiverDecl" }
}
/**
@@ -532,7 +532,7 @@ class ResultVariableDecl extends ParameterOrResultDecl {
override string toString() { result = "result variable declaration" }
override string describeQlClass() { result = "ResultVariableDecl" }
override string getAPrimaryQlClass() { result = "ResultVariableDecl" }
}
/**
@@ -571,7 +571,7 @@ class MethodSpec extends InterfaceMemberSpec {
override string toString() { result = "method declaration" }
override string describeQlClass() { result = "MethodSpec" }
override string getAPrimaryQlClass() { result = "MethodSpec" }
}
/**
@@ -582,5 +582,5 @@ class EmbeddingSpec extends InterfaceMemberSpec {
override string toString() { result = "interface embedding" }
override string describeQlClass() { result = "EmbeddingSpec" }
override string getAPrimaryQlClass() { result = "EmbeddingSpec" }
}

134
ql/src/semmle/go/Expr.qll
View File

@@ -156,7 +156,7 @@ class Expr extends @expr, ExprParent {
class BadExpr extends @badexpr, Expr {
override string toString() { result = "bad expression" }
override string describeQlClass() { result = "BadExpr" }
override string getAPrimaryQlClass() { result = "BadExpr" }
}
/**
@@ -183,7 +183,7 @@ class Ident extends @ident, Expr {
override string toString() { result = getName() }
override string describeQlClass() { result = "Ident" }
override string getAPrimaryQlClass() { result = "Ident" }
}
/**
@@ -198,7 +198,7 @@ class Ident extends @ident, Expr {
class BlankIdent extends Ident {
BlankIdent() { getName() = "_" }
override string describeQlClass() { result = "BlankIdent" }
override string getAPrimaryQlClass() { result = "BlankIdent" }
}
/**
@@ -217,7 +217,7 @@ class Ellipsis extends @ellipsis, Expr {
override string toString() { result = "..." }
override string describeQlClass() { result = "Ellipsis" }
override string getAPrimaryQlClass() { result = "Ellipsis" }
}
/**
@@ -276,7 +276,7 @@ class BasicLit extends @basiclit, Literal {
* ```
*/
class IntLit extends @intlit, BasicLit {
override string describeQlClass() { result = "IntLit" }
override string getAPrimaryQlClass() { result = "IntLit" }
}
/**
@@ -289,7 +289,7 @@ class IntLit extends @intlit, BasicLit {
* ```
*/
class FloatLit extends @floatlit, BasicLit {
override string describeQlClass() { result = "FloatLit" }
override string getAPrimaryQlClass() { result = "FloatLit" }
}
/**
@@ -303,7 +303,7 @@ class FloatLit extends @floatlit, BasicLit {
* ```
*/
class ImagLit extends @imaglit, BasicLit {
override string describeQlClass() { result = "ImagLit" }
override string getAPrimaryQlClass() { result = "ImagLit" }
}
/**
@@ -327,7 +327,7 @@ class CharLit extends @charlit, BasicLit {
// compiler is an integer, meaning we would not otherwise have a string value for rune literals
override string getStringValue() { result = this.getValue() }
override string describeQlClass() { result = "CharLit" }
override string getAPrimaryQlClass() { result = "CharLit" }
}
class RuneLit = CharLit;
@@ -342,7 +342,7 @@ class RuneLit = CharLit;
* ```
*/
class StringLit extends @stringlit, BasicLit {
override string describeQlClass() { result = "StringLit" }
override string getAPrimaryQlClass() { result = "StringLit" }
}
/**
@@ -366,7 +366,7 @@ class FuncLit extends @funclit, Literal, StmtParent, FuncDef {
override string toString() { result = "function literal" }
override string describeQlClass() { result = "FuncLit" }
override string getAPrimaryQlClass() { result = "FuncLit" }
}
/**
@@ -415,7 +415,7 @@ class CompositeLit extends @compositelit, Literal {
override string toString() { result = "composite literal" }
override string describeQlClass() { result = "CompositeLit" }
override string getAPrimaryQlClass() { result = "CompositeLit" }
}
/**
@@ -440,7 +440,7 @@ class MapLit extends CompositeLit {
override string toString() { result = "map literal" }
override string describeQlClass() { result = "MapLit" }
override string getAPrimaryQlClass() { result = "MapLit" }
}
/**
@@ -464,7 +464,7 @@ class StructLit extends CompositeLit {
override string toString() { result = "struct literal" }
override string describeQlClass() { result = "StructLit" }
override string getAPrimaryQlClass() { result = "StructLit" }
}
/**
@@ -512,7 +512,7 @@ class ArrayLit extends ArrayOrSliceLit {
override string toString() { result = "array literal" }
override string describeQlClass() { result = "ArrayLit" }
override string getAPrimaryQlClass() { result = "ArrayLit" }
}
/**
@@ -533,7 +533,7 @@ class SliceLit extends ArrayOrSliceLit {
override string toString() { result = "slice literal" }
override string describeQlClass() { result = "SliceLit" }
override string getAPrimaryQlClass() { result = "SliceLit" }
}
/**
@@ -555,7 +555,7 @@ class ParenExpr extends @parenexpr, Expr {
override string toString() { result = "(...)" }
override string describeQlClass() { result = "ParenExpr" }
override string getAPrimaryQlClass() { result = "ParenExpr" }
}
/**
@@ -587,7 +587,7 @@ class SelectorExpr extends @selectorexpr, Expr {
override string toString() { result = "selection of " + getSelector() }
override string describeQlClass() { result = "SelectorExpr" }
override string getAPrimaryQlClass() { result = "SelectorExpr" }
}
/**
@@ -610,7 +610,7 @@ class IndexExpr extends @indexexpr, Expr {
override string toString() { result = "index expression" }
override string describeQlClass() { result = "IndexExpr" }
override string getAPrimaryQlClass() { result = "IndexExpr" }
}
/**
@@ -638,7 +638,7 @@ class SliceExpr extends @sliceexpr, Expr {
override string toString() { result = "slice expression" }
override string describeQlClass() { result = "SliceExpr" }
override string getAPrimaryQlClass() { result = "SliceExpr" }
}
/**
@@ -663,7 +663,7 @@ class TypeAssertExpr extends @typeassertexpr, Expr {
override string toString() { result = "type assertion" }
override string describeQlClass() { result = "TypeAssertExpr" }
override string getAPrimaryQlClass() { result = "TypeAssertExpr" }
}
/**
@@ -682,7 +682,7 @@ class TypeAssertExpr extends @typeassertexpr, Expr {
* ```
*/
class CallOrConversionExpr extends @callorconversionexpr, Expr {
override string describeQlClass() { result = "CallOrConversionExpr" }
override string getAPrimaryQlClass() { result = "CallOrConversionExpr" }
}
/**
@@ -709,7 +709,7 @@ class ConversionExpr extends CallOrConversionExpr {
override string toString() { result = "type conversion" }
override string describeQlClass() { result = "ConversionExpr" }
override string getAPrimaryQlClass() { result = "ConversionExpr" }
}
/**
@@ -767,7 +767,7 @@ class CallExpr extends CallOrConversionExpr {
result = "function call"
}
override string describeQlClass() { result = "CallExpr" }
override string getAPrimaryQlClass() { result = "CallExpr" }
}
/**
@@ -787,7 +787,7 @@ class StarExpr extends @starexpr, Expr {
override string toString() { result = "star expression" }
override string describeQlClass() { result = "StarExpr" }
override string getAPrimaryQlClass() { result = "StarExpr" }
}
/**
@@ -811,7 +811,7 @@ class KeyValueExpr extends @keyvalueexpr, Expr {
override string toString() { result = "key-value pair" }
override string describeQlClass() { result = "KeyValueExpr" }
override string getAPrimaryQlClass() { result = "KeyValueExpr" }
}
/**
@@ -832,7 +832,7 @@ class ArrayTypeExpr extends @arraytypeexpr, TypeExpr {
override string toString() { result = "array type" }
override string describeQlClass() { result = "ArrayTypeExpr" }
override string getAPrimaryQlClass() { result = "ArrayTypeExpr" }
}
/**
@@ -847,7 +847,7 @@ class ArrayTypeExpr extends @arraytypeexpr, TypeExpr {
class StructTypeExpr extends @structtypeexpr, TypeExpr, FieldParent {
override string toString() { result = "struct type" }
override string describeQlClass() { result = "StructTypeExpr" }
override string getAPrimaryQlClass() { result = "StructTypeExpr" }
}
/**
@@ -883,7 +883,7 @@ class FuncTypeExpr extends @functypeexpr, TypeExpr, ScopeNode, FieldParent {
override string toString() { result = "function type" }
override string describeQlClass() { result = "FuncTypeExpr" }
override string getAPrimaryQlClass() { result = "FuncTypeExpr" }
}
/**
@@ -907,7 +907,7 @@ class InterfaceTypeExpr extends @interfacetypeexpr, TypeExpr, FieldParent {
override string toString() { result = "interface type" }
override string describeQlClass() { result = "InterfaceTypeExpr" }
override string getAPrimaryQlClass() { result = "InterfaceTypeExpr" }
}
/**
@@ -934,7 +934,7 @@ class MapTypeExpr extends @maptypeexpr, TypeExpr {
override string toString() { result = "map type" }
override string describeQlClass() { result = "MapTypeExpr" }
override string getAPrimaryQlClass() { result = "MapTypeExpr" }
}
/**
@@ -1061,7 +1061,7 @@ class BitwiseUnaryExpr extends @bitwiseunaryexpr, BitwiseExpr, UnaryExpr { }
class PlusExpr extends @plusexpr, ArithmeticUnaryExpr {
override string getOperator() { result = "+" }
override string describeQlClass() { result = "PlusExpr" }
override string getAPrimaryQlClass() { result = "PlusExpr" }
}
/**
@@ -1076,7 +1076,7 @@ class PlusExpr extends @plusexpr, ArithmeticUnaryExpr {
class MinusExpr extends @minusexpr, ArithmeticUnaryExpr {
override string getOperator() { result = "-" }
override string describeQlClass() { result = "MinusExpr" }
override string getAPrimaryQlClass() { result = "MinusExpr" }
}
/**
@@ -1091,7 +1091,7 @@ class MinusExpr extends @minusexpr, ArithmeticUnaryExpr {
class NotExpr extends @notexpr, LogicalUnaryExpr {
override string getOperator() { result = "!" }
override string describeQlClass() { result = "NotExpr" }
override string getAPrimaryQlClass() { result = "NotExpr" }
}
/**
@@ -1106,7 +1106,7 @@ class NotExpr extends @notexpr, LogicalUnaryExpr {
class ComplementExpr extends @complementexpr, BitwiseUnaryExpr {
override string getOperator() { result = "^" }
override string describeQlClass() { result = "ComplementExpr" }
override string getAPrimaryQlClass() { result = "ComplementExpr" }
}
/**
@@ -1119,7 +1119,7 @@ class DerefExpr extends @derefexpr, UnaryExpr {
override string getOperator() { result = "*" }
override string describeQlClass() { result = "DerefExpr" }
override string getAPrimaryQlClass() { result = "DerefExpr" }
}
/**
@@ -1136,7 +1136,7 @@ class AddressExpr extends @addressexpr, UnaryExpr {
override string getOperator() { result = "&" }
override string describeQlClass() { result = "AddressExpr" }
override string getAPrimaryQlClass() { result = "AddressExpr" }
}
/**
@@ -1153,7 +1153,7 @@ class RecvExpr extends @arrowexpr, UnaryExpr {
override string getOperator() { result = "<-" }
override string describeQlClass() { result = "RecvExpr" }
override string getAPrimaryQlClass() { result = "RecvExpr" }
}
/**
@@ -1300,7 +1300,7 @@ class RelationalComparisonExpr extends @relationalcomparison, ComparisonExpr {
class LorExpr extends @lorexpr, LogicalBinaryExpr {
override string getOperator() { result = "||" }
override string describeQlClass() { result = "LorExpr" }
override string getAPrimaryQlClass() { result = "LorExpr" }
}
class LogOrExpr = LorExpr;
@@ -1317,7 +1317,7 @@ class LogOrExpr = LorExpr;
class LandExpr extends @landexpr, LogicalBinaryExpr {
override string getOperator() { result = "&&" }
override string describeQlClass() { result = "LandExpr" }
override string getAPrimaryQlClass() { result = "LandExpr" }
}
class LogAndExpr = LandExpr;
@@ -1336,7 +1336,7 @@ class EqlExpr extends @eqlexpr, EqualityTestExpr {
override boolean getPolarity() { result = true }
override string describeQlClass() { result = "EqlExpr" }
override string getAPrimaryQlClass() { result = "EqlExpr" }
}
class EqExpr = EqlExpr;
@@ -1355,7 +1355,7 @@ class NeqExpr extends @neqexpr, EqualityTestExpr {
override boolean getPolarity() { result = false }
override string describeQlClass() { result = "NeqExpr" }
override string getAPrimaryQlClass() { result = "NeqExpr" }
}
/**
@@ -1376,7 +1376,7 @@ class LssExpr extends @lssexpr, RelationalComparisonExpr {
override Expr getGreaterOperand() { result = getRightOperand() }
override string describeQlClass() { result = "LssExpr" }
override string getAPrimaryQlClass() { result = "LssExpr" }
}
class LTExpr = LssExpr;
@@ -1397,7 +1397,7 @@ class LeqExpr extends @leqexpr, RelationalComparisonExpr {
override Expr getGreaterOperand() { result = getRightOperand() }
override string describeQlClass() { result = "LeqExpr" }
override string getAPrimaryQlClass() { result = "LeqExpr" }
}
class LEExpr = LeqExpr;
@@ -1420,7 +1420,7 @@ class GtrExpr extends @gtrexpr, RelationalComparisonExpr {
override Expr getGreaterOperand() { result = getLeftOperand() }
override string describeQlClass() { result = "GtrExpr" }
override string getAPrimaryQlClass() { result = "GtrExpr" }
}
class GTExpr = GtrExpr;
@@ -1441,7 +1441,7 @@ class GeqExpr extends @geqexpr, RelationalComparisonExpr {
override Expr getGreaterOperand() { result = getLeftOperand() }
override string describeQlClass() { result = "GeqExpr" }
override string getAPrimaryQlClass() { result = "GeqExpr" }
}
class GEExpr = GeqExpr;
@@ -1458,7 +1458,7 @@ class GEExpr = GeqExpr;
class AddExpr extends @addexpr, ArithmeticBinaryExpr {
override string getOperator() { result = "+" }
override string describeQlClass() { result = "AddExpr" }
override string getAPrimaryQlClass() { result = "AddExpr" }
}
/**
@@ -1473,7 +1473,7 @@ class AddExpr extends @addexpr, ArithmeticBinaryExpr {
class SubExpr extends @subexpr, ArithmeticBinaryExpr {
override string getOperator() { result = "-" }
override string describeQlClass() { result = "SubExpr" }
override string getAPrimaryQlClass() { result = "SubExpr" }
}
/**
@@ -1488,7 +1488,7 @@ class SubExpr extends @subexpr, ArithmeticBinaryExpr {
class OrExpr extends @orexpr, BitwiseBinaryExpr {
override string getOperator() { result = "|" }
override string describeQlClass() { result = "OrExpr" }
override string getAPrimaryQlClass() { result = "OrExpr" }
}
class BitOrExpr = OrExpr;
@@ -1505,7 +1505,7 @@ class BitOrExpr = OrExpr;
class XorExpr extends @xorexpr, BitwiseBinaryExpr {
override string getOperator() { result = "^" }
override string describeQlClass() { result = "XorExpr" }
override string getAPrimaryQlClass() { result = "XorExpr" }
}
/**
@@ -1520,7 +1520,7 @@ class XorExpr extends @xorexpr, BitwiseBinaryExpr {
class MulExpr extends @mulexpr, ArithmeticBinaryExpr {
override string getOperator() { result = "*" }
override string describeQlClass() { result = "MulExpr" }
override string getAPrimaryQlClass() { result = "MulExpr" }
}
/**
@@ -1537,7 +1537,7 @@ class QuoExpr extends @quoexpr, ArithmeticBinaryExpr {
override string getOperator() { result = "/" }
override string describeQlClass() { result = "QuoExpr" }
override string getAPrimaryQlClass() { result = "QuoExpr" }
}
class DivExpr = QuoExpr;
@@ -1554,7 +1554,7 @@ class DivExpr = QuoExpr;
class RemExpr extends @remexpr, ArithmeticBinaryExpr {
override string getOperator() { result = "%" }
override string describeQlClass() { result = "RemExpr" }
override string getAPrimaryQlClass() { result = "RemExpr" }
}
class ModExpr = RemExpr;
@@ -1571,7 +1571,7 @@ class ModExpr = RemExpr;
class ShlExpr extends @shlexpr, ShiftExpr {
override string getOperator() { result = "<<" }
override string describeQlClass() { result = "ShlExpr" }
override string getAPrimaryQlClass() { result = "ShlExpr" }
}
class LShiftExpr = ShlExpr;
@@ -1588,7 +1588,7 @@ class LShiftExpr = ShlExpr;
class ShrExpr extends @shrexpr, ShiftExpr {
override string getOperator() { result = ">>" }
override string describeQlClass() { result = "ShrExpr" }
override string getAPrimaryQlClass() { result = "ShrExpr" }
}
class RShiftExpr = ShrExpr;
@@ -1605,7 +1605,7 @@ class RShiftExpr = ShrExpr;
class AndExpr extends @andexpr, BitwiseBinaryExpr {
override string getOperator() { result = "&" }
override string describeQlClass() { result = "AndExpr" }
override string getAPrimaryQlClass() { result = "AndExpr" }
}
class BitAndExpr = AndExpr;
@@ -1622,7 +1622,7 @@ class BitAndExpr = AndExpr;
class AndNotExpr extends @andnotexpr, BitwiseBinaryExpr {
override string getOperator() { result = "&^" }
override string describeQlClass() { result = "AndNotExpr" }
override string getAPrimaryQlClass() { result = "AndNotExpr" }
}
/**
@@ -1650,7 +1650,7 @@ class ChanTypeExpr extends @chantypeexpr, TypeExpr {
override string toString() { result = "channel type" }
override string describeQlClass() { result = "ChanTypeExpr" }
override string getAPrimaryQlClass() { result = "ChanTypeExpr" }
}
/**
@@ -1665,7 +1665,7 @@ class ChanTypeExpr extends @chantypeexpr, TypeExpr {
class SendChanTypeExpr extends @sendchantypeexpr, ChanTypeExpr {
override predicate canSend() { any() }
override string describeQlClass() { result = "SendChanTypeExpr" }
override string getAPrimaryQlClass() { result = "SendChanTypeExpr" }
}
/**
@@ -1680,7 +1680,7 @@ class SendChanTypeExpr extends @sendchantypeexpr, ChanTypeExpr {
class RecvChanTypeExpr extends @recvchantypeexpr, ChanTypeExpr {
override predicate canReceive() { any() }
override string describeQlClass() { result = "RecvChanTypeExpr" }
override string getAPrimaryQlClass() { result = "RecvChanTypeExpr" }
}
/**
@@ -1697,7 +1697,7 @@ class SendRecvChanTypeExpr extends @sendrcvchantypeexpr, ChanTypeExpr {
override predicate canReceive() { any() }
override string describeQlClass() { result = "SendRecvChanTypeExpr" }
override string getAPrimaryQlClass() { result = "SendRecvChanTypeExpr" }
}
/**
@@ -1761,7 +1761,7 @@ class PackageName extends Name {
/** Gets the package this name refers to. */
override PackageEntity getTarget() { result = target }
override string describeQlClass() { result = "PackageName" }
override string getAPrimaryQlClass() { result = "PackageName" }
}
/**
@@ -1780,7 +1780,7 @@ class TypeName extends Name {
/** Gets the type this name refers to. */
override TypeEntity getTarget() { result = target }
override string describeQlClass() { result = "TypeName" }
override string getAPrimaryQlClass() { result = "TypeName" }
}
/**
@@ -1800,7 +1800,7 @@ class ValueName extends Name {
/** Gets the constant, variable or function this name refers to. */
override ValueEntity getTarget() { result = target }
override string describeQlClass() { result = "ValueName" }
override string getAPrimaryQlClass() { result = "ValueName" }
}
/**
@@ -1831,7 +1831,7 @@ class ConstantName extends ValueName {
)
}
override string describeQlClass() { result = "ConstantName" }
override string getAPrimaryQlClass() { result = "ConstantName" }
}
/**
@@ -1849,7 +1849,7 @@ class VariableName extends ValueName {
/** Gets the variable this name refers to. */
override Variable getTarget() { result = target }
override string describeQlClass() { result = "VariableName" }
override string getAPrimaryQlClass() { result = "VariableName" }
}
/**
@@ -1867,7 +1867,7 @@ class FunctionName extends ValueName {
/** Gets the function this name refers to. */
override Function getTarget() { result = target }
override string describeQlClass() { result = "FunctionName" }
override string getAPrimaryQlClass() { result = "FunctionName" }
}
/**
@@ -1885,7 +1885,7 @@ class LabelName extends Name {
/** Gets the label this name refers to. */
override Label getTarget() { result = target }
override string describeQlClass() { result = "LabelName" }
override string getAPrimaryQlClass() { result = "LabelName" }
}
/**

2
ql/src/semmle/go/Files.qll
View File

@@ -208,5 +208,5 @@ class File extends Container, @file, Documentable, ExprParent, GoModExprParent,
/** Gets the URL of this file. */
override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
override string describeQlClass() { result = "File" }
override string getAPrimaryQlClass() { result = "File" }
}

24
ql/src/semmle/go/GoMod.qll
View File

@@ -13,7 +13,7 @@ class GoModFile extends File {
*/
GoModModuleLine getModuleDeclaration() { result.getFile() = this }
override string describeQlClass() { result = "GoModFile" }
override string getAPrimaryQlClass() { result = "GoModFile" }
}
/**
@@ -41,14 +41,14 @@ class GoModExpr extends @modexpr, GoModExprParent {
override string toString() { result = "go.mod expression" }
override string describeQlClass() { result = "GoModExpr" }
override string getAPrimaryQlClass() { result = "GoModExpr" }
}
/**
* A top-level block of comments separate from any rule.
*/
class GoModCommentBlock extends @modcommentblock, GoModExpr {
override string describeQlClass() { result = "GoModCommentBlock" }
override string getAPrimaryQlClass() { result = "GoModCommentBlock" }
}
/**
@@ -93,7 +93,7 @@ class GoModLine extends @modline, GoModExpr {
override string toString() { result = "go.mod line" }
override string describeQlClass() { result = "GoModLine" }
override string getAPrimaryQlClass() { result = "GoModLine" }
}
/**
@@ -116,7 +116,7 @@ class GoModLineBlock extends @modlineblock, GoModExpr {
override string toString() { result = "go.mod line block" }
override string describeQlClass() { result = "GoModLineBlock" }
override string getAPrimaryQlClass() { result = "GoModLineBlock" }
}
/**
@@ -132,7 +132,7 @@ class GoModModuleLine extends GoModLine {
override string toString() { result = "go.mod module line" }
override string describeQlClass() { result = "GoModModuleLine" }
override string getAPrimaryQlClass() { result = "GoModModuleLine" }
}
/**
@@ -146,7 +146,7 @@ class GoModGoLine extends GoModLine {
override string toString() { result = "go.mod go line" }
override string describeQlClass() { result = "GoModGoLine" }
override string getAPrimaryQlClass() { result = "GoModGoLine" }
}
/**
@@ -163,7 +163,7 @@ class GoModRequireLine extends GoModLine {
override string toString() { result = "go.mod require line" }
override string describeQlClass() { result = "GoModRequireLine" }
override string getAPrimaryQlClass() { result = "GoModRequireLine" }
}
/**
@@ -181,7 +181,7 @@ class GoModExcludeLine extends GoModLine {
override string toString() { result = "go.mod exclude line" }
override string describeQlClass() { result = "GoModExcludeLine" }
override string getAPrimaryQlClass() { result = "GoModExcludeLine" }
}
/**
@@ -213,19 +213,19 @@ class GoModReplaceLine extends GoModLine {
override string toString() { result = "go.mod replace line" }
override string describeQlClass() { result = "GoModReplaceLine" }
override string getAPrimaryQlClass() { result = "GoModReplaceLine" }
}
/** A left parenthesis for a line block. */
class GoModLParen extends @modlparen, GoModExpr {
override string toString() { result = "go.mod (" }
override string describeQlClass() { result = "GoModLParen" }
override string getAPrimaryQlClass() { result = "GoModLParen" }
}
/** A right parenthesis for a line block. */
class GoModRParen extends @modrparen, GoModExpr {
override string toString() { result = "go.mod )" }
override string describeQlClass() { result = "GoModRParen" }
override string getAPrimaryQlClass() { result = "GoModRParen" }
}

2
ql/src/semmle/go/PrintAst.qll
View File

@@ -97,7 +97,7 @@ private string qlClass(AstNode el) {
// This version shows all non-overridden QL classes:
// result = "[" + concat(el.getAQlClass(), ", ") + "] "
// Normally we prefer to show just the canonical class:
result = "[" + concat(el.describeQlClass(), ", ") + "] "
result = "[" + concat(el.getAPrimaryQlClass(), ", ") + "] "
}
/**

78
ql/src/semmle/go/Stmt.qll
View File

@@ -53,7 +53,7 @@ class Stmt extends @stmt, ExprParent, StmtParent {
class BadStmt extends @badstmt, Stmt {
override string toString() { result = "bad statement" }
override string describeQlClass() { result = "BadStmt" }
override string getAPrimaryQlClass() { result = "BadStmt" }
}
/**
@@ -75,7 +75,7 @@ class DeclStmt extends @declstmt, Stmt, DeclParent {
override string toString() { result = "declaration statement" }
override string describeQlClass() { result = "DeclStmt" }
override string getAPrimaryQlClass() { result = "DeclStmt" }
}
/**
@@ -90,7 +90,7 @@ class DeclStmt extends @declstmt, Stmt, DeclParent {
class EmptyStmt extends @emptystmt, Stmt {
override string toString() { result = "empty statement" }
override string describeQlClass() { result = "EmptyStmt" }
override string getAPrimaryQlClass() { result = "EmptyStmt" }
}
/**
@@ -116,7 +116,7 @@ class LabeledStmt extends @labeledstmt, Stmt {
override string toString() { result = "labeled statement" }
override string describeQlClass() { result = "LabelledStmt" }
override string getAPrimaryQlClass() { result = "LabelledStmt" }
}
/**
@@ -139,7 +139,7 @@ class ExprStmt extends @exprstmt, Stmt {
override string toString() { result = "expression statement" }
override string describeQlClass() { result = "ExprStmt" }
override string getAPrimaryQlClass() { result = "ExprStmt" }
}
/**
@@ -162,7 +162,7 @@ class SendStmt extends @sendstmt, Stmt {
override string toString() { result = "send statement" }
override string describeQlClass() { result = "SendStmt" }
override string getAPrimaryQlClass() { result = "SendStmt" }
}
/**
@@ -199,7 +199,7 @@ class IncStmt extends @incstmt, IncDecStmt {
override string toString() { result = "increment statement" }
override string describeQlClass() { result = "IncStmt" }
override string getAPrimaryQlClass() { result = "IncStmt" }
}
/**
@@ -216,7 +216,7 @@ class DecStmt extends @decstmt, IncDecStmt {
override string toString() { result = "decrement statement" }
override string describeQlClass() { result = "DecStmt" }
override string getAPrimaryQlClass() { result = "DecStmt" }
}
/**
@@ -287,7 +287,7 @@ class Assignment extends @assignment, Stmt {
* ```
*/
class SimpleAssignStmt extends @simpleassignstmt, Assignment {
override string describeQlClass() { result = "SimpleAssignStmt" }
override string getAPrimaryQlClass() { result = "SimpleAssignStmt" }
}
/**
@@ -304,7 +304,7 @@ class SimpleAssignStmt extends @simpleassignstmt, Assignment {
class AssignStmt extends @assignstmt, SimpleAssignStmt {
override string getOperator() { result = "=" }
override string describeQlClass() { result = "AssignStmt" }
override string getAPrimaryQlClass() { result = "AssignStmt" }
}
/**
@@ -319,7 +319,7 @@ class AssignStmt extends @assignstmt, SimpleAssignStmt {
class DefineStmt extends @definestmt, SimpleAssignStmt {
override string getOperator() { result = ":=" }
override string describeQlClass() { result = "DefineStmt" }
override string getAPrimaryQlClass() { result = "DefineStmt" }
}
/**
@@ -346,7 +346,7 @@ class CompoundAssignStmt extends @compoundassignstmt, Assignment { }
class AddAssignStmt extends @addassignstmt, CompoundAssignStmt {
override string getOperator() { result = "+=" }
override string describeQlClass() { result = "AddAssignStmt" }
override string getAPrimaryQlClass() { result = "AddAssignStmt" }
}
/**
@@ -361,7 +361,7 @@ class AddAssignStmt extends @addassignstmt, CompoundAssignStmt {
class SubAssignStmt extends @subassignstmt, CompoundAssignStmt {
override string getOperator() { result = "-=" }
override string describeQlClass() { result = "SubAssignStmt" }
override string getAPrimaryQlClass() { result = "SubAssignStmt" }
}
/**
@@ -376,7 +376,7 @@ class SubAssignStmt extends @subassignstmt, CompoundAssignStmt {
class MulAssignStmt extends @mulassignstmt, CompoundAssignStmt {
override string getOperator() { result = "*=" }
override string describeQlClass() { result = "MulAssignStmt" }
override string getAPrimaryQlClass() { result = "MulAssignStmt" }
}
/**
@@ -391,7 +391,7 @@ class MulAssignStmt extends @mulassignstmt, CompoundAssignStmt {
class QuoAssignStmt extends @quoassignstmt, CompoundAssignStmt {
override string getOperator() { result = "/=" }
override string describeQlClass() { result = "QuoAssignStmt" }
override string getAPrimaryQlClass() { result = "QuoAssignStmt" }
}
class DivAssignStmt = QuoAssignStmt;
@@ -408,7 +408,7 @@ class DivAssignStmt = QuoAssignStmt;
class RemAssignStmt extends @remassignstmt, CompoundAssignStmt {
override string getOperator() { result = "%=" }
override string describeQlClass() { result = "RemAssignStmt" }
override string getAPrimaryQlClass() { result = "RemAssignStmt" }
}
class ModAssignStmt = RemAssignStmt;
@@ -425,7 +425,7 @@ class ModAssignStmt = RemAssignStmt;
class AndAssignStmt extends @andassignstmt, CompoundAssignStmt {
override string getOperator() { result = "&=" }
override string describeQlClass() { result = "AndAssignStmt" }
override string getAPrimaryQlClass() { result = "AndAssignStmt" }
}
/**
@@ -440,7 +440,7 @@ class AndAssignStmt extends @andassignstmt, CompoundAssignStmt {
class OrAssignStmt extends @orassignstmt, CompoundAssignStmt {
override string getOperator() { result = "|=" }
override string describeQlClass() { result = "OrAssignStmt" }
override string getAPrimaryQlClass() { result = "OrAssignStmt" }
}
/**
@@ -455,7 +455,7 @@ class OrAssignStmt extends @orassignstmt, CompoundAssignStmt {
class XorAssignStmt extends @xorassignstmt, CompoundAssignStmt {
override string getOperator() { result = "^=" }
override string describeQlClass() { result = "XorAssignStmt" }
override string getAPrimaryQlClass() { result = "XorAssignStmt" }
}
/**
@@ -470,7 +470,7 @@ class XorAssignStmt extends @xorassignstmt, CompoundAssignStmt {
class ShlAssignStmt extends @shlassignstmt, CompoundAssignStmt {
override string getOperator() { result = "<<=" }
override string describeQlClass() { result = "ShlAssignStmt" }
override string getAPrimaryQlClass() { result = "ShlAssignStmt" }
}
class LShiftAssignStmt = ShlAssignStmt;
@@ -487,7 +487,7 @@ class LShiftAssignStmt = ShlAssignStmt;
class ShrAssignStmt extends @shrassignstmt, CompoundAssignStmt {
override string getOperator() { result = ">>=" }
override string describeQlClass() { result = "ShrAssignStmt" }
override string getAPrimaryQlClass() { result = "ShrAssignStmt" }
}
class RShiftAssignStmt = ShrAssignStmt;
@@ -504,7 +504,7 @@ class RShiftAssignStmt = ShrAssignStmt;
class AndNotAssignStmt extends @andnotassignstmt, CompoundAssignStmt {
override string getOperator() { result = "&^=" }
override string describeQlClass() { result = "AndNotAssignStmt" }
override string getAPrimaryQlClass() { result = "AndNotAssignStmt" }
}
/**
@@ -524,7 +524,7 @@ class GoStmt extends @gostmt, Stmt {
override string toString() { result = "go statement" }
override string describeQlClass() { result = "GoStmt" }
override string getAPrimaryQlClass() { result = "GoStmt" }
}
/**
@@ -544,7 +544,7 @@ class DeferStmt extends @deferstmt, Stmt {
override string toString() { result = "defer statement" }
override string describeQlClass() { result = "DeferStmt" }
override string getAPrimaryQlClass() { result = "DeferStmt" }
}
/**
@@ -573,7 +573,7 @@ class ReturnStmt extends @returnstmt, Stmt {
override string toString() { result = "return statement" }
override string describeQlClass() { result = "ReturnStmt" }
override string getAPrimaryQlClass() { result = "ReturnStmt" }
}
/**
@@ -611,7 +611,7 @@ class BranchStmt extends @branchstmt, Stmt {
class BreakStmt extends @breakstmt, BranchStmt {
override string toString() { result = "break statement" }
override string describeQlClass() { result = "BreakStmt" }
override string getAPrimaryQlClass() { result = "BreakStmt" }
}
/**
@@ -627,7 +627,7 @@ class BreakStmt extends @breakstmt, BranchStmt {
class ContinueStmt extends @continuestmt, BranchStmt {
override string toString() { result = "continue statement" }
override string describeQlClass() { result = "ContinueStmt" }
override string getAPrimaryQlClass() { result = "ContinueStmt" }
}
/**
@@ -642,7 +642,7 @@ class ContinueStmt extends @continuestmt, BranchStmt {
class GotoStmt extends @gotostmt, BranchStmt {
override string toString() { result = "goto statement" }
override string describeQlClass() { result = "GotoStmt" }
override string getAPrimaryQlClass() { result = "GotoStmt" }
}
/**
@@ -657,7 +657,7 @@ class GotoStmt extends @gotostmt, BranchStmt {
class FallthroughStmt extends @fallthroughstmt, BranchStmt {
override string toString() { result = "fallthrough statement" }
override string describeQlClass() { result = "FallthroughStmt" }
override string getAPrimaryQlClass() { result = "FallthroughStmt" }
}
/**
@@ -686,7 +686,7 @@ class BlockStmt extends @blockstmt, Stmt, ScopeNode {
override string toString() { result = "block statement" }
override string describeQlClass() { result = "BlockStmt" }
override string getAPrimaryQlClass() { result = "BlockStmt" }
}
/**
@@ -724,7 +724,7 @@ class IfStmt extends @ifstmt, Stmt, ScopeNode {
override string toString() { result = "if statement" }
override string describeQlClass() { result = "IfStmt" }
override string getAPrimaryQlClass() { result = "IfStmt" }
}
/**
@@ -770,7 +770,7 @@ class CaseClause extends @caseclause, Stmt, ScopeNode {
override string toString() { result = "case clause" }
override string describeQlClass() { result = "CaseClause" }
override string getAPrimaryQlClass() { result = "CaseClause" }
}
/**
@@ -857,7 +857,7 @@ class ExpressionSwitchStmt extends @exprswitchstmt, SwitchStmt {
override string toString() { result = "expression-switch statement" }
override string describeQlClass() { result = "ExpressionSwitchStmt" }
override string getAPrimaryQlClass() { result = "ExpressionSwitchStmt" }
}
/**
@@ -892,7 +892,7 @@ class TypeSwitchStmt extends @typeswitchstmt, SwitchStmt {
override string toString() { result = "type-switch statement" }
override string describeQlClass() { result = "TypeSwitchStmt" }
override string getAPrimaryQlClass() { result = "TypeSwitchStmt" }
}
/**
@@ -935,7 +935,7 @@ class CommClause extends @commclause, Stmt, ScopeNode {
override string toString() { result = "comm clause" }
override string describeQlClass() { result = "CommClause" }
override string getAPrimaryQlClass() { result = "CommClause" }
}
/**
@@ -964,7 +964,7 @@ class RecvStmt extends Stmt {
result = this.(Assignment).getRhs()
}
override string describeQlClass() { result = "RecvStmt" }
override string getAPrimaryQlClass() { result = "RecvStmt" }
}
/**
@@ -1026,7 +1026,7 @@ class SelectStmt extends @selectstmt, Stmt {
override string toString() { result = "select statement" }
override string describeQlClass() { result = "SelectStmt" }
override string getAPrimaryQlClass() { result = "SelectStmt" }
}
/**
@@ -1089,7 +1089,7 @@ class ForStmt extends @forstmt, LoopStmt {
override string toString() { result = "for statement" }
override string describeQlClass() { result = "ForStmt" }
override string getAPrimaryQlClass() { result = "ForStmt" }
}
/**
@@ -1131,5 +1131,5 @@ class RangeStmt extends @rangestmt, LoopStmt {
override string toString() { result = "range statement" }
override string describeQlClass() { result = "RangeStmt" }
override string getAPrimaryQlClass() { result = "RangeStmt" }
}