Skip to content

Commit 1587a2a

Browse files
authored
Merge pull request #2948 from nschonni/fix--Update-"call"-parameter-to-$function
fix: Update "call" parameter to $function
2 parents ac338df + d5d30da commit 1587a2a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/fn_miscs.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,21 @@ namespace Sass {
9191
return SASS_MEMORY_NEW(Boolean, pstate, features->find(s) != features->end());
9292
}
9393

94-
Signature call_sig = "call($name, $args...)";
94+
Signature call_sig = "call($function, $args...)";
9595
BUILT_IN(call)
9696
{
97-
std::string name;
98-
Function* ff = Cast<Function>(env["$name"]);
99-
String_Constant* ss = Cast<String_Constant>(env["$name"]);
97+
std::string function;
98+
Function* ff = Cast<Function>(env["$function"]);
99+
String_Constant* ss = Cast<String_Constant>(env["$function"]);
100100

101101
if (ss) {
102-
name = Util::normalize_underscores(unquote(ss->value()));
102+
function = Util::normalize_underscores(unquote(ss->value()));
103103
std::cerr << "DEPRECATION WARNING: ";
104104
std::cerr << "Passing a string to call() is deprecated and will be illegal" << std::endl;
105-
std::cerr << "in Sass 4.0. Use call(get-function(" + quote(name) + ")) instead." << std::endl;
105+
std::cerr << "in Sass 4.0. Use call(get-function(" + quote(function) + ")) instead." << std::endl;
106106
std::cerr << std::endl;
107107
} else if (ff) {
108-
name = ff->name();
108+
function = ff->name();
109109
}
110110

111111
List_Obj arglist = SASS_MEMORY_COPY(ARG("$args", List));
@@ -135,7 +135,7 @@ namespace Sass {
135135
args->append(SASS_MEMORY_NEW(Argument, pstate, expr));
136136
}
137137
}
138-
Function_Call_Obj func = SASS_MEMORY_NEW(Function_Call, pstate, name, args);
138+
Function_Call_Obj func = SASS_MEMORY_NEW(Function_Call, pstate, function, args);
139139

140140
Expand expand(ctx, &d_env, &selector_stack, &original_stack);
141141
func->via_call(true); // calc invoke is allowed

0 commit comments

Comments
 (0)