[WIP] Expose import stack

Makefile

@@ -152,9 +152,11 @@ ifeq (MinGW,$(UNAME))
 		LIB_SHARED  = $(SASS_LIBSASS_PATH)/lib/libsass.dll
 	endif
 else
-	CFLAGS   += -fPIC
-	CXXFLAGS += -fPIC
-	LDFLAGS  += -fPIC
+	ifneq (Cygwin,$(UNAME))
+		CFLAGS   += -fPIC
+		CXXFLAGS += -fPIC
+		LDFLAGS  += -fPIC
+	endif
 endif
 
 ifeq (MinGW,$(UNAME))
@@ -177,9 +179,11 @@ ifeq (MinGW,$(UNAME))
 		CXXFLAGS  += -D ADD_EXPORTS
 	endif
 else
-	CFLAGS   += -fPIC
-	CXXFLAGS += -fPIC
-	LDFLAGS  += -fPIC
+	ifneq (Cygwin,$(UNAME))
+		CFLAGS   += -fPIC
+		CXXFLAGS += -fPIC
+		LDFLAGS  += -fPIC
+	endif
 endif
 
 OBJECTS = $(addprefix src/,$(SOURCES:.cpp=.o))

script/ci-build-libsass

@@ -62,19 +62,19 @@ if [ "x$AUTOTOOLS" == "xyes" ]; then
     ${SHARED_OPT}
   echo -en 'travis_fold:end:configure\r'
 
-  make clean $MAKE_OPTS
+  make $MAKE_OPTS clean
 
   # install to prefix directory
-  PREFIX="$PREFIX" make install
+  PREFIX="$PREFIX" make $MAKE_OPTS install
 
 else
 
-  make clean $MAKE_OPTS
+  make $MAKE_OPTS clean
 
 fi
 
 # install to prefix directory
-PREFIX="$PREFIX" make install
+PREFIX="$PREFIX" make $MAKE_OPTS install
 
 ls -la $PREFIX/*
 

src/ast.cpp

@@ -1859,17 +1859,17 @@ namespace Sass {
     // resolved color
     std::string res_name = name;
 
-    double r = round(cap_channel<0xff>(r_));
-    double g = round(cap_channel<0xff>(g_));
-    double b = round(cap_channel<0xff>(b_));
+    double r = Sass::round(cap_channel<0xff>(r_));
+    double g = Sass::round(cap_channel<0xff>(g_));
+    double b = Sass::round(cap_channel<0xff>(b_));
     double a = cap_channel<1>   (a_);
 
     // get color from given name (if one was given at all)
     if (name != "" && name_to_color(name)) {
       const Color* n = name_to_color(name);
-      r = round(cap_channel<0xff>(n->r()));
-      g = round(cap_channel<0xff>(n->g()));
-      b = round(cap_channel<0xff>(n->b()));
+      r = Sass::round(cap_channel<0xff>(n->r()));
+      g = Sass::round(cap_channel<0xff>(n->g()));
+      b = Sass::round(cap_channel<0xff>(n->b()));
       a = cap_channel<1>   (n->a());
     }
     // otherwise get the possible resolved color name

src/ast.hpp

@@ -310,6 +310,7 @@ namespace Sass {
       DECLARATION,
       ASSIGNMENT,
       IMPORT_STUB,
+      IMPORTED,
       IMPORT,
       COMMENT,
       WARNING,
@@ -537,30 +538,47 @@ namespace Sass {
   // necessary to store a list of each in an Import node.
   ////////////////////////////////////////////////////////////////////////////
   class Import : public Statement {
-    std::vector<std::string>         files_;
-    std::vector<Expression*>    urls_;
-    ADD_PROPERTY(List*, media_queries);
+    std::vector<Expression*> urls_;
+    std::vector<Include>     incs_;
+    ADD_PROPERTY(List*,      media_queries);
   public:
     Import(ParserState pstate)
     : Statement(pstate),
-      files_(std::vector<std::string>()),
       urls_(std::vector<Expression*>()),
+      incs_(std::vector<Include>()),
       media_queries_(0)
     { statement_type(IMPORT); }
-    std::vector<std::string>&      files()    { return files_; }
-    std::vector<Expression*>& urls()     { return urls_; }
+    std::vector<Expression*>& urls() { return urls_; }
+    std::vector<Include>& incs() { return incs_; }
     ATTACH_OPERATIONS()
   };
 
+  // not yet resolved single import
+  // so far we only know requested name
   class Import_Stub : public Statement {
-    ADD_PROPERTY(std::string, file_name)
+    Include resource_;
   public:
-    Import_Stub(ParserState pstate, std::string f)
-    : Statement(pstate), file_name_(f)
+    std::string abs_path() { return resource_.abs_path; };
+    std::string imp_path() { return resource_.imp_path; };
+    Include resource() { return resource_; };
+
+    Import_Stub(ParserState pstate, Include res)
+    : Statement(pstate), resource_(res)
     { statement_type(IMPORT_STUB); }
     ATTACH_OPERATIONS()
   };
 
+  class Imported : public Has_Block {
+    ADD_PROPERTY(std::string, file_name)
+    ADD_PROPERTY(Import_Stub*, import_stub)
+  public:
+    Imported(Import_Stub* import_stub, Block* inner)
+    : Has_Block(import_stub->pstate(), inner),
+      import_stub_(import_stub)
+    { statement_type(IMPORTED); }
+    ATTACH_OPERATIONS()
+  };
+
   //////////////////////////////
   // The Sass `@warn` directive.
   //////////////////////////////

src/ast_fwd_decl.hpp

@@ -6,8 +6,6 @@
 /////////////////////////////////////////////
 namespace Sass {
 
-  enum Output_Style { NESTED, EXPANDED, COMPACT, COMPRESSED, FORMATTED };
-
   class AST_Node;
   // statements
   class Statement;
@@ -23,6 +21,7 @@ namespace Sass {
   class Declaration;
   class Assignment;
   class Import;
+  class Imported;
   class Import_Stub;
   class Warning;
   class Error;

src/backtrace.hpp

@@ -33,7 +33,7 @@ namespace Sass {
       while (this_point->parent) {
 
         // make path relative to the current directory
-        std::string rel_path(Sass::File::resolve_relative_path(this_point->pstate.path, cwd, cwd));
+        std::string rel_path(Sass::File::abs2rel(this_point->pstate.path, cwd, cwd));
 
         if (warning) {
           ss << std::endl