diff --git a/allyourbase.jam b/allyourbase.jam index 36769d85c..9f6327982 100644 --- a/allyourbase.jam +++ b/allyourbase.jam @@ -1750,25 +1750,10 @@ rule FGristSourceFiles # join values... : [separator] # # Pastes values together into a single list element, separated by an optional separator. -rule join +rule join ( values * : sep ? ) { - # Puts the variables together, removing spaces. - - local _t _r ; - - _r = $(<[1]) ; - - local sep = $(>) ; - if ! $(sep) - { - sep = "" ; - } - for _t in $(<[2-]) - { - _r = $(_r)$(sep)$(_t) ; - } - - return $(_r) ; + sep ?= "" ; + return $(values:J=$(sep)) ; } # Given $(<), the tokens comprising a relative path from D1 to a subdirectory diff --git a/v1/allyourbase.jam b/v1/allyourbase.jam index 36769d85c..9f6327982 100644 --- a/v1/allyourbase.jam +++ b/v1/allyourbase.jam @@ -1750,25 +1750,10 @@ rule FGristSourceFiles # join values... : [separator] # # Pastes values together into a single list element, separated by an optional separator. -rule join +rule join ( values * : sep ? ) { - # Puts the variables together, removing spaces. - - local _t _r ; - - _r = $(<[1]) ; - - local sep = $(>) ; - if ! $(sep) - { - sep = "" ; - } - for _t in $(<[2-]) - { - _r = $(_r)$(sep)$(_t) ; - } - - return $(_r) ; + sep ?= "" ; + return $(values:J=$(sep)) ; } # Given $(<), the tokens comprising a relative path from D1 to a subdirectory