Environment.expand_varref has the same allowed parameter types and returns as Varset.expand_varref

This commit is contained in:
michael.metivier 2018-11-02 08:52:23 -04:00 committed by Josh Holtrop
parent c34821864e
commit 7edcef2b30

View File

@ -386,12 +386,12 @@ module Rscons
# Expand a construction variable reference. # Expand a construction variable reference.
# #
# @param varref [Array, String] Variable reference to expand. # @param varref [nil, String, Array, Proc, Symbol, TrueClass, FalseClass] Variable reference to expand.
# @param extra_vars [Hash, VarSet] # @param extra_vars [Hash, VarSet]
# Extra variables to use in addition to (or replace) the Environment's # Extra variables to use in addition to (or replace) the Environment's
# construction variables when expanding the variable reference. # construction variables when expanding the variable reference.
# #
# @return [Array, String] Expansion of the variable reference. # @return [nil, String, Array, Symbol, TrueClass, FalseClass] Expansion of the variable reference.
def expand_varref(varref, extra_vars = nil) def expand_varref(varref, extra_vars = nil)
vars = if extra_vars.nil? vars = if extra_vars.nil?
@varset @varset