Merge pull request #373 from wonja/interpolants_in_css_imports

Aaron Leung · Aaron Leung · commit 78735f7d7638 · 2014-06-02T18:47:28.000-07:00
Correctly interpret variable interpolants in @import css statements. Fix...
diff --git a/expand.cpp b/expand.cpp
@@ -141,9 +141,13 @@ namespace Sass {
     return 0;
   }
 
-  Statement* Expand::operator()(Import* i)
+  Statement* Expand::operator()(Import* imp)
   {
-    return i; // TODO: eval i->urls()
+    Import* result = new (ctx.mem) Import(imp->path(), imp->position());
+    for ( size_t i = 0, S = imp->urls().size(); i < S; ++i) {
+      result->urls().push_back(imp->urls()[i]->perform(eval->with(env, backtrace)));
+    }
+    return result;
   }
 
   Statement* Expand::operator()(Import_Stub* i)

Original file line number	Diff line number	Diff line change
`@@ -141,9 +141,13 @@ namespace Sass {`
`141`	`141`	`return 0;`
`142`	`142`	`}`
`143`	`143`
`144`		`- Statement* Expand::operator()(Import* i)`
	`144`	`+ Statement* Expand::operator()(Import* imp)`
`145`	`145`	`{`
`146`		`- return i; // TODO: eval i->urls()`
	`146`	`+ Import* result = new (ctx.mem) Import(imp->path(), imp->position());`
	`147`	`+ for ( size_t i = 0, S = imp->urls().size(); i < S; ++i) {`
	`148`	`+ result->urls().push_back(imp->urls()[i]->perform(eval->with(env, backtrace)));`
	`149`	`+ }`
	`150`	`+ return result;`
`147`	`151`	`}`
`148`	`152`
`149`	`153`	`Statement* Expand::operator()(Import_Stub* i)`