sassc 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c779167157d51896c8f2f389090e3bbdf10ad30d
-  data.tar.gz: 744962a099ec22bd66708d7954d3561f422e5a9e
+  metadata.gz: 84e3ac644262800f310def2ddd6a33b788173644
+  data.tar.gz: 60a9b9684751c114079664615eac210ca91b50f3
 SHA512:
-  metadata.gz: 0c122bd12dc2c6ffa15b85d9ed1b0045a1419d7fbd2ad67220e3d332dea6b3fdfe725dd9d143f6680068ee033c41c066f70a30893483c7e757595d79ae9be2f9
-  data.tar.gz: 6a0be2aeab3aa77e953861f328a9e09cffefefc8ef0521ca24e01e3d2e5493c9eca37d6b57c410764a9bd74c9f4a2e8715f672ddedfc18e557ea2c243552d5f4
+  metadata.gz: 447d7bf985003fb37bf86ae08e9b7f2aca73b440ff073926f809225eec7ccb152a9a8361111e2349f3894bda5b4c6f2c2a52a781ebb5cebe9873f37ebe90edfc
+  data.tar.gz: d5f9074a354e20f40b43cb48ae8ce8cae436f6c9b1a7cf7a5c3f3b8f6b6ba81bdd4ca5dd375ac921f565786e44e316885a6596ffab7f13f9173873b467d12a26

data/Rakefile

@@ -11,7 +11,7 @@ task prepare: "ext/lib/libsass.so"
 file "ext/lib/libsass.so" do
   gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"
   cd "ext/libsass"
-  sh "make lib/libsass.so"
+  sh 'make lib/libsass.so LDFLAGS="-Wall -O2"'
   cd gem_dir
 end
 

data/ext/libsass/.gitignore

@@ -14,23 +14,25 @@
 Makefile.in
 /aclocal.m4
 /autom4te.cache/
-/config.guess
 /config.h
 /config.h.in
 /config.log
 /config.status
-/config.sub
 /configure
-/depcomp
-/install-sh
 /libtool
