Full-on arbitrarily nested scopes for variables.

document_parser.cpp

@@ -17,11 +17,12 @@ namespace Sass {
         lex< exactly<';'> >();
       }
       else if (peek< mixin >(position)) {
-        context.pending.push_back(parse_mixin_definition());
+        Node mixin(parse_mixin_definition());
+        context.pending.push_back(mixin);
+        root << mixin;
       }
       else if (peek< include >(position)) {
         Node call(parse_mixin_call());
-        // call << root;
         root << call;
         root[0].has_expansions = true;
         lex< exactly<';'> >();
@@ -31,6 +32,7 @@ namespace Sass {
         Node assn(parse_assignment());
         lex< exactly<';'> >();
         context.pending.push_back(assn);
+        root << assn;
       }
       else {
         root << parse_ruleset();
@@ -337,7 +339,6 @@ namespace Sass {
       }
       else if (peek< include >(position)) {
         Node call(parse_mixin_call());
-        // call << block;
         block << call;
         // block.has_expansions = true;
         block[0].has_expansions = true;
@@ -375,7 +376,6 @@ namespace Sass {
       while (lex< block_comment >()) {
         block << Node(line_number, Node::comment, lexed);
         block[0].has_rules_or_comments = true;
-        cerr << "Parsing a terminal comment: " << string(lexed) << endl;
       }
     }
     return block;

eval_apply.cpp

@@ -36,13 +36,22 @@ namespace Sass {
         return expr;
       } break;
       
-      case Node::block: {
+      case Node::root: {
         for (int i = 0; i < expr.size(); ++i) {
           eval(expr[i], env);
         }
         return expr;
       } break;
       
+      case Node::block: {
+        Environment current;
+        current.link(env);
+        for (int i = 0; i < expr.size(); ++i) {
+          eval(expr[i], current);
+        }
+        return expr;
+      } break;
+      
       case Node::assignment: {
         Node val(expr[1]);
         if (val.type == Node::comma_list || val.type == Node::space_list) {
@@ -71,7 +80,7 @@ namespace Sass {
           }
         }
         else {
-          expr[1] = eval(rhs, env);
+          if (rhs.eval_me) expr[1] = eval(rhs, env);
         }
         return expr;
       } break;

mixins.scss

@@ -3,12 +3,10 @@ $y: global-y;
 $z: global-z;
 
 @mixin foo($x, $y) {
-  /* begin foo */
   margin: $x $y;
   blip {
     hey: now;
   }
-  /* end foo */
 }
 
 @mixin foogoo($x, $y, $z) {
@@ -16,17 +14,15 @@ $z: global-z;
 }
 
 @mixin hux($y) {
-  /* begin hux */
   color: $y;
   @include foo(called-from-hux);
-  /* end hux */
 }
 
 div {
   @include foo(1, 2);
   @include foo(1);
   @include foogoo(1, 2);
-  @include foogoo($y /* blah */ : kwd-y, $z: kwd-z);
+  @include foogoo($y: kwd-y, $z: kwd-z);
 }
 
 div {
@@ -56,7 +52,6 @@ div {
 }
 
 div {
-  /* calls to nullary mixins may omit the empty argument list */
   @include bung;
 }
 
@@ -66,6 +61,7 @@ div {
 }
 
 @mixin ruleset() {
+  moo: goo;
   hoo {
     color: boo;
   }

sassc.cpp

@@ -2,6 +2,7 @@
 #include <string>
 #include <map>
 #include "document.hpp"
+#include "eval_apply.hpp"
 
 using namespace Sass;
 using namespace std;
@@ -30,7 +31,8 @@ int main(int argc, char* argv[]) {
   Document doc(path, 0);
   doc.parse_scss();
   cerr << "SUCCESSFULLY PARSED DOCUMENT" << endl;
-  doc.eval_pending();
+  // doc.eval_pending();
+  eval(doc.root, doc.context.global_env);
   cerr << "SUCCESSFULLY EVALED DOCUMENT" << endl;
   string output = doc.emit_css(style);
   

spec/basic/20_scoped_variables/input.scss

+@mixin foo() {
+  /* begin foo */
+  /* assigning to $x */
+  $x: inside foo;
+  x: $x;
+  /* end foo */
+}
+
+outer {
+  /* assigning to $x */
+  $x: inside outer scope;
+  blah: blah;
+  inner {
+    @include foo();
+    x: $x;
+  }
+}
\ No newline at end of file

spec/basic/20_scoped_variables/output.css

+outer {
+  /* assigning to $x */
+  blah: blah; }
+  outer inner {
+    /* begin foo */
+    /* assigning to $x */
+    x: inside foo;
+    /* end foo */
+    x: inside outer scope; }