hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-29 14:23:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #171 from owen-mc/typeexprs-extend-typeexpr

Browse Source 
Make `ArrayTypeExpr` and so on extend `TypeExpr`
This commit is contained in:
Max Schaefer
2020-06-11 17:20:29 +01:00
committed by GitHub
parent b164cf33c7 c891d22f74
commit 40ffa221bc
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/language/learn-ql/go/ast-class-reference.rst
View File

@@ -380,8 +380,8 @@ All classes in this subsection are subclasses of
Type expressions
~~~~~~~~~~~~~~~~
These classes represent different expressions for types. They do
not have a common superclass.
All classes in this subsection are subclasses of
`TypeExpr <https://help.semmle.com/qldoc/go/semmle/go/Expr.qll/type.Expr$TypeExpr.html>`__.
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------------------+
| Expression syntax | CodeQL class | Superclasses |

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

@@ -687,7 +687,7 @@ class KeyValueExpr extends @keyvalueexpr, Expr {
* [5]int
* ```
*/
class ArrayTypeExpr extends @arraytypeexpr, Expr {
class ArrayTypeExpr extends @arraytypeexpr, TypeExpr {
/** Gets the length expression of this array type. */
Expr getLength() { result = getChildExpr(0) }
@@ -706,7 +706,7 @@ class ArrayTypeExpr extends @arraytypeexpr, Expr {
* struct {x, y int; z float32}
* ```
*/
class StructTypeExpr extends @structtypeexpr, Expr {
class StructTypeExpr extends @structtypeexpr, TypeExpr {
/** Gets the `i`th field declared in this struct type expression (0-based). */
FieldDecl getField(int i) { fields(result, this, i) }
@@ -728,7 +728,7 @@ class StructTypeExpr extends @structtypeexpr, Expr {
* func(a, b int, c float32) (float32, bool)
* ```
*/
class FuncTypeExpr extends @functypeexpr, Expr, ScopeNode {
class FuncTypeExpr extends @functypeexpr, TypeExpr, ScopeNode {
/** Gets the `i`th parameter of this function type (0-based). */
ParameterDecl getParameterDecl(int i) {
result.getFunctionTypeExpr() = this and
@@ -768,7 +768,7 @@ class FuncTypeExpr extends @functypeexpr, Expr, ScopeNode {
* interface { Read(p []byte) (n int, err error); Close() error}
* ```
*/
class InterfaceTypeExpr extends @interfacetypeexpr, Expr {
class InterfaceTypeExpr extends @interfacetypeexpr, TypeExpr {
/** Gets the `i`th method specification of this interface type. */
MethodSpec getMethod(int i) {
result.getInterfaceTypeExpr() = this and
@@ -793,7 +793,7 @@ class InterfaceTypeExpr extends @interfacetypeexpr, Expr {
* map[string]int
* ```
*/
class MapTypeExpr extends @maptypeexpr, Expr {
class MapTypeExpr extends @maptypeexpr, TypeExpr {
/** Gets the expression representing the key type of this map type. */
Expr getKeyTypeExpr() { result = getChildExpr(0) }
@@ -1456,7 +1456,7 @@ class AndNotExpr extends @andnotexpr, BitwiseBinaryExpr {
* <-chan int
* ```
*/
class ChanTypeExpr extends @chantypeexpr, Expr {
class ChanTypeExpr extends @chantypeexpr, TypeExpr {
/**
* Gets the expression representing the type of values flowing through the channel.
*/
@@ -1697,12 +1697,12 @@ class LabelName extends Name {
*/
private predicate isTypeExprBottomUp(Expr e) {
e instanceof TypeName or
e instanceof ArrayTypeExpr or
e instanceof StructTypeExpr or
e instanceof FuncTypeExpr or
e instanceof InterfaceTypeExpr or
e instanceof MapTypeExpr or
e instanceof ChanTypeExpr or
e instanceof @arraytypeexpr or
e instanceof @structtypeexpr or
e instanceof @functypeexpr or
e instanceof @interfacetypeexpr or
e instanceof @maptypeexpr or
e instanceof @chantypeexpr or
isTypeExprBottomUp(e.(ParenExpr).getExpr()) or
isTypeExprBottomUp(e.(StarExpr).getBase()) or
isTypeExprBottomUp(e.(Ellipsis).getOperand())