-/ltmain.sh
 /m4/libtool.m4
 /m4/ltoptions.m4
 /m4/ltsugar.m4
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
-/missing
+/script/compile
+/script/config.guess
+/script/config.sub
+/script/depcomp
+/script/install-sh
+/script/ltmain.sh
+/script/missing
+/script/test-driver
 /stamp-h1
 src/Makefile
 libsass/*
@@ -44,6 +46,11 @@ libsass/*
 *.a
 a.out
 libsass.js
+tester
+tester.exe
+build/
+config.h.in*
+lib/pkgconfig/
 
 bin/*
 .deps/

data/ext/libsass/Makefile

@@ -2,11 +2,12 @@ CC       ?= gcc
 CXX      ?= g++
 RM       ?= rm -f
 CP       ?= cp -a
-MKDIR    ?= mkdir -p
+MKDIR    ?= mkdir
 WINDRES  ?= windres
 CFLAGS   ?= -Wall -O2
 CXXFLAGS ?= -Wall -O2
-LDFLAGS  ?= -Wall -O2
+LDFLAGS  ?= -Wall -O2 -Wl,--no-undefined
+CAT      ?= $(if $(filter $(OS),Windows_NT),type,cat)
 
 ifneq (,$(findstring /cygdrive/,$(PATH)))
 	UNAME := Cygwin
@@ -17,20 +18,30 @@ else
 		ifneq (,$(findstring mingw32,$(MAKE)))
 			UNAME := MinGW
 		else
-			UNAME := $(shell uname -s)
+			ifneq (,$(findstring MINGW32,$(shell uname -s)))
+				UNAME = MinGW
+			else
+				UNAME := $(shell uname -s)
+			endif
 		endif
 	endif
 endif
 
 ifeq "$(LIBSASS_VERSION)" ""
-  ifneq "$(wildcard ./.git/ )" ""
-    LIBSASS_VERSION ?= $(shell git describe --abbrev=4 --dirty --always --tags)
-  endif
+	ifneq "$(wildcard ./.git/ )" ""
+		LIBSASS_VERSION ?= $(shell git describe --abbrev=4 --dirty --always --tags)
+	endif
+endif
+
+ifeq "$(LIBSASS_VERSION)" ""
+	ifneq ("$(wildcard VERSION)","")
+		LIBSASS_VERSION ?= $(shell $(CAT) VERSION)
+	endif
 endif
 
 ifneq "$(LIBSASS_VERSION)" ""
-  CFLAGS   += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\""
-  CXXFLAGS += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\""
+	CFLAGS   += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\""
+	CXXFLAGS += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\""
 endif
 
 # enable mandatory flag
@@ -43,18 +54,18 @@ else
 endif
 
 ifneq "$(SASS_LIBSASS_PATH)" ""
-  CFLAGS   += -I $(SASS_LIBSASS_PATH)
-  CXXFLAGS += -I $(SASS_LIBSASS_PATH)
+	CFLAGS   += -I $(SASS_LIBSASS_PATH)
+	CXXFLAGS += -I $(SASS_LIBSASS_PATH)
 endif
 
 ifneq "$(EXTRA_CFLAGS)" ""
-  CFLAGS   += $(EXTRA_CFLAGS)
+	CFLAGS   += $(EXTRA_CFLAGS)
 endif
 ifneq "$(EXTRA_CXXFLAGS)" ""
-  CXXFLAGS += $(EXTRA_CXXFLAGS)
+	CXXFLAGS += $(EXTRA_CXXFLAGS)
 endif
 ifneq "$(EXTRA_LDFLAGS)" ""
-  LDFLAGS  += $(EXTRA_LDFLAGS)
+	LDFLAGS  += $(EXTRA_LDFLAGS)
 endif
 
 LDLIBS = -lstdc++ -lm
@@ -64,6 +75,11 @@ ifeq ($(UNAME),Darwin)
 	LDFLAGS += -stdlib=libc++
 endif
 
+ifneq (MinGW,$(UNAME))
+	LDFLAGS += -ldl
+	LDLIBS += -ldl
+endif
+
 ifneq ($(BUILD),shared)
 	BUILD = static
 endif
@@ -96,7 +112,7 @@ SOURCES = \
 	constants.cpp \
 	context.cpp \
 	contextualize.cpp \
-	copy_c_str.cpp \
+	cssize.cpp \
 	error_handling.cpp \
 	eval.cpp \
 	expand.cpp \
@@ -106,9 +122,11 @@ SOURCES = \
 	inspect.cpp \
 	node.cpp \
 	json.cpp \
-	output_compressed.cpp \
-	output_nested.cpp \
+	emitter.cpp \
+	output.cpp \
 	parser.cpp \
+	plugins.cpp \
+	position.cpp \
 	prelexer.cpp \
 	remove_placeholders.cpp \
 	sass.cpp \
@@ -127,14 +145,14 @@ SOURCES = \
 
 CSOURCES = cencode.c
 
-RESOURCES = 
+RESOURCES =
 
 LIBRARIES = lib/libsass.so
 
 ifeq (MinGW,$(UNAME))
 	ifeq (shared,$(BUILD))
-		CFLAGS    += -D ADD_EXPORTS 
-		CXXFLAGS  += -D ADD_EXPORTS 
+		CFLAGS    += -D ADD_EXPORTS
+		CXXFLAGS  += -D ADD_EXPORTS
 		LIBRARIES += lib/libsass.dll
 		RESOURCES += res/resource.rc
 	endif
@@ -167,16 +185,16 @@ debug-shared: shared
 static: lib/libsass.a
 shared: $(LIBRARIES)
 
-lib/libsass.a: $(COBJECTS) $(OBJECTS)
+lib:
 	$(MKDIR) lib
+
+lib/libsass.a: lib $(COBJECTS) $(OBJECTS)
 	$(AR) rcvs $@ $(COBJECTS) $(OBJECTS)
 
-lib/libsass.so: $(COBJECTS) $(OBJECTS)
-	$(MKDIR) lib
+lib/libsass.so: lib $(COBJECTS) $(OBJECTS)
 	$(CXX) -shared $(LDFLAGS) -o $@ $(COBJECTS) $(OBJECTS) $(LDLIBS)
 
-lib/libsass.dll: $(COBJECTS) $(OBJECTS) $(RCOBJECTS)
-	$(MKDIR) lib
+lib/libsass.dll: lib $(COBJECTS) $(OBJECTS) $(RCOBJECTS)
 	$(CXX) -shared $(LDFLAGS) -o $@ $(COBJECTS) $(OBJECTS) $(RCOBJECTS) $(LDLIBS) -s -Wl,--subsystem,windows,--out-implib,lib/libsass.a
 
 %.o: %.c
@@ -194,11 +212,9 @@ lib/libsass.dll: $(COBJECTS) $(OBJECTS) $(RCOBJECTS)
 install: install-$(BUILD)
 
 install-static: lib/libsass.a
-	$(MKDIR) $(DESTDIR)$(PREFIX)\/lib/
 	install -pm0755 $< $(DESTDIR)$(PREFIX)/$<
 
 install-shared: lib/libsass.so
-	$(MKDIR) $(DESTDIR)$(PREFIX)\/lib/
 	install -pm0755 $< $(DESTDIR)$(PREFIX)/$<
 
 $(SASSC_BIN): $(BUILD)

data/ext/libsass/Makefile.am

@@ -1,12 +1,20 @@
 ACLOCAL_AMFLAGS = -I m4
 
 AM_LDFLAGS = -lstdc++ -lm
-AM_CFLAGS = -Wall -fPIC
-AM_CXXFLAGS = -Wall -fPIC
-AM_CFLAGS += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\""
-AM_CXXFLAGS += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\""
+AM_CFLAGS = -Wall
+AM_CXXFLAGS = -Wall
 
-AM_CXXFLAGS += -std=c++0x
+if COMPILER_IS_MINGW32
+  AM_CXXFLAGS += -std=gnu++0x
+else
+  AM_CFLAGS += -fPIC
+  AM_CXXFLAGS += -fPIC
+  AM_CXXFLAGS += -std=c++0x
+  AM_LDFLAGS += -ldl
+endif
+
+AM_CFLAGS += -DLIBSASS_VERSION="\"$(VERSION)\""
+AM_CXXFLAGS += -DLIBSASS_VERSION="\"$(VERSION)\""
 
 if ENABLE_COVERAGE
 	AM_CFLAGS += -O0 --coverage
@@ -18,8 +26,6 @@ else
 	AM_LDFLAGS += -O2
 endif
 
-VERSION = $(LIBSASS_VERSION)
-
 EXTRA_DIST = \
 	COPYING \
 	INSTALL \
@@ -34,7 +40,8 @@ lib_LTLIBRARIES = libsass.la
 libsass_la_SOURCES = \
 	ast_fwd_decl.hpp ast_def_macros.hpp \
 	kwd_arg_macros.hpp memory_manager.hpp \
-	position.hpp operation.hpp \
+	position.cpp position.hpp \
+	operation.hpp \
 	subset_map.hpp mapping.hpp \
 	color_names.hpp backtrace.hpp \
 	cencode.c b64/cencode.h b64/encode.h \
@@ -48,19 +55,20 @@ libsass_la_SOURCES = \
 	constants.cpp constants.hpp \
 	context.cpp context.hpp \
 	contextualize.cpp contextualize.hpp \
-	copy_c_str.cpp copy_c_str.hpp \
 	error_handling.cpp error_handling.hpp \
 	eval.cpp eval.hpp \
 	expand.cpp expand.hpp \
 	extend.cpp extend.hpp \
+	cssize.cpp cssize.hpp \
 	file.cpp file.hpp \
 	functions.cpp functions.hpp \
 	inspect.cpp inspect.hpp \
 	node.cpp node.hpp \
 	json.cpp json.hpp \
-	output_compressed.cpp output_compressed.hpp \
-	output_nested.cpp output_nested.hpp \
+	emitter.cpp emitter.hpp \
+	output.cpp output.hpp \
 	parser.cpp parser.hpp \
+	plugins.cpp plugins.hpp \
 	prelexer.cpp prelexer.hpp \
 	remove_placeholders.cpp remove_placeholders.hpp \
 	sass.cpp sass.h \
@@ -85,22 +93,22 @@ include_HEADERS = sass2scss.h sass_context.h sass_functions.h sass_values.h sass
 
 if ENABLE_TESTS
 
-noinst_PROGRAMS = sassc_bin
+noinst_PROGRAMS = tester
 
-sassc_bin_SOURCES = $(SASS_SASSC_PATH)/sassc.c
-sassc_bin_LDADD = libsass.la
-sassc_bin_CFLAGS = $(AM_CFLAGS)
-sassc_bin_CXXFLAGS = $(AM_CXXFLAGS)
-sassc_bin_LDFLAGS = $(AM_LDFLAGS) -no-install
+tester_LDADD = libsass.la
+tester_SOURCES = $(SASS_SASSC_PATH)/sassc.c
+SASSC_VERSION=`cd "$(SASS_SASSC_PATH)" && ./version.sh`
+tester_CFLAGS = $(AM_CFLAGS) -DSASSC_VERSION="\"$(SASSC_VERSION)\""
+tester_CXXFLAGS = $(AM_CXXFLAGS) -DSASSC_VERSION="\"$(SASSC_VERSION)\""
+tester_LDFLAGS = $(AM_LDFLAGS) -no-install
 
 if ENABLE_COVERAGE
-nodist_EXTRA_sassc_bin_SOURCES = non-existent-file-to-force-CXX-linking.cxx
+nodist_EXTRA_tester_SOURCES = non-existent-file-to-force-CXX-linking.cxx
 nodist_EXTRA_libsass_la_SOURCES = non-existent-file-to-force-CXX-linking.cxx
 endif
 
 SASS_SASSC_PATH ?= sassc
 SASS_SPEC_PATH ?= sass-spec
-SASSC_BIN = $(SASS_SASSC_PATH)/bin/sassc
 
 TESTS = \
 	$(SASS_SPEC_PATH)/spec/basic \
@@ -118,7 +126,7 @@ TESTS = \
 
 SASS_TEST_FLAGS =
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) ./script/tap-driver
-AM_LOG_FLAGS = -c ./sassc_bin --ignore-todo $(LOG_FLAGS)
+AM_LOG_FLAGS = -c ./tester --ignore-todo $(LOG_FLAGS)
 if USE_TAP
 	AM_LOG_FLAGS += -t
 	SASS_TEST_FLAGS += -t | tapout
@@ -127,19 +135,24 @@ else
 	LOG_COMPILER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
 endif
 
-$(SASSC_BIN): libsass.la
-	cd $(SASS_SASSC_PATH) && $(MAKE)
+SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
+
+if COMPILER_IS_MINGW32
+  SASS_TESTER += -c $(SASS_LIBSASS_PATH)/tester.exe
+else
+  SASS_TESTER += -c $(SASS_LIBSASS_PATH)/tester
+endif
 
-test: $(SASSC_BIN)
-	$(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+test:
+	$(SASS_TESTER) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
-test_build: $(SASSC_BIN)
-	$(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+test_build:
+	$(SASS_TESTER) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
-test_full: $(SASSC_BIN)
-	$(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+test_full:
+	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
-test_issues: $(SASSC_BIN)
-	$(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues $(SASS_TEST_FLAGS)
+test_issues:
+	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues $(SASS_TEST_FLAGS)
 
 endif

data/ext/libsass/Readme.md

@@ -15,7 +15,9 @@ then go to https://github.com/sass/sassc or
 https://github.com/sass/ruby-libsass or
 [find your local implementer](https://github.com/sass/libsass/wiki/Implementations).
 
-LibSass requires GCC 4.5+ or Clang/LLVM. If your OS is older, this version may not compile.
+LibSass requires GCC 4.6+ or Clang/LLVM. If your OS is older, this version may not compile.
+
+On Windows, you need MinGW with GCC 4.6+ or VS 2013 Update 4+. It is also possible to build LibSass with Clang/LLVM on Windows.
 
 About
 -----
@@ -87,7 +89,7 @@ Our MIT license is designed to be as simple, and liberal as possible.
 [@chriseppstein]: https://github.com/chriseppstein
 [@nex3]: https://github.com/nex3
 
-sass2scss was originally written by Marcel Greter [@mgreter]
+sass2scss was originally written by [Marcel Greter](@mgreter)
 and he happily agreed to have it merged into the project.
 
 [sass_interface.h]: sass_interface.h

data/ext/libsass/appveyor.yml

@@ -15,26 +15,23 @@ environment:
     ruby_version: "21-x64"
 
 cache:
-  - x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z
-  - C:\Ruby21-x64\lib\ruby\gems\2.1.0
-  - C:\Ruby21-x64\bin
+  - C:\mingw64
+  - C:\Ruby%ruby_version%\lib\ruby\gems
 
 install:
   - git clone https://github.com/sass/sassc.git
   - git clone https://github.com/sass/sass-spec.git
   - set PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - set SASS_LIBSASS_PATH=..
-  - gem install minitest
   - ps: |
-      if ($env:Compiler -eq "mingw") {
-        if (-Not (Test-Path "x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z")) {
-          # Install MinGW.
-          $url  = "http://sourceforge.net/projects/mingw-w64/files/"
-          $url += "Toolchains%20targetting%20Win64/Personal%20Builds/"
-          $url += "mingw-builds/4.9.2/threads-win32/seh/"
-          $url += "x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z/download"
-          Invoke-WebRequest -UserAgent wget -Uri $url -OutFile x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z
-        }
+      if(!(gem which minitest 2>$nul)) { gem install minitest }
+      if ($env:Compiler -eq "mingw" -AND -Not (Test-Path "C:\mingw64")) {
+        # Install MinGW.
+        $url  = "http://sourceforge.net/projects/mingw-w64/files/"
+        $url += "Toolchains%20targetting%20Win64/Personal%20Builds/"
+        $url += "mingw-builds/4.9.2/threads-win32/seh/"
+        $url += "x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z/download"
+        Invoke-WebRequest -UserAgent wget -Uri $url -OutFile x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z
         &7z x -oC:\ x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z > $null
       }
   - set PATH=C:\mingw64\bin;%PATH%
@@ -73,4 +70,3 @@ test_script:
           ruby sass-spec\sass-spec.rb -c win\bin\sassc.exe -s --ignore-todo sass-spec/spec
         }
       }
-

data/ext/libsass/ast.cpp

@@ -22,13 +22,13 @@ namespace Sass {
     return const_cast<Complex_Selector*>(this)->perform(&to_string) <
            const_cast<Complex_Selector&>(rhs).perform(&to_string);
   }
-  
+
   bool Complex_Selector::operator==(const Complex_Selector& rhs) const {
   	// TODO: We have to access the tail directly using tail_ since ADD_PROPERTY doesn't provide a const version.
 
   	const Complex_Selector* pOne = this;
     const Complex_Selector* pTwo = &rhs;
-    
+
     // Consume any empty references at the beginning of the Complex_Selector
     if (pOne->combinator() == Complex_Selector::ANCESTOR_OF && pOne->head()->is_empty_reference()) {
     	pOne = pOne->tail_;
@@ -36,12 +36,12 @@ namespace Sass {
     if (pTwo->combinator() == Complex_Selector::ANCESTOR_OF && pTwo->head()->is_empty_reference()) {
     	pTwo = pTwo->tail_;
     }
-    
+
     while (pOne && pTwo) {
     	if (pOne->combinator() != pTwo->combinator()) {
       	return false;
       }
-      
+
       if (*(pOne->head()) != *(pTwo->head())) {
       	return false;
       }
@@ -49,7 +49,7 @@ namespace Sass {
     	pOne = pOne->tail_;
       pTwo = pTwo->tail_;
     }
-    
+
     return pOne == NULL && pTwo == NULL;
   }
 
@@ -63,7 +63,7 @@ namespace Sass {
     }
     return unified;
   }
-  
+
   bool Simple_Selector::operator==(const Simple_Selector& rhs) const
   {
   	// Compare the string representations for equality.
@@ -75,21 +75,21 @@ namespace Sass {
     To_String to_string;
     return pLHS->perform(&to_string) == pRHS->perform(&to_string);
   }
-  
+
   bool Simple_Selector::operator<(const Simple_Selector& rhs) const {
 		// Use the string representation for ordering.
 
   	// Cast away const here. To_String should take a const object, but it doesn't.
   	Simple_Selector* pLHS = const_cast<Simple_Selector*>(this);
     Simple_Selector* pRHS = const_cast<Simple_Selector*>(&rhs);
-    
+
     To_String to_string;
     return pLHS->perform(&to_string) < pRHS->perform(&to_string);
   }
 
   Compound_Selector* Simple_Selector::unify_with(Compound_Selector* rhs, Context& ctx)
   {
-    To_String to_string;
+    To_String to_string(&ctx);
     for (size_t i = 0, L = rhs->length(); i < L; ++i)
     { if (perform(&to_string) == (*rhs)[i]->perform(&to_string)) return rhs; }
 
@@ -102,7 +102,7 @@ namespace Sass {
       {
         if ((typeid(*(*rhs)[i]) == typeid(Pseudo_Selector) || typeid(*(*rhs)[i]) == typeid(Wrapped_Selector)) && (*rhs)[L-1]->is_pseudo_element())
         { found = true; break; }
-      }  
+      }
     }
     else
     {
@@ -118,7 +118,7 @@ namespace Sass {
       (*cpy) << this;
       return cpy;
     }
-    Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->path(), rhs->position());
+    Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->pstate());
     for (size_t j = 0; j < i; ++j)
     { (*cpy) << (*rhs)[j]; }
     (*cpy) << this;
@@ -133,7 +133,7 @@ namespace Sass {
 
     // if the rhs is empty, just return a copy of this
     if (rhs->length() == 0) {
-      Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->path(), rhs->position());
+      Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->pstate());
       (*cpy) << this;
       return cpy;
     }
@@ -141,7 +141,7 @@ namespace Sass {
     // if this is a universal selector and rhs is not empty, just return the rhs
     if (name() == "*")
     { return new (ctx.mem) Compound_Selector(*rhs); }
-    
+
 
     Simple_Selector* rhs_0 = (*rhs)[0];
     // otherwise, this is a tag name
@@ -150,7 +150,7 @@ namespace Sass {
       // if rhs is universal, just return this tagname + rhs's qualifiers
       if (static_cast<Type_Selector*>(rhs_0)->name() == "*")
       {
-        Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->path(), rhs->position());
+        Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->pstate());
         (*cpy) << this;
         for (size_t i = 1, L = rhs->length(); i < L; ++i)
         { (*cpy) << (*rhs)[i]; }
@@ -164,7 +164,7 @@ namespace Sass {
       { return 0; }
     }
     // else it's a tag name and a bunch of qualifiers -- just append them
-    Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->path(), rhs->position());
+    Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->pstate());
     (*cpy) << this;
     (*cpy) += rhs;
     return cpy;
@@ -183,6 +183,7 @@ namespace Sass {
           return 0;
       }
     }
+    rhs->has_line_break(has_line_break());
     return Simple_Selector::unify_with(rhs, ctx);
   }
 
@@ -208,9 +209,9 @@ namespace Sass {
 
     Simple_Selector* lbase = base();
     Simple_Selector* rbase = rhs->base();
-    
+
     // Check if pseudo-elements are the same between the selectors
-    
+
     set<string> lpsuedoset, rpsuedoset;
     for (size_t i = 0, L = length(); i < L; ++i)
     {
@@ -262,12 +263,12 @@ namespace Sass {
     // catch-all
     return false;
   }
-  
+
   bool Compound_Selector::operator==(const Compound_Selector& rhs) const {
     To_String to_string;
-    
+
     // Check if pseudo-elements are the same between the selectors
-    
+
     set<string> lpsuedoset, rpsuedoset;
     for (size_t i = 0, L = length(); i < L; ++i)
     {
@@ -290,33 +291,33 @@ namespace Sass {
     }
 
 		// Check the base
-    
+
     const Simple_Selector* const lbase = base();
     const Simple_Selector* const rbase = rhs.base();
-    
+
     if ((lbase && !rbase) ||
     	(!lbase && rbase) ||
       ((lbase && rbase) && (*lbase != *rbase))) {
 			return false;
     }
-    
-    
+
+
     // Check the rest of the SimpleSelectors
     // Use string representations. We can't create a set of Simple_Selector pointers because std::set == std::set is going to call ==
     // on the pointers to determine equality. I don't know of a way to pass in a comparison object. The one you can specify as part of
     // the template type is used for ordering, but not equality. We also can't just put in non-pointer Simple_Selectors because the
     // class is intended to be subclassed, and we'd get splicing.
-    
+
     set<string> lset, rset;
-    
+
     for (size_t i = 0, L = length(); i < L; ++i)
     { lset.insert((*this)[i]->perform(&to_string)); }
     for (size_t i = 0, L = rhs.length(); i < L; ++i)
     { rset.insert(rhs[i]->perform(&to_string)); }
-    
+
     return lset == rset;
   }
-  
+
   bool Complex_Selector_Pointer_Compare::operator() (const Complex_Selector* const pLeft, const Complex_Selector* const pRight) const {
     return *pLeft < *pRight;
   }
@@ -361,7 +362,7 @@ namespace Sass {
     if (!found)
     { return false; }
 
-    /* 
+    /*
       Hmm, I hope I have the logic right:
 
       if lhs has a combinator:
@@ -413,7 +414,10 @@ namespace Sass {
   {
     if (!tail()) return 0;
     if (!head()) return tail()->context(ctx);
-    return new (ctx.mem) Complex_Selector(path(), position(), combinator(), head(), tail()->context(ctx));
+    Complex_Selector* cpy = new (ctx.mem) Complex_Selector(pstate(), combinator(), head(), tail()->context(ctx));
+    cpy->media_block(media_block());
+    cpy->last_block(last_block());
+    return cpy;
   }
 
   Complex_Selector* Complex_Selector::innermost()
@@ -446,12 +450,12 @@ namespace Sass {
     if (tail()) cpy->tail(tail()->clone(ctx));
     return cpy;
   }
-  
+
   Complex_Selector* Complex_Selector::cloneFully(Context& ctx) const
   {
     Complex_Selector* cpy = new (ctx.mem) Complex_Selector(*this);
 
-		if (head()) {
+    if (head()) {
     	cpy->head(head()->clone(ctx));
     }
 
@@ -461,20 +465,21 @@ namespace Sass {
 
     return cpy;
   }
-  
+
   Compound_Selector* Compound_Selector::clone(Context& ctx) const
   {
     Compound_Selector* cpy = new (ctx.mem) Compound_Selector(*this);
     return cpy;
   }
-  
 
 
+
+  /* not used anymore - remove?
   Selector_Placeholder* Selector::find_placeholder()
   {
     return 0;
-  }
-  
+  }*/
+
   void Selector_List::adjust_after_pushing(Complex_Selector* c)
   {
     if (c->has_reference())   has_reference(true);
@@ -486,6 +491,7 @@ namespace Sass {
 #endif
   }
 
+  /* not used anymore - remove?
   Selector_Placeholder* Selector_List::find_placeholder()
   {
     if (has_placeholder()) {
@@ -494,8 +500,9 @@ namespace Sass {
       }
     }
     return 0;
-  }
+  }*/
 
+  /* not used anymore - remove?
   Selector_Placeholder* Complex_Selector::find_placeholder()
   {
     if (has_placeholder()) {
@@ -503,8 +510,9 @@ namespace Sass {
       else if (tail() && tail()->has_placeholder()) return tail()->find_placeholder();
     }
     return 0;
-  }
+  }*/
 
+  /* not used anymore - remove?
   Selector_Placeholder* Compound_Selector::find_placeholder()
   {
     if (has_placeholder()) {
@@ -514,12 +522,13 @@ namespace Sass {
       // return this;
     }
     return 0;
-  }
+  }*/
 
+  /* not used anymore - remove?
   Selector_Placeholder* Selector_Placeholder::find_placeholder()
   {
     return this;
-  }
+  }*/
 
   vector<string> Compound_Selector::to_str_vec()
   {
@@ -533,8 +542,8 @@ namespace Sass {
 
   Compound_Selector* Compound_Selector::minus(Compound_Selector* rhs, Context& ctx)
   {
-    To_String to_string;
-    Compound_Selector* result = new (ctx.mem) Compound_Selector(path(), position());
+    To_String to_string(&ctx);
+    Compound_Selector* result = new (ctx.mem) Compound_Selector(pstate());
 
     // not very efficient because it needs to preserve order
     for (size_t i = 0, L = length(); i < L; ++i)
@@ -554,7 +563,7 @@ namespace Sass {
 
     return result;
   }
-  
+
   void Compound_Selector::mergeSources(SourcesSet& sources, Context& ctx)
   {
     for (SourcesSet::iterator iterator = sources.begin(), endIterator = sources.end(); iterator != endIterator; ++iterator) {
@@ -562,6 +571,7 @@ namespace Sass {
     }
   }
 
+  /* not used anymore - remove?
   vector<Compound_Selector*> Complex_Selector::to_vector()
   {
     vector<Compound_Selector*> result;
@@ -575,7 +585,7 @@ namespace Sass {
       if (h) result.push_back(h);
     }
     return result;
-  }
+  }*/
 
 }