Merge pull request #910 from mgreter/feature/output-emitter

Refactor output emitter and implement missing output styles

.gitignore

@@ -46,6 +46,11 @@ libsass/*
 *.a
 a.out
 libsass.js
+tester
+tester.exe
+build/
+config.h.in*
+lib/pkgconfig/
 
 bin/*
 .deps/

Makefile

@@ -114,8 +114,8 @@ SOURCES = \
 	inspect.cpp \
 	node.cpp \
 	json.cpp \
-	output_compressed.cpp \
-	output_nested.cpp \
+	emitter.cpp \
+	output.cpp \
 	parser.cpp \
 	position.cpp \
 	prelexer.cpp \

Makefile.am

@@ -65,8 +65,8 @@ libsass_la_SOURCES = \
 	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 \
 	prelexer.cpp prelexer.hpp \
 	remove_placeholders.cpp remove_placeholders.hpp \

ast.cpp

@@ -89,7 +89,7 @@ namespace Sass {
 
   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; }
 
@@ -183,6 +183,7 @@ namespace Sass {
           return 0;
       }
     }
+    rhs->has_line_break(has_line_break());
     return Simple_Selector::unify_with(rhs, ctx);
   }
 
@@ -451,7 +452,7 @@ namespace Sass {
   {
     Complex_Selector* cpy = new (ctx.mem) Complex_Selector(*this);
 
-		if (head()) {
+    if (head()) {
     	cpy->head(head()->clone(ctx));
     }
 
@@ -470,10 +471,11 @@ namespace Sass {
 
 
 
+  /* not used anymore - remove?
   Selector_Placeholder* Selector::find_placeholder()
   {
     return 0;
-  }
+  }*/
 
   void Selector_List::adjust_after_pushing(Complex_Selector* c)
   {
@@ -486,6 +488,7 @@ namespace Sass {
 #endif
   }
 
+  /* not used anymore - remove?
   Selector_Placeholder* Selector_List::find_placeholder()
   {
     if (has_placeholder()) {
@@ -494,17 +497,19 @@ namespace Sass {
       }
     }
     return 0;
-  }
+  }*/
 
+  /* not used anymore - remove?
   Selector_Placeholder* Complex_Selector::find_placeholder()
   {
     if (has_placeholder()) {
       if (head() && head()->has_placeholder()) return head()->find_placeholder();
       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 +519,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,7 +539,7 @@ namespace Sass {
 
   Compound_Selector* Compound_Selector::minus(Compound_Selector* rhs, Context& ctx)
   {
-    To_String to_string;
+    To_String to_string(&ctx);
     Compound_Selector* result = new (ctx.mem) Compound_Selector(pstate());
 
     // not very efficient because it needs to preserve order
@@ -562,6 +568,7 @@ namespace Sass {
     }
   }
 
+  /* not used anymore - remove?
   vector<Compound_Selector*> Complex_Selector::to_vector()
   {
     vector<Compound_Selector*> result;
@@ -575,7 +582,7 @@ namespace Sass {
       if (h) result.push_back(h);
     }
     return result;
-  }
+  }*/
 
 }