Skip to content

Commit 6630287

Browse files
mgreterxzyfer
authored andcommitted
Fix string schema issue and interpolation as lhs operand
1 parent 233f2b3 commit 6630287

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/eval.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -504,15 +504,15 @@ namespace Sass {
504504
}
505505

506506
// only the last item will be used to eval the binary expression
507-
if (String_Schema* s_1 = dynamic_cast<String_Schema*>(b->left())) {
508-
if (!s_1->is_right_interpolant()) {
509-
ret_schema = SASS_MEMORY_NEW(ctx.mem, String_Schema, s_1->pstate());
507+
if (String_Schema* s_l = dynamic_cast<String_Schema*>(b->left())) {
508+
if (!s_l->has_interpolant() && (!s_l->is_right_interpolant())) {
509+
ret_schema = SASS_MEMORY_NEW(ctx.mem, String_Schema, s_l->pstate());
510510
Binary_Expression* bin_ex = SASS_MEMORY_NEW(ctx.mem, Binary_Expression, b->pstate(),
511-
b->op(), s_1->last(), b->right());
511+
b->op(), s_l->last(), b->right());
512512
bin_ex->is_delayed(b->left()->is_delayed() || b->right()->is_delayed());
513513
// bin_ex->is_interpolant(b->left()->is_interpolant());
514-
for (size_t i = 0; i < s_1->length() - 1; ++i) {
515-
*ret_schema << s_1->at(i)->perform(this);
514+
for (size_t i = 0; i < s_l->length() - 1; ++i) {
515+
*ret_schema << s_l->at(i)->perform(this);
516516
}
517517
*ret_schema << bin_ex->perform(this);
518518
return ret_schema->perform(this);

0 commit comments

Comments
 (0)