@@ -2272,7 +2272,11 @@ private module Input3 implements InputSig3 {
22722272 BoolType ( ) { this .getTypeItem ( ) instanceof Builtins:: Bool }
22732273 }
22742274
2275- class AstNode = Rust:: AstNode ;
2275+ class AstNode extends Rust:: AstNode {
2276+ AstNode getParent ( ) { result = this .getParentNode ( ) }
2277+ }
2278+
2279+ AstNode getTypeParameterScope ( TypeParameter tp ) { result = tp .getScope ( ) }
22762280
22772281 final class Expr = ExprImpl ;
22782282
@@ -2286,13 +2290,13 @@ private module Input3 implements InputSig3 {
22862290 TypeMention getType ( ) { result = this .getTypeRepr ( ) }
22872291 }
22882292
2289- class Switch extends Rust:: MatchExpr {
2293+ class Switch extends Expr , Rust:: MatchExpr {
22902294 Expr getExpr ( ) { result = this .getScrutinee ( ) }
22912295
22922296 Case getCase ( int index ) { result = this .getArm ( index ) }
22932297 }
22942298
2295- class Case extends Rust:: MatchArm {
2299+ class Case extends AstNode , Rust:: MatchArm {
22962300 AstNode getAPattern ( ) { result = this .getPat ( ) }
22972301
22982302 AstNode getBody ( ) { result = this .getExpr ( ) }
@@ -2449,8 +2453,8 @@ private module Input3 implements InputSig3 {
24492453 // mutual recursion; resolving fields requires resolving types and vice versa
24502454 result =
24512455 [
2452- resolveStructFieldExpr ( this , _) .( AstNode ) ,
2453- resolveTupleFieldExpr ( this , _)
2456+ resolveStructFieldExpr ( this , _) .( Field ) ,
2457+ resolveTupleFieldExpr ( this , _) . ( Field )
24542458 ]
24552459 }
24562460 }
@@ -2480,7 +2484,7 @@ private module Input3 implements InputSig3 {
24802484 )
24812485 }
24822486
2483- class Return extends ReturnExpr {
2487+ class Return extends Expr , ReturnExpr {
24842488 Expr getExpr ( ) { result = super .getExpr ( ) }
24852489 }
24862490
@@ -2583,15 +2587,15 @@ private module Input3 implements InputSig3 {
25832587 override TypeItem getTypeItem ( ) { result = this }
25842588
25852589 override Parameter getParameter ( int i ) {
2586- result = [ super .getTupleField ( i ) .( AstNode ) , super .getNthStructField ( i ) ]
2590+ result = [ super .getTupleField ( i ) .( Parameter ) , super .getNthStructField ( i ) . ( Parameter ) ]
25872591 }
25882592 }
25892593
25902594 private class VariantConstructor extends ConstructorImpl instanceof Variant {
25912595 override TypeItem getTypeItem ( ) { result = super .getEnum ( ) }
25922596
25932597 override Parameter getParameter ( int i ) {
2594- result = [ super .getTupleField ( i ) .( AstNode ) , super .getNthStructField ( i ) ]
2598+ result = [ super .getTupleField ( i ) .( Parameter ) , super .getNthStructField ( i ) . ( Parameter ) ]
25952599 }
25962600 }
25972601
@@ -3155,7 +3159,7 @@ module Consistency = M3::Consistency;
31553159
31563160module CachedStage = M3:: CachedStage;
31573161
3158- private predicate typeTestAstNodeRepr ( AstNode n , string repr ) {
3162+ private predicate typeTestAstNodeRepr ( Input3 :: AstNode n , string repr ) {
31593163 repr = [ n .toString ( ) , n .( IdentPat ) .getName ( ) .getText ( ) ]
31603164}
31613165
0 commit comments