diff --git a/reusablecfg/src/main/jastadd/AlreadyClosedAnalysis.jrag b/reusablecfg/src/main/jastadd/AlreadyClosedAnalysis.jrag index 47d49883d9f55261f2966855698bc59195d3a5cd..5767ebbada61e979ee123e9a4800074609177cb2 100644 --- a/reusablecfg/src/main/jastadd/AlreadyClosedAnalysis.jrag +++ b/reusablecfg/src/main/jastadd/AlreadyClosedAnalysis.jrag @@ -87,4 +87,8 @@ aspect AlreadyClosedAnalysis { /** Check if this is a Reader or Writer. */ syn boolean TypeDecl.isCloseable() = !isUnknown() && instanceOf(lookupType("java.io", "Closeable")); + + /** @return {@code true} if this method access has the given variable as receiver. */ + syn boolean MethodAccess.hasReceiver(Variable receiver) = + hasPrevExpr() && prevExpr().isVariable(receiver); } diff --git a/reusablecfg/src/main/jastadd/VariableDeclarationScope.jrag b/reusablecfg/src/main/jastadd/VariableDeclarationScope.jrag index 653d51169e81577c0611a9970b4c60505790cf36..26be09c12a2ba7feb9c471db0d398c0f9ba60f58 100644 --- a/reusablecfg/src/main/jastadd/VariableDeclarationScope.jrag +++ b/reusablecfg/src/main/jastadd/VariableDeclarationScope.jrag @@ -20,10 +20,6 @@ */ aspect VariableDeclarationScope { - /** @return {@code true} if this method access has the given variable as receiver. */ - syn boolean MethodAccess.hasReceiver(Variable receiver) = - hasPrevExpr() && prevExpr().isVariable(receiver); - /** * Test if the CFG node is tied to a statement that declares the variable, * or if the declaration of the variable is somewhere inside the statement this