Python: small refactor

yoff · yoff · commit 9b13834d28da · 2021-01-26T21:17:59.000+01:00
diff --git a/python/ql/src/semmle/python/Function.qll b/python/ql/src/semmle/python/Function.qll
@@ -39,6 +39,12 @@ class Function extends Function_, Scope, AstNode {
     exists(YieldFrom y | y.getScope() = this)
   }
 
+  /**
+   * Whether this is a lambda.
+   * We detect this by comparing its name to the one the extractor gives to lambdas.
+   */
+  predicate isLambda() { this.getName() = "lambda" }
+
   /** Whether this function is declared in a class and is named `__init__` */
   predicate isInitMethod() { this.isMethod() and this.getName() = "__init__" }
 
diff --git a/python/ql/src/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/src/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -499,12 +499,11 @@ import ArgumentPassing
 newtype TDataFlowCallable =
   TCallableValue(CallableValue callable) {
     callable instanceof FunctionValue and
-    // TODO: push into FunctionValue
-    not callable.(FunctionValue).getOrigin().getNode() instanceof Lambda
+    not callable.(FunctionValue).isLambda()
     or
     callable instanceof ClassValue
   } or
-  TLambda(Function lambda) { lambda.getName() = "lambda" } or
+  TLambda(Function lambda) { lambda.isLambda() } or
   TModule(Module m)
 
 /** Represents a callable. */
diff --git a/python/ql/src/semmle/python/objects/ObjectAPI.qll b/python/ql/src/semmle/python/objects/ObjectAPI.qll
@@ -720,6 +720,9 @@ abstract class FunctionValue extends CallableValue {
 
   /** Gets a class that this function may return */
   abstract ClassValue getAnInferredReturnType();
+
+  /** Wheter this is a lambda function */
+  predicate isLambda() { this.getOrigin().getNode() instanceof Lambda }
 }
 
 /** Class representing Python functions */

Original file line number	Diff line number	Diff line change
`@@ -720,6 +720,9 @@ abstract class FunctionValue extends CallableValue {`
`720`	`720`
`721`	`721`	`/** Gets a class that this function may return */`
`722`	`722`	`abstract ClassValue getAnInferredReturnType();`
	`723`	`+`
	`724`	`+ /** Wheter this is a lambda function */`
	`725`	`+ predicate isLambda() { this.getOrigin().getNode() instanceof Lambda }`
`723`	`726`	`}`
`724`	`727`
`725`	`728`	`/** Class representing Python functions */`