sassc 0.0.10 → 0.0.11

data/ext/libsass/listize.hpp

@@ -0,0 +1,41 @@
+#ifndef SASS_LISTIZE_H
+#define SASS_LISTIZE_H
+
+#include <vector>
+#include <iostream>
+
+#include "ast.hpp"
+#include "context.hpp"
+#include "operation.hpp"
+#include "environment.hpp"
+
+namespace Sass {
+  using namespace std;
+
+  typedef Environment<AST_Node*> Env;
+  struct Backtrace;
+
+  class Listize : public Operation_CRTP<Expression*, Listize> {
+
+    Context&            ctx;
+
+    Expression* fallback_impl(AST_Node* n);
+
+  public:
+    Listize(Context&);
+    virtual ~Listize() { }
+
+    using Operation<Expression*>::operator();
+
+    Expression* operator()(Selector_List*);
+    Expression* operator()(Complex_Selector*);
+    Expression* operator()(Compound_Selector*);
+    Expression* operator()(Selector_Reference*);
+
+    template <typename U>
+    Expression* fallback(U x) { return fallback_impl(x); }
+  };
+
+}
+
+#endif

data/ext/libsass/operation.hpp

@@ -61,6 +61,7 @@ namespace Sass {
     virtual T operator()(Media_Query_Expression* x) = 0;
     virtual T operator()(At_Root_Expression* x)     = 0;
     virtual T operator()(Null* x)                   = 0;
+    virtual T operator()(Parent_Selector* x)        = 0;
     // parameters and arguments
     virtual T operator()(Parameter* x)              = 0;
     virtual T operator()(Parameters* x)             = 0;
@@ -135,6 +136,7 @@ namespace Sass {
     virtual T operator()(Media_Query_Expression* x) { return static_cast<D*>(this)->fallback(x); }
     virtual T operator()(At_Root_Expression* x)     { return static_cast<D*>(this)->fallback(x); }
     virtual T operator()(Null* x)                   { return static_cast<D*>(this)->fallback(x); }
+    virtual T operator()(Parent_Selector* x)        { return static_cast<D*>(this)->fallback(x); }
     // parameters and arguments
     virtual T operator()(Parameter* x)              { return static_cast<D*>(this)->fallback(x); }
     virtual T operator()(Parameters* x)             { return static_cast<D*>(this)->fallback(x); }

data/ext/libsass/output.cpp

@@ -134,7 +134,7 @@ namespace Sass {
             String_Constant* valConst = static_cast<String_Constant*>(dec->value());
             string val(valConst->value());
             if (dynamic_cast<String_Quoted*>(valConst)) {
-              if (val.empty()) {
+              if (!valConst->quote_mark() && val.empty()) {
                 bPrintExpression = false;
               }
             }
@@ -172,11 +172,10 @@ namespace Sass {
 
   void Output::operator()(Keyframe_Rule* r)
   {
-    String* v = r->rules();
     Block* b = r->block();
+    Selector* v = r->selector();
 
     if (v) {
-      append_indentation();
       v->perform(this);
     }
 
@@ -338,9 +337,9 @@ namespace Sass {
     append_token(kwd, a);
     if (s) {
       append_mandatory_space();
-      in_at_rule = true;
+      in_wrapped = true;
       s->perform(this);
-      in_at_rule = false;
+      in_wrapped = false;
     }
     else if (v) {
       append_mandatory_space();
@@ -379,7 +378,7 @@ namespace Sass {
   void Output::operator()(String_Quoted* s)
   {
     if (s->quote_mark()) {
-      append_token(quote((s->value()), s->quote_mark()), s);
+      append_token(quote(s->value(), s->quote_mark()), s);
     } else if (!in_comment) {
       append_token(string_to_output(s->value()), s);
     } else {

data/ext/libsass/parser.cpp

@@ -63,16 +63,25 @@ namespace Sass {
     block_stack.push_back(root);
     root->is_root(true);
     read_bom();
+
+    if (ctx.queue.size() == 1) {
+      Import* pre = new (ctx.mem) Import(pstate);
+      string load_path(ctx.queue[0].load_path);
+      do_import(load_path, pre, ctx.c_headers, false);
+      ctx.head_imports = ctx.queue.size() - 1;
+      if (!pre->urls().empty()) (*root) << pre;
+      if (!pre->files().empty()) {
+        for (size_t i = 0, S = pre->files().size(); i < S; ++i) {
+          (*root) << new (ctx.mem) Import_Stub(pstate, pre->files()[i]);
+        }
+      }
+    }
+
     lex< optional_spaces >();
     Selector_Lookahead lookahead_result;
     while (position < end) {
-      if (lex< block_comment >()) {
-        bool is_important = lexed.begin[2] == '!';
-        String*  contents = parse_interpolated_chunk(lexed);
-        Comment* comment  = new (ctx.mem) Comment(pstate, contents, is_important);
-        (*root) << comment;
-      }
-      else if (peek< import >()) {
+      parse_block_comments(root);
+      if (peek< kwd_import >()) {
         Import* imp = parse_import();
         if (!imp->urls().empty()) (*root) << imp;
         if (!imp->files().empty()) {
@@ -82,7 +91,7 @@ namespace Sass {
         }
         if (!lex< one_plus< exactly<';'> > >()) error("top-level @import directive must be terminated by ';'", pstate);
       }
-      else if (peek< mixin >() || peek< function >()) {
+      else if (peek< kwd_mixin >() || peek< kwd_function >()) {
         (*root) << parse_definition();
       }
       else if (peek< variable >()) {
@@ -92,41 +101,41 @@ namespace Sass {
       /*else if (peek< sequence< optional< exactly<'*'> >, alternatives< identifier_schema, identifier >, optional_spaces, exactly<':'>, optional_spaces, exactly<'{'> > >(position)) {
         (*root) << parse_propset();
       }*/
-      else if (peek< include >() /* || peek< exactly<'+'> >() */) {
+      else if (peek< kwd_include >() /* || peek< exactly<'+'> >() */) {
         Mixin_Call* mixin_call = parse_mixin_call();
         (*root) << mixin_call;
         if (!mixin_call->block() && !lex< one_plus< exactly<';'> > >()) error("top-level @include directive must be terminated by ';'", pstate);
       }
-      else if (peek< if_directive >()) {
+      else if (peek< kwd_if_directive >()) {
         (*root) << parse_if_directive();
       }
-      else if (peek< for_directive >()) {
+      else if (peek< kwd_for_directive >()) {
         (*root) << parse_for_directive();
       }
-      else if (peek< each_directive >()) {
+      else if (peek< kwd_each_directive >()) {
         (*root) << parse_each_directive();
       }
-      else if (peek< while_directive >()) {
+      else if (peek< kwd_while_directive >()) {
         (*root) << parse_while_directive();
       }
-      else if (peek< media >()) {
+      else if (peek< kwd_media >()) {
         (*root) << parse_media_block();
       }
-      else if (peek< at_root >()) {
+      else if (peek< kwd_at_root >()) {
         (*root) << parse_at_root_block();
       }
-      else if (peek< supports >()) {
+      else if (peek< kwd_supports >()) {
         (*root) << parse_feature_block();
       }
-      else if (peek< warn >()) {
+      else if (peek< kwd_warn >()) {
         (*root) << parse_warning();
         if (!lex< one_plus< exactly<';'> > >()) error("top-level @warn directive must be terminated by ';'", pstate);
       }
-      else if (peek< err >()) {
+      else if (peek< kwd_err >()) {
         (*root) << parse_error();
         if (!lex< one_plus< exactly<';'> > >()) error("top-level @error directive must be terminated by ';'", pstate);
       }
-      else if (peek< dbg >()) {
+      else if (peek< kwd_dbg >()) {
         (*root) << parse_debug();
         if (!lex< one_plus< exactly<';'> > >()) error("top-level @debug directive must be terminated by ';'", pstate);
       }
@@ -147,9 +156,9 @@ namespace Sass {
         lex< one_plus< exactly<';'> > >();
       }
       else {
-        lex< optional_spaces_and_comments >();
+        lex< css_whitespace >();
         if (position >= end) break;
-        error("invalid top-level expression", pstate);
+        error("invalid top-level expression", after_token);
       }
       lex< optional_spaces >();
     }
@@ -183,90 +192,107 @@ namespace Sass {
 
   }
 
+  void Parser::import_single_file (Import* imp, string import_path) {
+
+    if (!unquote(import_path).substr(0, 7).compare("http://") ||
+        !unquote(import_path).substr(0, 8).compare("https://") ||
+        !unquote(import_path).substr(0, 2).compare("//"))
+    {
+      imp->urls().push_back(new (ctx.mem) String_Quoted(pstate, import_path));
+    }
+    else {
+      add_single_file(imp, import_path);
+    }
+
+  }
+
+  bool Parser::do_import(const string& import_path, Import* imp, vector<Sass_Importer_Entry> importers, bool only_one)
+  {
+    bool has_import = false;
+    string load_path = unquote(import_path);
+    for (auto importer : importers) {
+      // int priority = sass_importer_get_priority(importer);
+      Sass_Importer_Fn fn = sass_importer_get_function(importer);
+      if (Sass_Import_List includes =
+          fn(load_path.c_str(), importer, ctx.c_compiler)
+      ) {
+        Sass_Import_List list = includes;
+        while (*includes) {
+          Sass_Import_Entry include = *includes;
+          const char *file = sass_import_get_path(include);
+          char* source = sass_import_take_source(include);
+          size_t line = sass_import_get_error_line(include);
+          size_t column = sass_import_get_error_column(include);
+          const char* message = sass_import_get_error_message(include);
+          if (message) {
+            if (line == string::npos && column == string::npos) error(message, pstate);
+            else error(message, ParserState(message, source, Position(line, column)));
+          } else if (source) {
+            if (file) {
+              ctx.add_source(file, load_path, source);
+              imp->files().push_back(file);
+            } else {
+              ctx.add_source(load_path, load_path, source);
+              imp->files().push_back(load_path);
+            }
+          } else if(file) {
+            import_single_file(imp, file);
+          }
+          ++includes;
+        }
+        // deallocate returned memory
+        sass_delete_import_list(list);
+        // set success flag
+        has_import = true;
+        // break import chain
+        if (only_one) return true;
+      }
+    }
+    // return result
+    return has_import;
+  }
+
   Import* Parser::parse_import()
   {
-    lex< import >();
+    lex< kwd_import >();
     Import* imp = new (ctx.mem) Import(pstate);
     bool first = true;
     do {
       while (lex< block_comment >());
       if (lex< quoted_string >()) {
-        string import_path(lexed);
-
-        // struct Sass_Options opt = sass_context_get_options(ctx)
-        Sass_C_Import_Callback importer = ctx.importer;
-        // custom importer
-        if (importer) {
-          Sass_Import* current = ctx.import_stack.back();
-          Sass_C_Import_Fn fn = sass_import_get_function(importer);
-          void* cookie = sass_import_get_cookie(importer);
-          // create a new import entry
-          string inc_path = unquote(import_path);
-          struct Sass_Import** includes = fn(
-            inc_path.c_str(),
-            sass_import_get_path(current),
-            cookie);
-          if (includes) {
-            struct Sass_Import** list = includes;
-            while (*includes) {
-              struct Sass_Import* include = *includes;
-              const char *file = sass_import_get_path(include);
-              char* source = sass_import_take_source(include);
-              size_t line = sass_import_get_error_line(include);
-              size_t column = sass_import_get_error_column(include);
-              const char* message = sass_import_get_error_message(include);
-              // char *srcmap = sass_import_take_srcmap(include);
-              if (message) {
-                if (line == string::npos && column == string::npos) error(message, pstate);
-                else error(message, ParserState(message, Position(line, column)));
-              } else if (source) {
-                if (file) {
-                  ctx.add_source(file, inc_path, source);
-                  imp->files().push_back(file);
-                } else {
-                  ctx.add_source(inc_path, inc_path, source);
-                  imp->files().push_back(inc_path);
-                }
-              } else if(file) {
-                add_single_file(imp, file);
-              }
-              ++includes;
-            }
-            // deallocate returned memory
-            sass_delete_import_list(list);
-            // parse next import
-            continue;
-          }
-        }
-
-        if (!unquote(import_path).substr(0, 7).compare("http://") ||
-            !unquote(import_path).substr(0, 8).compare("https://") ||
-            !unquote(import_path).substr(0, 2).compare("//"))
+        if (!do_import(lexed, imp, ctx.c_importers, true))
         {
-          imp->urls().push_back(new (ctx.mem) String_Quoted(pstate, import_path));
+          // push single file import
+          import_single_file(imp, lexed);
+        }
+      }
+      else if (lex< uri_prefix >()) {
+        Arguments* args = new (ctx.mem) Arguments(pstate);
+        Function_Call* result = new (ctx.mem) Function_Call(pstate, "url", args);
+        if (lex < uri_value >()) { // chunk seems to work too!
+          String* the_url = parse_interpolated_chunk(lexed);
+          *args << new (ctx.mem) Argument(the_url->pstate(), the_url);
         }
         else {
-          add_single_file(imp, import_path);
+          error("malformed URL", pstate);
         }
-
-      }
-      else if (peek< uri_prefix >()) {
-        imp->urls().push_back(parse_value());
+        if (!lex< exactly<')'> >()) error("URI is missing ')'", pstate);
+        imp->urls().push_back(result);
       }
       else {
         if (first) error("@import directive requires a url or quoted path", pstate);
         else error("expecting another url or quoted path in @import list", pstate);
       }
       first = false;
-    } while (lex< exactly<','> >());
+    } while (lex_css< exactly<','> >());
     return imp;
   }
 
   Definition* Parser::parse_definition()
   {
     Definition::Type which_type = Definition::MIXIN;
-    if      (lex< mixin >())    which_type = Definition::MIXIN;
-    else if (lex< function >()) which_type = Definition::FUNCTION;
+    if      (lex< kwd_mixin >())    which_type = Definition::MIXIN;
+    else if (lex< kwd_function >()) which_type = Definition::FUNCTION;
     string which_str(lexed);
     if (!lex< identifier >()) error("invalid name in " + which_str + " definition", pstate);
     string name(Util::normalize_underscores(lexed));
@@ -279,22 +305,22 @@ namespace Sass {
     else stack.push_back(function_def);
     Block* body = parse_block();
     stack.pop_back();
-    Definition* def = new (ctx.mem) Definition(source_position_of_def, name, params, body, which_type);
+    Definition* def = new (ctx.mem) Definition(source_position_of_def, name, params, body, &ctx, which_type);
     return def;
   }
 
   Parameters* Parser::parse_parameters()
   {
-    string name(lexed); // for the error message
+    string name(lexed);
+    Position position = after_token;
     Parameters* params = new (ctx.mem) Parameters(pstate);
-    if (lex< exactly<'('> >()) {
+    if (lex_css< exactly<'('> >()) {
       // if there's anything there at all
-      if (!peek< exactly<')'> >()) {
+      if (!peek_css< exactly<')'> >()) {
         do (*params) << parse_parameter();
-        while (lex< alternatives < spaces,block_comment, exactly<','> > >());
+        while (lex_css< exactly<','> >());
       }
-      while (lex< alternatives < spaces, block_comment > >()) {};
-      if (!lex< exactly<')'> >()) error("expected a variable name (e.g. $x) or ')' for the parameter list for " + name, pstate);
+      if (!lex_css< exactly<')'> >()) error("expected a variable name (e.g. $x) or ')' for the parameter list for " + name, position);
     }
     return params;
   }
@@ -322,7 +348,7 @@ namespace Sass {
 
   Mixin_Call* Parser::parse_mixin_call()
   {
-    lex< include >() /* || lex< exactly<'+'> >() */;
+    lex< kwd_include >() /* || lex< exactly<'+'> >() */;
     if (!lex< identifier >()) error("invalid name in @include directive", pstate);
     ParserState source_position_of_call = pstate;
     string name(Util::normalize_underscores(lexed));
@@ -335,34 +361,36 @@ namespace Sass {
     return the_call;
   }
 
-  Arguments* Parser::parse_arguments()
+  Arguments* Parser::parse_arguments(bool has_url)
   {
     string name(lexed);
+    Position position = after_token;
     Arguments* args = new (ctx.mem) Arguments(pstate);
-
-    if (lex< exactly<'('> >()) {
+    if (lex_css< exactly<'('> >()) {
       // if there's anything there at all
-      if (!peek< exactly<')'> >()) {
-        do (*args) << parse_argument();
-        while (lex< alternatives < block_comment, exactly<','> > >());
+      if (!peek_css< exactly<')'> >()) {
+        do (*args) << parse_argument(has_url);
+        while (lex_css< exactly<','> >());
       }
-      while (lex< block_comment >());
-      if (!lex< exactly<')'> >()) error("expected a variable name (e.g. $x) or ')' for the parameter list for " + name, pstate);
+      if (!lex_css< exactly<')'> >()) error("expected a variable name (e.g. $x) or ')' for the parameter list for " + name, position);
     }
-
     return args;
   }
 
-  Argument* Parser::parse_argument()
+  Argument* Parser::parse_argument(bool has_url)
   {
+
     Argument* arg;
-    while (lex< alternatives < spaces, block_comment > >());
-    if (peek< sequence < variable, zero_plus < alternatives < spaces, line_comment, block_comment > >, exactly<':'> > >()) {
-      lex< variable >();
+    // some urls can look like line comments (parse literally - chunk would not work)
+    if (has_url && lex< sequence < uri_value, lookahead < loosely<')'> > > >(false)) {
+      String* the_url = parse_interpolated_chunk(lexed);
+      arg = new (ctx.mem) Argument(the_url->pstate(), the_url);
+    }
+    else if (peek_css< sequence < variable, optional_css_comments, exactly<':'> > >()) {
+      lex_css< variable >();
       string name(Util::normalize_underscores(lexed));
       ParserState p = pstate;
-      while (lex< alternatives < spaces, block_comment > >()) {};
-      lex< exactly<':'> >();
+      lex_css< exactly<':'> >();
       Expression* val = parse_space_list();
       val->is_delayed(false);
       arg = new (ctx.mem) Argument(p, val, name);
@@ -372,7 +400,7 @@ namespace Sass {
       bool is_keyword = false;
       Expression* val = parse_space_list();
       val->is_delayed(false);
-      if (lex< exactly< ellipsis > >()) {
+      if (lex_css< exactly< ellipsis > >()) {
         if (val->concrete_type() == Expression::MAP) is_keyword = true;
         else is_arglist = true;
       }
@@ -389,13 +417,13 @@ namespace Sass {
     if (!lex< exactly<':'> >()) error("expected ':' after " + name + " in assignment statement", pstate);
     Expression* val = parse_list();
     val->is_delayed(false);
-    bool is_guarded = false;
+    bool is_default = false;
     bool is_global = false;
     while (peek< default_flag >() || peek< global_flag >()) {
-      is_guarded = lex< default_flag >() || is_guarded;
+      is_default = lex< default_flag >() || is_default;
       is_global = lex< global_flag >() || is_global;
     }
-    Assignment* var = new (ctx.mem) Assignment(var_source_position, name, val, is_guarded, is_global);
+    Assignment* var = new (ctx.mem) Assignment(var_source_position, name, val, is_default, is_global);
     return var;
   }
 
@@ -432,8 +460,9 @@ namespace Sass {
       sel = parse_selector_group();
     }
     bool old_in_at_root = in_at_root;
-    in_at_root = false;
     ParserState r_source_position = pstate;
+    lex < css_comments >();
+    in_at_root = false;
     if (!peek< exactly<'{'> >()) error("expected a '{' after the selector", pstate);
     Block* block = parse_block();
     in_at_root = old_in_at_root;
@@ -477,16 +506,18 @@ namespace Sass {
   {
     bool reloop = true;
     To_String to_string(&ctx);
-    lex< optional_spaces_and_comments >();
+    lex< css_whitespace >();
     Selector_List* group = new (ctx.mem) Selector_List(pstate);
     group->media_block(last_media_block);
     group->last_block(block_stack.back());
     do {
       reloop = false;
-      if (peek< exactly<'{'> >() ||
-          peek< exactly<'}'> >() ||
-          peek< exactly<')'> >() ||
-          peek< exactly<';'> >())
+      if (peek< alternatives <
+            exactly<'{'>,
+            exactly<'}'>,
+            exactly<')'>,
+            exactly<';'>
+          > >())
         break; // in case there are superfluous commas at the end
       Complex_Selector* comb = parse_selector_combination();
       if (!comb->has_reference() && !in_at_root) {
@@ -508,10 +539,10 @@ namespace Sass {
         }
         if (peek_newline()) ref_wrap->has_line_break(true);
       }
-      while (peek< sequence< optional_spaces_and_comments, exactly<','> > >())
+      while (peek_css< exactly<','> >())
       {
         // consume everything up and including the comma speparator
-        reloop = lex< sequence< optional_spaces_and_comments, exactly<','> > >() != 0;
+        reloop = lex< sequence < optional_css_comments, exactly<','> > >() != 0;
         // remember line break (also between some commas)
         if (peek_newline()) comb->has_line_feed(true);
         if (comb->tail() && peek_newline()) comb->tail()->has_line_feed(true);
@@ -529,15 +560,15 @@ namespace Sass {
 
   Complex_Selector* Parser::parse_selector_combination()
   {
-    // lex< optional_spaces_and_comments >();
     Position sel_source_position(-1);
     Compound_Selector* lhs;
-    if (peek< exactly<'+'> >() ||
-        peek< exactly<'~'> >() ||
-        peek< exactly<'>'> >()) {
-      // no selector before the combinator
-      lhs = 0;
-    }
+    if (peek_css< alternatives <
+          exactly<'+'>,
+          exactly<'~'>,
+          exactly<'>'>
+        > >())
+    // no selector before the combinator
+    { lhs = 0; }
     else {
       lhs = parse_simple_selector_sequence();
       sel_source_position = before_token;
@@ -552,21 +583,22 @@ namespace Sass {
     bool cpx_lf = peek_newline();
 
     Complex_Selector* rhs;
-    if (peek< exactly<','> >() ||
-        peek< exactly<')'> >() ||
-        peek< exactly<'{'> >() ||
-        peek< exactly<'}'> >() ||
-        peek< exactly<';'> >() ||
-        peek< optional >()) {
-      // no selector after the combinator
-      rhs = 0;
-    }
+    if (peek_css< alternatives <
+                exactly<','>,
+                exactly<')'>,
+                exactly<'{'>,
+                exactly<'}'>,
+                exactly<';'>,
+                optional
+        > >())
+    // no selector after the combinator
+    { rhs = 0; }
     else {
       rhs = parse_selector_combination();
       sel_source_position = before_token;
     }
     if (!sel_source_position.line) sel_source_position = before_token;
-    Complex_Selector* cpx = new (ctx.mem) Complex_Selector(ParserState(path, sel_source_position), cmb, lhs, rhs);
+    Complex_Selector* cpx = new (ctx.mem) Complex_Selector(ParserState(path, source, sel_source_position), cmb, lhs, rhs);
     cpx->media_block(last_media_block);
     cpx->last_block(block_stack.back());
     if (cpx_lf) cpx->has_line_break(cpx_lf);
@@ -582,19 +614,19 @@ namespace Sass {
     if (lex< exactly<'&'> >()) {
       // check if we have a parent selector on the root level block
       if (block_stack.back() && block_stack.back()->is_root()) {
-        error("Base-level rules cannot contain the parent-selector-referencing character '&'.", pstate);
+        //error("Base-level rules cannot contain the parent-selector-referencing character '&'.", pstate);
       }
       (*seq) << new (ctx.mem) Selector_Reference(pstate);
       sawsomething = true;
       // if you see a space after a &, then you're done
-      if(peek< spaces >()) {
+      if(peek< spaces >() || peek< alternatives < spaces, exactly<';'> > >()) {
         return seq;
       }
     }
-    if (sawsomething && lex< sequence< negate< functional >, alternatives< identifier_fragment, universal, quoted_string, dimension, percentage, number > > >()) {
+    if (sawsomething && lex_css< sequence< negate< functional >, alternatives< identifier_alnums, universal, quoted_string, dimension, percentage, number > > >()) {
       // saw an ampersand, then allow type selectors with arbitrary number of hyphens at the beginning
       (*seq) << new (ctx.mem) Type_Selector(pstate, unquote(lexed));
-    } else if (lex< sequence< negate< functional >, alternatives< type_selector, universal, quoted_string, dimension, percentage, number > > >()) {
+    } else if (lex_css< sequence< negate< functional >, alternatives< type_selector, universal, quoted_string, dimension, percentage, number > > >()) {
       // if you see a type selector
       (*seq) << new (ctx.mem) Type_Selector(pstate, lexed);
       sawsomething = true;
@@ -605,14 +637,16 @@ namespace Sass {
     }
 
     while (!peek< spaces >(position) &&
-           !(peek < exactly<'+'> >(position) ||
-             peek < exactly<'~'> >(position) ||
-             peek < exactly<'>'> >(position) ||
-             peek < exactly<','> >(position) ||
-             peek < exactly<')'> >(position) ||
-             peek < exactly<'{'> >(position) ||
-             peek < exactly<'}'> >(position) ||
-             peek < exactly<';'> >(position))) {
+           !(peek_css < alternatives <
+               exactly<'+'>,
+               exactly<'~'>,
+               exactly<'>'>,
+               exactly<','>,
+               exactly<')'>,
+               exactly<'{'>,
+               exactly<'}'>,
+               exactly<';'>
+             > >(position))) {
       (*seq) << parse_simple_selector();
     }
     return seq;
@@ -620,12 +654,16 @@ namespace Sass {
 
   Simple_Selector* Parser::parse_simple_selector()
   {
-    if (lex< id_name >() || lex< class_name >()) {
+    lex < css_comments >();
+    if (lex< alternatives < id_name, class_name > >()) {
       return new (ctx.mem) Selector_Qualifier(pstate, unquote(lexed));
     }
-    else if (lex< quoted_string >() || lex< number >()) {
+    else if (lex< quoted_string >()) {
       return new (ctx.mem) Type_Selector(pstate, unquote(lexed));
     }
+    else if (lex< alternatives < number, kwd_sel_deep > >()) {
+      return new (ctx.mem) Type_Selector(pstate, lexed);
+    }
     else if (peek< pseudo_not >()) {
       return parse_negated_selector();
     }
@@ -675,7 +713,7 @@ namespace Sass {
         lex< sign >();
         String_Constant* op = new (ctx.mem) String_Quoted(p, lexed);
         // Binary_Expression::Type op = (lexed == "+" ? Binary_Expression::ADD : Binary_Expression::SUB);
-        lex< digits >();
+        lex< one_plus < digit > >();
         String_Constant* constant = new (ctx.mem) String_Quoted(p, lexed);
         // expr = new (ctx.mem) Binary_Expression(p, op, var_coef, constant);
         String_Schema* schema = new (ctx.mem) String_Schema(p, 3);
@@ -683,19 +721,19 @@ namespace Sass {
         expr = schema;
       }
       else if (peek< sequence< optional<sign>,
-                               optional<digits>,
+                               zero_plus<digit>,
                                exactly<'n'>,
-                               optional_spaces_and_comments,
+                               optional_css_whitespace,
                                exactly<')'> > >()) {
         lex< sequence< optional<sign>,
-                       optional<digits>,
+                       zero_plus<digit>,
                        exactly<'n'> > >();
         expr = new (ctx.mem) String_Quoted(p, lexed);
       }
-      else if (lex< sequence< optional<sign>, digits > >()) {
+      else if (lex< sequence< optional<sign>, one_plus < digit > > >()) {
         expr = new (ctx.mem) String_Quoted(p, lexed);
       }
-      else if (peek< sequence< identifier, optional_spaces_and_comments, exactly<')'> > >()) {
+      else if (peek< sequence< identifier, optional_css_whitespace, exactly<')'> > >()) {
         lex< identifier >();
         expr = new (ctx.mem) String_Quoted(p, lexed);
       }
@@ -726,32 +764,42 @@ namespace Sass {
 
   Attribute_Selector* Parser::parse_attribute_selector()
   {
-    lex< exactly<'['> >();
+    lex_css< exactly<'['> >();
     ParserState p = pstate;
-    if (!lex< attribute_name >()) error("invalid attribute name in attribute selector", pstate);
+    if (!lex_css< attribute_name >()) error("invalid attribute name in attribute selector", pstate);
     string name(lexed);
-    if (lex< exactly<']'> >()) return new (ctx.mem) Attribute_Selector(p, name, "", 0);
-    if (!lex< alternatives< exact_match, class_match, dash_match,
-                            prefix_match, suffix_match, substring_match > >()) {
+    if (lex_css< exactly<']'> >()) return new (ctx.mem) Attribute_Selector(p, name, "", 0);
+    if (!lex_css< alternatives< exact_match, class_match, dash_match,
+                                prefix_match, suffix_match, substring_match > >()) {
       error("invalid operator in attribute selector for " + name, pstate);
     }
     string matcher(lexed);
 
     String* value = 0;
-    if (lex< identifier >()) {
+    if (lex_css< identifier >()) {
       value = new (ctx.mem) String_Constant(p, lexed);
     }
-    else if (lex< quoted_string >()) {
+    else if (lex_css< quoted_string >()) {
       value = parse_interpolated_chunk(lexed, true); // needed!
     }
     else {
       error("expected a string constant or identifier in attribute selector for " + name, pstate);
     }
 
-    if (!lex< exactly<']'> >()) error("unterminated attribute selector for " + name, pstate);
+    if (!lex_css< exactly<']'> >()) error("unterminated attribute selector for " + name, pstate);
     return new (ctx.mem) Attribute_Selector(p, name, matcher, value);
   }
 
+  /* parse block comment and add to block */
+  void Parser::parse_block_comments(Block* block)
+  {
+    while (lex< block_comment >()) {
+      bool is_important = lexed.begin[2] == '!';
+      String*  contents = parse_interpolated_chunk(lexed);
+      (*block) << new (ctx.mem) Comment(pstate, contents, is_important);
+    }
+  }
+
   Block* Parser::parse_block()
   {
     lex< exactly<'{'> >();
@@ -761,36 +809,21 @@ namespace Sass {
     block_stack.push_back(block);
     lex< zero_plus < alternatives < space, line_comment > > >();
     // JMA - ensure that a block containing only block_comments is parsed
-    while (lex< block_comment >()) {
-      bool is_important = lexed.begin[2] == '!';
-      String*  contents = parse_interpolated_chunk(lexed);
-      Comment* comment  = new (ctx.mem) Comment(pstate, contents, is_important);
-      (*block) << comment;
-    }
+    parse_block_comments(block);
 
     while (!lex< exactly<'}'> >()) {
+      parse_block_comments(block);
       if (semicolon) {
         if (!lex< one_plus< exactly<';'> > >()) {
           error("non-terminal statement or declaration must end with ';'", pstate);
         }
         semicolon = false;
-        while (lex< block_comment >()) {
-          bool is_important = lexed.begin[2] == '!';
-          String*  contents = parse_interpolated_chunk(lexed);
-          Comment* comment  = new (ctx.mem) Comment(pstate, contents, is_important);
-          (*block) << comment;
-        }
+        parse_block_comments(block);
         if (lex< sequence< exactly<'}'>, zero_plus< exactly<';'> > > >()) break;
       }
-      if (lex< block_comment >()) {
-        bool is_important = lexed.begin[2] == '!';
-        String*  contents = parse_interpolated_chunk(lexed);
-        Comment* comment  = new (ctx.mem) Comment(pstate, contents, is_important);
-        (*block) << comment;
-      }
-      else if (peek< import >(position)) {
+      else if (peek< kwd_import >(position)) {
         if (stack.back() == mixin_def || stack.back() == function_def) {
-          lex< import >(); // to adjust the before_token number
+          lex< kwd_import >(); // to adjust the before_token number
           error("@import directives are not allowed inside mixins and functions", pstate);
         }
         Import* imp = parse_import();
@@ -809,47 +842,47 @@ namespace Sass {
       else if (lex< line_comment >()) {
         // throw line comments away
       }
-      else if (peek< if_directive >()) {
+      else if (peek< kwd_if_directive >()) {
         (*block) << parse_if_directive();
       }
-      else if (peek< for_directive >()) {
+      else if (peek< kwd_for_directive >()) {
         (*block) << parse_for_directive();
       }
-      else if (peek< each_directive >()) {
+      else if (peek< kwd_each_directive >()) {
         (*block) << parse_each_directive();
       }
-      else if (peek < while_directive >()) {
+      else if (peek < kwd_while_directive >()) {
         (*block) << parse_while_directive();
       }
-      else if (lex < return_directive >()) {
+      else if (lex < kwd_return_directive >()) {
         (*block) << new (ctx.mem) Return(pstate, parse_list());
         semicolon = true;
       }
-      else if (peek< warn >()) {
+      else if (peek< kwd_warn >()) {
         (*block) << parse_warning();
         semicolon = true;
       }
-      else if (peek< err >()) {
+      else if (peek< kwd_err >()) {
         (*block) << parse_error();
         semicolon = true;
       }
-      else if (peek< dbg >()) {
+      else if (peek< kwd_dbg >()) {
         (*block) << parse_debug();
         semicolon = true;
       }
       else if (stack.back() == function_def) {
         error("only variable declarations and control directives are allowed inside functions", pstate);
       }
-      else if (peek< mixin >() || peek< function >()) {
+      else if (peek< kwd_mixin >() || peek< kwd_function >()) {
         (*block) << parse_definition();
       }
-      else if (peek< include >(position)) {
+      else if (peek< kwd_include >(position)) {
         Mixin_Call* the_call = parse_mixin_call();
         (*block) << the_call;
         // don't need a semicolon after a content block
         semicolon = (the_call->block()) ? false : true;
       }
-      else if (lex< content >()) {
+      else if (lex< kwd_content >()) {
         if (stack.back() != mixin_def) {
           error("@content may only be used within a mixin", pstate);
         }
@@ -862,7 +895,7 @@ namespace Sass {
         semicolon = true;
       }
       */
-      else if (lex< extend >()) {
+      else if (lex< kwd_extend >()) {
         Selector_Lookahead lookahead = lookahead_for_extension_target(position);
         if (!lookahead.found) error("invalid selector for @extend", pstate);
         Selector* target;
@@ -871,13 +904,13 @@ namespace Sass {
         (*block) << new (ctx.mem) Extension(pstate, target);
         semicolon = true;
       }
-      else if (peek< media >()) {
+      else if (peek< kwd_media >()) {
         (*block) << parse_media_block();
       }
-      else if (peek< supports >()) {
+      else if (peek< kwd_supports >()) {
         (*block) << parse_feature_block();
       }
-      else if (peek< at_root >()) {
+      else if (peek< kwd_at_root >()) {
         (*block) << parse_at_root_block();
       }
       // ignore the @charset directive for now
@@ -923,12 +956,7 @@ namespace Sass {
         }
       }
       else lex< one_plus< exactly<';'> > >();
-      while (lex< block_comment >()) {
-        bool is_important = lexed.begin[2] == '!';
-        String*  contents = parse_interpolated_chunk(lexed);
-        Comment* comment  = new (ctx.mem) Comment(pstate, contents, is_important);
-        (*block) << comment;
-      }
+      parse_block_comments(block);
     }
     block_stack.pop_back();
     return block;
@@ -942,19 +970,23 @@ namespace Sass {
     else if (lex< sequence< optional< exactly<'*'> >, identifier > >()) {
       prop = new (ctx.mem) String_Quoted(pstate, lexed);
     }
-    else if (lex< custom_property_name >()) {
-      prop = new (ctx.mem) String_Quoted(pstate, lexed);
-    }
     else {
       error("invalid property name", pstate);
     }
-    if (!lex< one_plus< exactly<':'> > >()) error("property \"" + string(lexed) + "\" must be followed by a ':'", pstate);
-    if (peek< exactly<';'> >()) error("style declaration must contain a value", pstate);
-    if (peek< static_value >()) {
+    const string property(lexed);
+    if (!lex_css< one_plus< exactly<':'> > >()) error("property \"" + property + "\" must be followed by a ':'", pstate);
+    if (peek_css< exactly<';'> >()) error("style declaration must contain a value", pstate);
+    if (peek_css< static_value >()) {
       return new (ctx.mem) Declaration(prop->pstate(), prop, parse_static_value()/*, lex<important>()*/);
     }
     else {
-      return new (ctx.mem) Declaration(prop->pstate(), prop, parse_list()/*, lex<important>()*/);
+      Expression* list_ex = parse_list();
+      if (List* list = dynamic_cast<List*>(list_ex)) {
+        if (list->length() == 0 && !peek< exactly <'{'> >()) {
+          css_error("Invalid CSS", " after ", ": expected expression (e.g. 1px, bold), was ");
+        }
+      }
+      return new (ctx.mem) Declaration(prop->pstate(), prop, list_ex/*, lex<important>()*/);
     }
   }
 
@@ -990,10 +1022,10 @@ namespace Sass {
     Map* map = new (ctx.mem) Map(pstate, 1);
     (*map) << make_pair(key, value);
 
-    while (lex< exactly<','> >())
+    while (lex_css< exactly<','> >())
     {
       // allow trailing commas - #495
-      if (peek< exactly<')'> >(position))
+      if (peek_css< exactly<')'> >(position))
       { break; }
 
       Expression* key = parse_list();
@@ -1019,32 +1051,35 @@ namespace Sass {
 
   Expression* Parser::parse_comma_list()
   {
-    if (//peek< exactly<'!'> >(position) ||
-        peek< exactly<';'> >(position) ||
-        peek< exactly<'}'> >(position) ||
-        peek< exactly<'{'> >(position) ||
-        peek< exactly<')'> >(position) ||
-        //peek< exactly<':'> >(position) ||
-        peek< exactly<ellipsis> >(position))
+    if (peek_css< alternatives <
+          // exactly<'!'>,
+          // exactly<':'>,
+          exactly<';'>,
+          exactly<'}'>,
+          exactly<'{'>,
+          exactly<')'>,
+          exactly<ellipsis>
+        > >(position))
     { return new (ctx.mem) List(pstate, 0); }
     Expression* list1 = parse_space_list();
     // if it's a singleton, return it directly; don't wrap it
-    if (!peek< exactly<','> >(position)) return list1;
+    if (!peek_css< exactly<','> >(position)) return list1;
 
     List* comma_list = new (ctx.mem) List(pstate, 2, List::COMMA);
     (*comma_list) << list1;
 
-    while (lex< exactly<','> >())
+    while (lex_css< exactly<','> >())
     {
-      if (//peek< exactly<'!'> >(position) ||
-          peek< exactly<';'> >(position) ||
-          peek< exactly<'}'> >(position) ||
-          peek< exactly<'{'> >(position) ||
-          peek< exactly<')'> >(position) ||
-          peek< exactly<':'> >(position) ||
-          peek< exactly<ellipsis> >(position)) {
-        break;
-      }
+      if (peek_css< alternatives <
+            // exactly<'!'>,
+            exactly<';'>,
+            exactly<'}'>,
+            exactly<'{'>,
+            exactly<')'>,
+            exactly<':'>,
+            exactly<ellipsis>
+          > >(position)
+      ) { break; }
       Expression* list = parse_space_list();
       (*comma_list) << list;
     }
@@ -1056,32 +1091,36 @@ namespace Sass {
   {
     Expression* disj1 = parse_disjunction();
     // if it's a singleton, return it directly; don't wrap it
-    if (//peek< exactly<'!'> >(position) ||
-        peek< exactly<';'> >(position) ||
-        peek< exactly<'}'> >(position) ||
-        peek< exactly<'{'> >(position) ||
-        peek< exactly<')'> >(position) ||
-        peek< exactly<','> >(position) ||
-        peek< exactly<':'> >(position) ||
-        peek< exactly<ellipsis> >(position) ||
-        peek< default_flag >(position) ||
-        peek< global_flag >(position))
-    { return disj1; }
+    if (peek_css< alternatives <
+          // exactly<'!'>,
+          exactly<';'>,
+          exactly<'}'>,
+          exactly<'{'>,
+          exactly<')'>,
+          exactly<','>,
+          exactly<':'>,
+          exactly<ellipsis>,
+          default_flag,
+          global_flag
+        > >(position)
+    ) { return disj1; }
 
     List* space_list = new (ctx.mem) List(pstate, 2, List::SPACE);
     (*space_list) << disj1;
 
-    while (!(//peek< exactly<'!'> >(position) ||
-             peek< exactly<';'> >(position) ||
-             peek< exactly<'}'> >(position) ||
-             peek< exactly<'{'> >(position) ||
-             peek< exactly<')'> >(position) ||
-             peek< exactly<','> >(position) ||
-             peek< exactly<':'> >(position) ||
-             peek< exactly<ellipsis> >(position) ||
-             peek< default_flag >(position) ||
-             peek< global_flag >(position)))
-    {
+    while (!(peek_css< alternatives <
+               // exactly<'!'>,
+               exactly<';'>,
+               exactly<'}'>,
+               exactly<'{'>,
+               exactly<')'>,
+               exactly<','>,
+               exactly<':'>,
+               exactly<ellipsis>,
+               default_flag,
+               global_flag
+           > >(position))
+    ) {
       (*space_list) << parse_disjunction();
     }
 
@@ -1092,10 +1131,10 @@ namespace Sass {
   {
     Expression* conj1 = parse_conjunction();
     // if it's a singleton, return it directly; don't wrap it
-    if (!peek< sequence< or_op, negate< identifier > > >()) return conj1;
+    if (!peek_css< kwd_or >()) return conj1;
 
     vector<Expression*> operands;
-    while (lex< sequence< or_op, negate< identifier > > >())
+    while (lex_css< kwd_or >())
       operands.push_back(parse_conjunction());
 
     return fold_operands(conj1, operands, Binary_Expression::OR);
@@ -1105,10 +1144,10 @@ namespace Sass {
   {
     Expression* rel1 = parse_relation();
     // if it's a singleton, return it directly; don't wrap it
-    if (!peek< sequence< and_op, negate< identifier > > >()) return rel1;
+    if (!peek_css< kwd_and >()) return rel1;
 
     vector<Expression*> operands;
-    while (lex< sequence< and_op, negate< identifier > > >())
+    while (lex_css< kwd_and >())
       operands.push_back(parse_relation());
 
     return fold_operands(rel1, operands, Binary_Expression::AND);
@@ -1118,21 +1157,23 @@ namespace Sass {
   {
     Expression* expr1 = parse_expression();
     // if it's a singleton, return it directly; don't wrap it
-    if (!(peek< eq_op >(position)  ||
-          peek< neq_op >(position) ||
-          peek< gte_op >(position) ||
-          peek< gt_op >(position)  ||
-          peek< lte_op >(position) ||
-          peek< lt_op >(position)))
+    if (!(peek< alternatives <
+            kwd_eq,
+            kwd_neq,
+            kwd_gte,
+            kwd_gt,
+            kwd_lte,
+            kwd_lt
+          > >(position)))
     { return expr1; }
 
     Binary_Expression::Type op
-    = lex<eq_op>()  ? Binary_Expression::EQ
-    : lex<neq_op>() ? Binary_Expression::NEQ
-    : lex<gte_op>() ? Binary_Expression::GTE
-    : lex<lte_op>() ? Binary_Expression::LTE
-    : lex<gt_op>()  ? Binary_Expression::GT
-    : lex<lt_op>()  ? Binary_Expression::LT
+    = lex<kwd_eq>()  ? Binary_Expression::EQ
+    : lex<kwd_neq>() ? Binary_Expression::NEQ
+    : lex<kwd_gte>() ? Binary_Expression::GTE
+    : lex<kwd_lte>() ? Binary_Expression::LTE
+    : lex<kwd_gt>()  ? Binary_Expression::GT
+    : lex<kwd_lt>()  ? Binary_Expression::LT
     :                 Binary_Expression::LT; // whatever
 
     Expression* expr2 = parse_expression();
@@ -1152,7 +1193,7 @@ namespace Sass {
 
     vector<Expression*> operands;
     vector<Binary_Expression::Type> operators;
-    while (lex< exactly<'+'> >() || lex< sequence< negate< digits >, exactly<'-'> > >()) {
+    while (lex< exactly<'+'> >() || lex< sequence< negate< digit >, exactly<'-'> > >()) {
       operators.push_back(lexed.to_string() == "+" ? Binary_Expression::ADD : Binary_Expression::SUB);
       operands.push_back(parse_term());
     }
@@ -1162,38 +1203,35 @@ namespace Sass {
 
   Expression* Parser::parse_term()
   {
-    Expression* fact1 = parse_factor();
-
+    Expression* factor = parse_factor();
     // Special case: Ruby sass never tries to modulo if the lhs contains an interpolant
-    if (peek< exactly<'%'> >(position) && fact1->concrete_type() == Expression::STRING) {
-      String_Schema* ss = dynamic_cast<String_Schema*>(fact1);
-      if (ss && ss->has_interpolants()) return fact1;
+    if (peek_css< exactly<'%'> >(position) && factor->concrete_type() == Expression::STRING) {
+      String_Schema* ss = dynamic_cast<String_Schema*>(factor);
+      if (ss && ss->has_interpolants()) return factor;
     }
-
     // if it's a singleton, return it directly; don't wrap it
-    if (!(peek< exactly<'*'> >(position) ||
-          peek< exactly<'/'> >(position) ||
-          peek< exactly<'%'> >(position)))
-    { return fact1; }
-
-    while (lex< block_comment >());
-    vector<Expression*> operands;
-    vector<Binary_Expression::Type> operators;
-    while (lex< exactly<'*'> >() || lex< exactly<'/'> >() || lex< exactly<'%'> >()) {
-      if      (lexed.to_string() == "*") operators.push_back(Binary_Expression::MUL);
-      else if (lexed.to_string() == "/") operators.push_back(Binary_Expression::DIV);
-      else                   operators.push_back(Binary_Expression::MOD);
+    if (!peek< class_char< static_ops > >(position)) return factor;
+    // parse more factors and operators
+    vector<Expression*> operands; // factors
+    vector<Binary_Expression::Type> operators; // ops
+    while (lex_css< class_char< static_ops > >()) {
+      switch(*lexed.begin) {
+        case '*': operators.push_back(Binary_Expression::MUL); break;
+        case '/': operators.push_back(Binary_Expression::DIV); break;
+        case '%': operators.push_back(Binary_Expression::MOD); break;
+        default: throw runtime_error("unknown static op parsed"); break;
+      }
       operands.push_back(parse_factor());
     }
-
-    return fold_operands(fact1, operands, operators);
+    // operands and operators to binary expression
+    return fold_operands(factor, operands, operators);
   }
 
   Expression* Parser::parse_factor()
   {
-    if (lex< exactly<'('> >()) {
+    if (lex_css< exactly<'('> >()) {
       Expression* value = parse_map();
-      if (!lex< exactly<')'> >()) error("unclosed parenthesis", pstate);
+      if (!lex_css< exactly<')'> >()) error("unclosed parenthesis", pstate);
       value->is_delayed(false);
       // make sure wrapped lists and division expressions are non-delayed within parentheses
       if (value->concrete_type() == Expression::LIST) {
@@ -1224,19 +1262,19 @@ namespace Sass {
     else if (peek< sequence< identifier_schema, negate< exactly<'%'> > > >()) {
       return parse_identifier_schema();
     }
-    else if (peek< functional >() && !peek< uri_prefix >()) {
+    else if (peek< functional >()) {
       return parse_function_call();
     }
-    else if (lex< sequence< exactly<'+'>, optional_spaces_and_comments, negate< number > > >()) {
+    else if (lex< sequence< exactly<'+'>, optional_css_whitespace, negate< number > > >()) {
       return new (ctx.mem) Unary_Expression(pstate, Unary_Expression::PLUS, parse_factor());
     }
-    else if (lex< sequence< exactly<'-'>, optional_spaces_and_comments, negate< number> > >()) {
+    else if (lex< sequence< exactly<'-'>, optional_css_whitespace, negate< number> > >()) {
       return new (ctx.mem) Unary_Expression(pstate, Unary_Expression::MINUS, parse_factor());
     }
-    else if (lex< sequence< not_op, spaces_and_comments > >()) {
+    else if (lex< sequence< kwd_not, css_whitespace > >()) {
       return new (ctx.mem) Unary_Expression(pstate, Unary_Expression::NOT, parse_factor());
     }
-    else if (peek < sequence < one_plus < alternatives < spaces_and_comments, exactly<'-'>, exactly<'+'> > >, number > >()) {
+    else if (peek < sequence < one_plus < alternatives < css_whitespace, exactly<'-'>, exactly<'+'> > >, number > >()) {
       if (parse_number_prefix()) return parse_value(); // prefix is positive
       return new (ctx.mem) Unary_Expression(pstate, Unary_Expression::MINUS, parse_value());
     }
@@ -1247,44 +1285,10 @@ namespace Sass {
 
   Expression* Parser::parse_value()
   {
-    while (lex< block_comment >());
-    if (lex< uri_prefix >()) {
-      Arguments* args = new (ctx.mem) Arguments(pstate);
-      Function_Call* result = new (ctx.mem) Function_Call(pstate, "url", args);
-      const char* here = position;
-      Position here_p = before_token;
-      // Try to parse a SassScript expression. If it succeeds and we can munch
-      // a matching rparen, then that's our url. If we can't munch a matching
-      // rparen, or if the attempt to parse an expression fails, then try to
-      // munch a regular CSS url.
-      try {
-        // special case -- if there's a comment, treat it as part of a URL
-        lex<spaces>();
-        if (peek<line_comment_prefix>() || peek<block_comment_prefix>()) error("comment in URL", pstate); // doesn't really matter what we throw
-        Expression* expr = parse_list();
-        if (!lex< exactly<')'> >()) error("dangling expression in URL", pstate); // doesn't really matter what we throw
-        Argument* arg = new (ctx.mem) Argument(expr->pstate(), expr);
-        *args << arg;
-        return result;
-      }
-      catch (Sass_Error&) {
-        // back up so we can try again
-        position = here;
-        before_token = here_p;
-      }
-      catch (...) { throw; }
-      lex< spaces >();
-      if (lex< url >()) {
-        String* the_url = parse_interpolated_chunk(lexed);
-        Argument* arg = new (ctx.mem) Argument(the_url->pstate(), the_url);
-        *args << arg;
-      }
-      else {
-        error("malformed URL", pstate);
-      }
-      if (!lex< exactly<')'> >()) error("URI is missing ')'", pstate);
-      return result;
-    }
+    lex< css_comments >();
+    if (lex< ampersand >())
+    {
+      return new (ctx.mem) Parent_Selector(pstate, parse_selector_group()); }
 
     if (lex< important >())
     { return new (ctx.mem) String_Constant(pstate, "!important"); }
@@ -1293,13 +1297,13 @@ namespace Sass {
     if ((stop = peek< value_schema >()))
     { return parse_value_schema(stop); }
 
-    if (lex< sequence< true_val, negate< identifier > > >())
+    if (lex< kwd_true >())
     { return new (ctx.mem) Boolean(pstate, true); }
 
-    if (lex< sequence< false_val, negate< identifier > > >())
+    if (lex< kwd_false >())
     { return new (ctx.mem) Boolean(pstate, false); }
 
-    if (lex< sequence< null, negate< identifier > > >())
+    if (lex< kwd_null >())
     { return new (ctx.mem) Null(pstate); }
 
     if (lex< identifier >()) {
@@ -1366,7 +1370,7 @@ namespace Sass {
         const char* j = skip_over_scopes< exactly<hash_lbrace>, exactly<rbrace> >(p + 2, chunk.end); // find the closing brace
         if (j) { --j;
           // parse the interpolant and accumulate it
-          Expression* interp_node = Parser::from_token(Token(p+2, j, before_token), ctx, pstate).parse_list();
+          Expression* interp_node = Parser::from_token(Token(p+2, j), ctx, pstate).parse_list();
           interp_node->is_interpolant(true);
           (*schema) << interp_node;
           i = j;
@@ -1427,7 +1431,7 @@ namespace Sass {
         const char* j = skip_over_scopes< exactly<hash_lbrace>, exactly<rbrace> >(p+2, str.end); // find the closing brace
         if (j) {
           // parse the interpolant and accumulate it
-          Expression* interp_node = Parser::from_token(Token(p+2, j, before_token), ctx, pstate).parse_list();
+          Expression* interp_node = Parser::from_token(Token(p+2, j), ctx, pstate).parse_list();
           interp_node->is_interpolant(true);
           (*schema) << interp_node;
           i = j;
@@ -1470,7 +1474,7 @@ namespace Sass {
     size_t num_items = 0;
     while (position < stop) {
       if (lex< interpolant >()) {
-        Token insides(Token(lexed.begin + 2, lexed.end - 1, before_token));
+        Token insides(Token(lexed.begin + 2, lexed.end - 1));
         Expression* interp_node = Parser::from_token(insides, ctx, pstate).parse_list();
         interp_node->is_interpolant(true);
         (*schema) << interp_node;
@@ -1564,7 +1568,7 @@ namespace Sass {
         const char* j = skip_over_scopes< exactly<hash_lbrace>, exactly<rbrace> >(p+2, id.end); // find the closing brace
         if (j) {
           // parse the interpolant and accumulate it
-          Expression* interp_node = Parser::from_token(Token(p+2, j, before_token), ctx, pstate).parse_list();
+          Expression* interp_node = Parser::from_token(Token(p+2, j), ctx, pstate).parse_list();
           interp_node->is_interpolant(true);
           (*schema) << interp_node;
           schema->has_interpolants(true);
@@ -1595,7 +1599,7 @@ namespace Sass {
     const char* arg_end = position;
     lex< exactly<')'> >();
 
-    Argument* arg = new (ctx.mem) Argument(arg_pos, parse_interpolated_chunk(Token(arg_beg, arg_end, before_token)));
+    Argument* arg = new (ctx.mem) Argument(arg_pos, parse_interpolated_chunk(Token(arg_beg, arg_end)));
     Arguments* args = new (ctx.mem) Arguments(arg_pos);
     *args << arg;
     return new (ctx.mem) Function_Call(call_pos, name, args);
@@ -1604,11 +1608,9 @@ namespace Sass {
   Function_Call* Parser::parse_function_call()
   {
     lex< identifier >();
-    string name(Util::normalize_underscores(lexed));
-    ParserState source_position_of_call = pstate;
-
-    Function_Call* the_call = new (ctx.mem) Function_Call(source_position_of_call, name, parse_arguments());
-    return the_call;
+    string name(lexed);
+    Arguments* args = parse_arguments(name == "url");
+    return new (ctx.mem) Function_Call(pstate, name, args);
   }
 
   Function_Call_Schema* Parser::parse_function_call_schema()
@@ -1622,19 +1624,20 @@ namespace Sass {
 
   If* Parser::parse_if_directive(bool else_if)
   {
-    lex< if_directive >() || (else_if && lex< exactly<if_after_else_kwd> >());
+    lex< kwd_if_directive >() || (else_if && lex< exactly<if_after_else_kwd> >());
     ParserState if_source_position = pstate;
     Expression* predicate = parse_list();
     predicate->is_delayed(false);
     if (!peek< exactly<'{'> >()) error("expected '{' after the predicate for @if", pstate);
     Block* consequent = parse_block();
     Block* alternative = 0;
-    if (lex< else_directive >()) {
-      if (peek< exactly<if_after_else_kwd> >()) {
-        alternative = new (ctx.mem) Block(pstate);
-        (*alternative) << parse_if_directive(true);
-      }
-      else if (!peek< exactly<'{'> >()) {
+
+    if (lex< elseif_directive >()) {
+      alternative = new (ctx.mem) Block(pstate);
+      (*alternative) << parse_if_directive(true);
+    }
+    else if (lex< kwd_else_directive >()) {
+      if (!peek< exactly<'{'> >()) {
         error("expected '{' after @else", pstate);
       }
       else {
@@ -1646,16 +1649,16 @@ namespace Sass {
 
   For* Parser::parse_for_directive()
   {
-    lex< for_directive >();
+    lex< kwd_for_directive >();
     ParserState for_source_position = pstate;
     if (!lex< variable >()) error("@for directive requires an iteration variable", pstate);
     string var(Util::normalize_underscores(lexed));
-    if (!lex< from >()) error("expected 'from' keyword in @for directive", pstate);
+    if (!lex< kwd_from >()) error("expected 'from' keyword in @for directive", pstate);
     Expression* lower_bound = parse_expression();
     lower_bound->is_delayed(false);
     bool inclusive = false;
-    if (lex< through >()) inclusive = true;
-    else if (lex< to >()) inclusive = false;
+    if (lex< kwd_through >()) inclusive = true;
+    else if (lex< kwd_to >()) inclusive = false;
     else                  error("expected 'through' or 'to' keyword in @for directive", pstate);
     Expression* upper_bound = parse_expression();
     upper_bound->is_delayed(false);
@@ -1666,16 +1669,16 @@ namespace Sass {
 
   Each* Parser::parse_each_directive()
   {
-    lex < each_directive >();
+    lex < kwd_each_directive >();
     ParserState each_source_position = pstate;
     if (!lex< variable >()) error("@each directive requires an iteration variable", pstate);
     vector<string> vars;
     vars.push_back(Util::normalize_underscores(lexed));
-    while (peek< exactly<','> >() && lex< exactly<','> >()) {
+    while (lex< exactly<','> >()) {
       if (!lex< variable >()) error("@each directive requires an iteration variable", pstate);
       vars.push_back(Util::normalize_underscores(lexed));
     }
-    if (!lex< in >()) error("expected 'in' keyword in @each directive", pstate);
+    if (!lex< kwd_in >()) error("expected 'in' keyword in @each directive", pstate);
     Expression* list = parse_list();
     list->is_delayed(false);
     if (list->concrete_type() == Expression::LIST) {
@@ -1691,7 +1694,7 @@ namespace Sass {
 
   While* Parser::parse_while_directive()
   {
-    lex< while_directive >();
+    lex< kwd_while_directive >();
     ParserState while_source_position = pstate;
     Expression* predicate = parse_list();
     predicate->is_delayed(false);
@@ -1701,7 +1704,7 @@ namespace Sass {
 
   Media_Block* Parser::parse_media_block()
   {
-    lex< media >();
+    lex< kwd_media >();
     ParserState media_source_position = pstate;
 
     List* media_queries = parse_media_queries();
@@ -1776,7 +1779,7 @@ namespace Sass {
 
   Feature_Block* Parser::parse_feature_block()
   {
-    lex< supports >();
+    lex< kwd_supports >();
     ParserState supports_source_position = pstate;
 
     Feature_Query* feature_queries = parse_feature_queries();
@@ -1805,9 +1808,9 @@ namespace Sass {
 
   Feature_Query_Condition* Parser::parse_feature_query()
   {
-    if (peek< not_op >(position)) return parse_supports_negation();
-    else if (peek< and_op >(position)) return parse_supports_conjunction();
-    else if (peek< or_op >(position)) return parse_supports_disjunction();
+    if (peek< kwd_not >(position)) return parse_supports_negation();
+    else if (peek< kwd_and >(position)) return parse_supports_conjunction();
+    else if (peek< kwd_or >(position)) return parse_supports_disjunction();
     else if (peek< exactly<'('> >(position)) return parse_feature_query_in_parens();
     else return parse_supports_declaration();
   }
@@ -1826,7 +1829,7 @@ namespace Sass {
 
   Feature_Query_Condition* Parser::parse_supports_negation()
   {
-    lex< not_op >();
+    lex< kwd_not >();
 
     Feature_Query_Condition* cond = parse_feature_query();
     cond->operand(Feature_Query_Condition::NOT);
@@ -1836,7 +1839,7 @@ namespace Sass {
 
   Feature_Query_Condition* Parser::parse_supports_conjunction()
   {
-    lex< and_op >();
+    lex< kwd_and >();
 
     Feature_Query_Condition* cond = parse_feature_query();
     cond->operand(Feature_Query_Condition::AND);
@@ -1846,7 +1849,7 @@ namespace Sass {
 
   Feature_Query_Condition* Parser::parse_supports_disjunction()
   {
-    lex< or_op >();
+    lex< kwd_or >();
 
     Feature_Query_Condition* cond = parse_feature_query();
     cond->operand(Feature_Query_Condition::OR);
@@ -1866,7 +1869,7 @@ namespace Sass {
 
   At_Root_Block* Parser::parse_at_root_block()
   {
-    lex<at_root>();
+    lex<kwd_at_root>();
     ParserState at_source_position = pstate;
     Block* body = 0;
     At_Root_Expression* expr = 0;
@@ -1895,11 +1898,8 @@ namespace Sass {
     lex< exactly<'('> >();
     if (peek< exactly<')'> >()) error("at-root feature required in at-root expression", pstate);
 
-    if (!peek< alternatives< with_directive, without_directive > >()) {
-      const char* i = position;
-      const char* p = peek< until<')'> >(i);
-      Token* t = new Token(i, p, Position(0, 0));
-      error("Invalid CSS after \"(\": expected \"with\" or \"without\", was \""+t->to_string()+"\"", pstate);
+    if (!peek< alternatives< kwd_with_directive, kwd_without_directive > >()) {
+      css_error("Invalid CSS", " after ", ": expected \"with\" or \"without\", was ");
     }
 
     Declaration* declaration = parse_declaration();
@@ -1945,19 +1945,19 @@ namespace Sass {
 
   Warning* Parser::parse_warning()
   {
-    lex< warn >();
+    lex< kwd_warn >();
     return new (ctx.mem) Warning(pstate, parse_list());
   }
 
   Error* Parser::parse_error()
   {
-    lex< err >();
+    lex< kwd_err >();
     return new (ctx.mem) Error(pstate, parse_list());
   }
 
   Debug* Parser::parse_debug()
   {
-    lex< dbg >();
+    lex< kwd_dbg >();
     return new (ctx.mem) Debug(pstate, parse_list());
   }
 
@@ -1977,8 +1977,9 @@ namespace Sass {
            (q = peek< sequence< pseudo_prefix, identifier > >(p))  ||
            (q = peek< percentage >(p))                             ||
            (q = peek< dimension >(p))                              ||
-           (q = peek< quoted_string >(p))                        ||
+           (q = peek< quoted_string >(p))                          ||
            (q = peek< exactly<'*'> >(p))                           ||
+           (q = peek< exactly<sel_deep_kwd> >(p))                           ||
            (q = peek< exactly<'('> >(p))                           ||
            (q = peek< exactly<')'> >(p))                           ||
            (q = peek< exactly<'['> >(p))                           ||
@@ -1989,14 +1990,15 @@ namespace Sass {
            (q = peek< exactly<','> >(p))                           ||
            (saw_stuff && (q = peek< exactly<'-'> >(p)))            ||
            (q = peek< binomial >(p))                               ||
+           (q = peek< block_comment >(p))                          ||
            (q = peek< sequence< optional<sign>,
-                                optional<digits>,
+                                zero_plus<digit>,
                                 exactly<'n'> > >(p))               ||
            (q = peek< sequence< optional<sign>,
-                                digits > >(p))                     ||
+                                one_plus<digit> > >(p))                     ||
            (q = peek< number >(p))                                 ||
            (q = peek< sequence< exactly<'&'>,
-                                identifier_fragment > >(p))        ||
+                                identifier_alnums > >(p))        ||
            (q = peek< exactly<'&'> >(p))                           ||
            (q = peek< exactly<'%'> >(p))                           ||
            (q = peek< alternatives<exact_match,
@@ -2036,7 +2038,7 @@ namespace Sass {
            (q = peek< sequence< pseudo_prefix, identifier > >(p))  ||
            (q = peek< percentage >(p))                             ||
            (q = peek< dimension >(p))                              ||
-           (q = peek< quoted_string >(p))                        ||
+           (q = peek< quoted_string >(p))                          ||
            (q = peek< exactly<'*'> >(p))                           ||
            (q = peek< exactly<'('> >(p))                           ||
            (q = peek< exactly<')'> >(p))                           ||
@@ -2048,14 +2050,15 @@ namespace Sass {
            (q = peek< exactly<','> >(p))                           ||
            (saw_stuff && (q = peek< exactly<'-'> >(p)))            ||
            (q = peek< binomial >(p))                               ||
+           (q = peek< block_comment >(p))                          ||
            (q = peek< sequence< optional<sign>,
-                                optional<digits>,
+                                zero_plus<digit>,
                                 exactly<'n'> > >(p))               ||
            (q = peek< sequence< optional<sign>,
-                                digits > >(p))                     ||
+                                one_plus<digit> > >(p))                     ||
            (q = peek< number >(p))                                 ||
            (q = peek< sequence< exactly<'&'>,
-                                identifier_fragment > >(p))        ||
+                                identifier_alnums > >(p))        ||
            (q = peek< exactly<'&'> >(p))                           ||
            (q = peek< exactly<'%'> >(p))                           ||
            (q = peek< alternatives<exact_match,
@@ -2184,7 +2187,42 @@ namespace Sass {
 
   void Parser::error(string msg, Position pos)
   {
-    throw Sass_Error(Sass_Error::syntax, ParserState(path, pos.line ? pos : before_token, Offset(0, 0)), msg);
+    throw Sass_Error(Sass_Error::syntax, ParserState(path, source, pos.line ? pos : before_token, Offset(0, 0)), msg);
+  }
+
+  // print a css parsing error with actual context information from parsed source
+  void Parser::css_error(const string& msg, const string& prefix, const string& middle)
+  {
+    int max_len = 14;
+    const char* pos = peek < optional_spaces >();
+    bool ellipsis_left = false;
+    const char* pos_left(pos);
+    while (*pos_left && pos_left >= source) {
+      if (pos - pos_left > max_len) {
+        ellipsis_left = true;
+        break;
+      }
+      if (*pos_left == '\r') break;
+      if (*pos_left == '\n') break;
+      -- pos_left;
+    }
+    bool ellipsis_right = false;
+    const char* pos_right(pos);
+    while (*pos_right && pos_right <= end) {
+      if (pos_right - pos > max_len) {
+        ellipsis_right = true;
+        break;
+      }
+      if (*pos_right == '\r') break;
+      if (*pos_right == '\n') break;
+      ++ pos_right;
+    }
+    string left(pos_left, pos);
+    string right(pos, pos_right);
+    if (ellipsis_left) left = ellipsis + left;
+    if (ellipsis_right) right = right + ellipsis;
+    // now pass new message to the more generic error function
+    error(msg + prefix + quote(left) + middle + quote(right), pstate);
   }
 
 }