Skip to content

Commit 49e10b6

Browse files
committed
Fix issues from re-basing to master
1 parent 1449674 commit 49e10b6

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

include/sass/compiler.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,12 @@ extern "C" {
110110
// Note: LibSass does not write the file, implementers should write to this path.
111111
ADDAPI void ADDCALL sass_compiler_set_output_path(struct SassCompiler* compiler, const char* output_path);
112112

113+
// Getter for option to suppress anything being printed on stderr (quiet mode)
114+
ADDAPI bool ADDCALL sass_compiler_get_suppress_stderr(struct SassCompiler* compiler);
115+
116+
// Setter for option to suppress anything being printed on stderr (quiet mode)
117+
ADDAPI void ADDCALL sass_compiler_set_suppress_stderr(struct SassCompiler* compiler, bool suppress);
118+
113119
/////////////////////////////////////////////////////////////////////////
114120
/////////////////////////////////////////////////////////////////////////
115121

src/ast_sel_unify.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ namespace Sass {
2121
SASS_ASSERT(!complexes.empty(), "Can't unify empty list");
2222
if (complexes.size() == 1) return complexes;
2323

24-
CompoundSelectorObj unifiedBase = SASS_MEMORY_NEW(CompoundSelector, SourceSpan("[unify]"));
24+
CompoundSelectorObj unifiedBase = SASS_MEMORY_NEW(CompoundSelector,
25+
SourceSpan::internal("[unify]"));
2526
for (auto complex : complexes) {
2627
SelectorComponentObj base = complex.back();
2728
if (CompoundSelector * comp = base->isaCompoundSelector()) {

src/error_handling.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ namespace Sass {
8282
msg = "Duplicate key."; // dart-sass keeps it simple ...
8383
}
8484

85+
EndlessExtendError::EndlessExtendError(Backtraces traces, const AST_Node& node)
86+
: Base(node.pstate(), def_msg, traces), node(node)
8587
EndlessExtendError::EndlessExtendError(Backtraces traces, const AST_Node& node)
8688
: Base(node.pstate(), def_msg, traces), node(node)
8789
{

src/extender.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,8 @@ namespace Sass {
632632

633633
for (SelectorComponentVector& components : weaved) {
634634

635-
ComplexSelectorObj cplx = SASS_MEMORY_NEW(ComplexSelector, complex->pstate());
635+
ComplexSelectorObj cplx = SASS_MEMORY_NEW(ComplexSelector,
636+
complex->pstate(), std::move(components));
636637
cplx->hasPreLineFeed(complex->hasPreLineFeed());
637638
for (auto& pp : path) {
638639
if (pp->hasPreLineFeed()) {

0 commit comments

Comments
 (0)