Fix nesting check for at-root

Author: xzyfer

src/check_nesting.cpp

@@ -40,7 +40,11 @@ namespace Sass {
       }
 
       At_Root_Block_Ptr ar = Cast<At_Root_Block>(parent);
-      Statement_Ptr ret = this->visit_children(ar->block());
+      Block_Ptr ret = ar->block();
+
+      for (auto n : ret->elements()) {
+        n->perform(this);
+      }
 
       this->parent = old_parent;
       this->parents = old_parents;

src/parser.cpp

@@ -295,7 +295,7 @@ namespace Sass {
     else if (lex< re_prefixed_directive >(true)) { block->append(parse_prefixed_directive()); }
     else if (lex< at_keyword >(true)) { block->append(parse_directive()); }
 
-    else if (is_root /* && block->is_root() */) {
+    else if (is_root && stack.back() != Scope::AtRoot /* && block->is_root() */) {
       lex< css_whitespace >();
       if (position >= end) return true;
       css_error("Invalid CSS", " after ", ": expected 1 selector or at-rule, was ");
@@ -2479,6 +2479,7 @@ namespace Sass {
 
   At_Root_Block_Obj Parser::parse_at_root_block()
   {
+    stack.push_back(Scope::AtRoot);
     ParserState at_source_position = pstate;
     Block_Obj body = 0;
     At_Root_Query_Obj expr;
@@ -2497,6 +2498,7 @@ namespace Sass {
     }
     At_Root_Block_Obj at_root = SASS_MEMORY_NEW(At_Root_Block, at_source_position, body);
     if (!expr.isNull()) at_root->expression(expr);
+    stack.pop_back();
     return at_root;
   }
 

src/parser.hpp

@@ -33,7 +33,7 @@ namespace Sass {
   class Parser : public ParserState {
   public:
 
-    enum Scope { Root, Mixin, Function, Media, Control, Properties, Rules };
+    enum Scope { Root, Mixin, Function, Media, Control, Properties, Rules, AtRoot };
 
     Context& ctx;
     std::vector<Block_Obj> block_stack;