Skip to content

Commit f90a0fb

Browse files
committed
Merge pull request #1588 from xzyfer/fix/issue-1418
Named arguments to call should stay named arguments when called
2 parents 51138d0 + 45c4e78 commit f90a0fb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/bind.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ namespace Sass {
107107
(*arglist) << SASS_MEMORY_NEW(ctx.mem, Argument,
108108
key->pstate(),
109109
argmap->at(key),
110-
name,
110+
"$" + name,
111111
false,
112112
false);
113113
}

src/functions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,7 @@ 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-
if (params->has_rest_parameter()) {
1582+
if (params && params->has_rest_parameter()) {
15831583
Parameter* p = param_size > i ? (*params)[i] : 0;
15841584
List* list = dynamic_cast<List*>(expr);
15851585
if (list && p && !p->is_rest_parameter()) expr = (*list)[0];
@@ -1589,7 +1589,7 @@ namespace Sass {
15891589
*args << SASS_MEMORY_NEW(ctx.mem, Argument,
15901590
pstate,
15911591
expr,
1592-
"",
1592+
arg ? arg->name() : "",
15931593
arg ? arg->is_rest_argument() : false,
15941594
arg ? arg->is_keyword_argument() : false);
15951595
} else {

0 commit comments

Comments
 (0)