From 095eb803b3f7152838f00842f3ac770ef2ba2053 Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Thu, 18 Feb 2021 13:43:14 +0100 Subject: [PATCH] AST: improve type of getDefaultValue --- ql/src/codeql_ruby/ast/Parameter.qll | 6 ++---- ql/src/codeql_ruby/ast/internal/Parameter.qll | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ql/src/codeql_ruby/ast/Parameter.qll b/ql/src/codeql_ruby/ast/Parameter.qll index 76cba8c717f..88d77727488 100644 --- a/ql/src/codeql_ruby/ast/Parameter.qll +++ b/ql/src/codeql_ruby/ast/Parameter.qll @@ -120,9 +120,8 @@ class KeywordParameter extends @keyword_parameter, NamedParameter { * Gets the default value, i.e. the value assigned to the parameter when one * is not provided by the caller. If the parameter is mandatory and does not * have a default value, this predicate has no result. - * TODO: better return type (Expr?) */ - final AstNode getDefaultValue() { result = range.getDefaultValue() } + final Expr getDefaultValue() { result = range.getDefaultValue() } /** * Holds if the parameter is optional. That is, there is a default value that @@ -148,9 +147,8 @@ class OptionalParameter extends @optional_parameter, NamedParameter { /** * Gets the default value, i.e. the value assigned to the parameter when one * is not provided by the caller. - * TODO: better return type (Expr?) */ - final AstNode getDefaultValue() { result = range.getDefaultValue() } + final Expr getDefaultValue() { result = range.getDefaultValue() } } /** diff --git a/ql/src/codeql_ruby/ast/internal/Parameter.qll b/ql/src/codeql_ruby/ast/internal/Parameter.qll index a891df165f0..5d4026eda5c 100644 --- a/ql/src/codeql_ruby/ast/internal/Parameter.qll +++ b/ql/src/codeql_ruby/ast/internal/Parameter.qll @@ -100,7 +100,7 @@ module KeywordParameter { result = TLocalVariable(_, _, generated.getName()) } - final Generated::AstNode getDefaultValue() { result = generated.getValue() } + final Expr::Range getDefaultValue() { result = generated.getValue() } final override string toString() { result = this.getName() } @@ -116,7 +116,7 @@ module OptionalParameter { result = TLocalVariable(_, _, generated.getName()) } - final Generated::AstNode getDefaultValue() { result = generated.getValue() } + final Expr::Range getDefaultValue() { result = generated.getValue() } final override string toString() { result = this.getName() }