Merge pull request #1324 from xzyfer/feat/import-media-query

Implement static media_queries for imports

Author: xzyfer

ast.hpp

@@ -492,12 +492,15 @@ namespace Sass {
   class Import : public Statement {
     vector<string>         files_;
     vector<Expression*>    urls_;
+    ADD_PROPERTY(List*, media_queries);
   public:
     Import(ParserState pstate)
     : Statement(pstate),
-      files_(vector<string>()), urls_(vector<Expression*>())
+      files_(vector<string>()),
+      urls_(vector<Expression*>()),
+      media_queries_(0)
     { }
-    vector<string>&         files() { return files_; }
+    vector<string>&      files()    { return files_; }
     vector<Expression*>& urls()     { return urls_; }
     ATTACH_OPERATIONS()
   };

expand.cpp

@@ -275,6 +275,7 @@ namespace Sass {
   Statement* Expand::operator()(Import* imp)
   {
     Import* result = new (ctx.mem) Import(imp->pstate());
+    result->media_queries(imp->media_queries());
     for ( size_t i = 0, S = imp->urls().size(); i < S; ++i) {
       result->urls().push_back(imp->urls()[i]->perform(eval->with(env, backtrace)));
     }

inspect.cpp

@@ -157,6 +157,10 @@ namespace Sass {
       }
 
       import->urls().front()->perform(this);
+      if (import->media_queries()) {
+        append_mandatory_space();
+        import->media_queries()->perform(this);
+      }
       append_delimiter();
       for (size_t i = 1, S = import->urls().size(); i < S; ++i) {
         append_mandatory_linefeed();
@@ -168,6 +172,10 @@ namespace Sass {
         }
 
         import->urls()[i]->perform(this);
+        if (import->media_queries()) {
+          append_mandatory_space();
+          import->media_queries()->perform(this);
+        }
         append_delimiter();
       }
     }

lexer.cpp

@@ -129,5 +129,13 @@ namespace Sass {
       return *src == 0 || *src == '\n' || *src == '\r' ? src : 0;
     }
 
+    // Assert end_of_file boundary (/\z/)
+    // This is a zero-width positive lookahead
+    const char* end_of_file(const char* src)
+    {
+      // end of file or unix linefeed return here
+      return *src == 0 ? src : 0;
+    }
+
   }
 }

lexer.hpp

@@ -65,7 +65,10 @@ namespace Sass {
     // Assert string boundaries (/\Z|\z|\A/)
     // There are zero-width positive lookaheads
     const char* end_of_line(const char* src);
-    // const char* end_of_string(const char* src);
+
+    // Assert end_of_file boundary (/\z/)
+    // This is a zero-width positive lookahead
+    const char* end_of_file(const char* src);
     // const char* start_of_string(const char* src);
 
     // Type definition for prelexer functions

parser.cpp

@@ -11,6 +11,7 @@
 #include "sass_functions.h"
 
 #include <typeinfo>
+#include <tuple>
 
 namespace Sass {
   using namespace std;
@@ -220,7 +221,8 @@ namespace Sass {
 
   void Parser::import_single_file (Import* imp, string import_path) {
 
-    if (!unquote(import_path).substr(0, 7).compare("http://") ||
+    if (imp->media_queries() ||
+        !unquote(import_path).substr(0, 7).compare("http://") ||
         !unquote(import_path).substr(0, 8).compare("https://") ||
         !unquote(import_path).substr(0, 2).compare("//"))
     {
@@ -282,14 +284,16 @@ namespace Sass {
   {
     lex< kwd_import >();
     Import* imp = new (ctx.mem) Import(pstate);
+    vector<pair<string,Function_Call*>> to_import;
     bool first = true;
     do {
       while (lex< block_comment >());
       if (lex< quoted_string >()) {
         if (!do_import(lexed, imp, ctx.c_importers, true))
         {
           // push single file import
-          import_single_file(imp, lexed);
+          // import_single_file(imp, lexed);
+          to_import.push_back(pair<string,Function_Call*>(string(lexed), 0));
         }
       }
       else if (lex< uri_prefix >()) {
@@ -311,14 +315,29 @@ namespace Sass {
           error("malformed URL", pstate);
         }
         if (!lex< exactly<')'> >()) error("URI is missing ')'", pstate);
-        imp->urls().push_back(result);
+        // imp->urls().push_back(result);
+        to_import.push_back(pair<string,Function_Call*>("", result));
       }
       else {
         if (first) error("@import directive requires a url or quoted path", pstate);
         else error("expecting another url or quoted path in @import list", pstate);
       }
       first = false;
     } while (lex_css< exactly<','> >());
+
+    if (!peek_css<alternatives<exactly<';'>,end_of_file>>()) {
+      List* media_queries = parse_media_queries();
+      imp->media_queries(media_queries);
+    }
+
+    for(auto location : to_import) {
+      if (location.second) {
+        imp->urls().push_back(location.second);
+      } else {
+        import_single_file(imp, location.first);
+      }
+    }
+
     return imp;
   }