Skip to content

Commit 51138d0

Browse files
committed
Merge pull request #1587 from xzyfer/fix/issue-1566
Fix incorrect coersion of rest arguments
2 parents a42f7c8 + 63820f9 commit 51138d0

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/functions.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,9 +1579,10 @@ namespace Sass {
15791579
size_t param_size = params ? params->length() : 0;
15801580
for (size_t i = 0, L = arglist->length(); i < L; ++i) {
15811581
Expression* expr = arglist->value_at_index(i);
1582-
Parameter* p = param_size > i ? (*params)[i] : 0;
1583-
if (List* list = dynamic_cast<List*>(expr)) {
1584-
if (p && !p->is_rest_parameter()) expr = (*list)[0];
1582+
if (params->has_rest_parameter()) {
1583+
Parameter* p = param_size > i ? (*params)[i] : 0;
1584+
List* list = dynamic_cast<List*>(expr);
1585+
if (list && p && !p->is_rest_parameter()) expr = (*list)[0];
15851586
}
15861587
if (arglist->is_arglist()) {
15871588
Argument* arg = dynamic_cast<Argument*>((*arglist)[i]);

0 commit comments

Comments
 (0)