File tree Expand file tree Collapse file tree 3 files changed +7
-8
lines changed Expand file tree Collapse file tree 3 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -961,13 +961,13 @@ namespace Sass {
961
961
962
962
// do some magic we inherit from node and extend
963
963
Node node = subweave (lhsNode, rhsNode);
964
- Selector_List_Ptr result = SASS_MEMORY_NEW (Selector_List, pstate ());
964
+ Selector_List_Obj result = SASS_MEMORY_NEW (Selector_List, pstate ());
965
965
NodeDequePtr col = node.collection (); // move from collection to list
966
966
for (NodeDeque::iterator it = col->begin (), end = col->end (); it != end; it++)
967
967
{ result->append (nodeToComplexSelector (Node::naiveTrim (*it))); }
968
968
969
969
// only return if list has some entries
970
- return result->length () ? result : 0 ;
970
+ return result->length () ? result. detach () : 0 ;
971
971
972
972
}
973
973
Original file line number Diff line number Diff line change @@ -689,7 +689,7 @@ namespace Sass {
689
689
Complex_Selector_Obj Parser::parse_complex_selector (bool chroot)
690
690
{
691
691
692
- String_Ptr reference = 0 ;
692
+ String_Obj reference = 0 ;
693
693
lex < block_comment >();
694
694
advanceToNextToken ();
695
695
Complex_Selector_Obj sel = SASS_MEMORY_NEW (Complex_Selector, pstate);
@@ -911,8 +911,8 @@ namespace Sass {
911
911
>()
912
912
) {
913
913
lex_css< alternatives < static_value, binomial > >();
914
- String_Constant_Ptr expr = SASS_MEMORY_NEW (String_Constant, pstate, lexed);
915
- if (expr && lex_css< exactly<' )' > >()) {
914
+ String_Constant_Obj expr = SASS_MEMORY_NEW (String_Constant, pstate, lexed);
915
+ if (lex_css< exactly<' )' > >()) {
916
916
expr->can_compress_whitespace (true );
917
917
return SASS_MEMORY_NEW (Pseudo_Selector, p, name, expr);
918
918
}
Original file line number Diff line number Diff line change @@ -54,15 +54,14 @@ namespace Sass {
54
54
}
55
55
json_append_member (json_srcmap, " sources" , json_sources);
56
56
57
- if (include_sources) {
57
+ if (include_sources && source_index. size () ) {
58
58
JsonNode *json_contents = json_mkarray ();
59
59
for (size_t i = 0 ; i < source_index.size (); ++i) {
60
60
const Resource& resource (sources[source_index[i]]);
61
61
JsonNode *json_content = json_mkstring (resource.contents );
62
62
json_append_element (json_contents, json_content);
63
63
}
64
- if (json_contents->children .head )
65
- json_append_member (json_srcmap, " sourcesContent" , json_contents);
64
+ json_append_member (json_srcmap, " sourcesContent" , json_contents);
66
65
}
67
66
68
67
JsonNode *json_names = json_mkarray ();
You can’t perform that action at this time.
0 commit comments