haml 2.2.24 → 3.0.0.beta.1

data/lib/sass/script/string.rb

@@ -1,12 +1,60 @@
 require 'sass/script/literal'
 
 module Sass::Script
-  # A SassScript object representing a string of text.
+  # A SassScript object representing a CSS string *or* a CSS identifier.
   class String < Literal
     # The Ruby value of the string.
     #
     # @return [String]
     attr_reader :value
-    alias_method :to_s, :value
+
+    # Whether this is a CSS string or a CSS identifier.
+    # The difference is that strings are written with double-quotes,
+    # while identifiers aren't.
+    #
+    # @return [Symbol] `:string` or `:identifier`
+    attr_reader :type
+
+    def context=(context)
+      super
+      @type = :identifier if context == :equals
+    end
+
+    # Creates a new string.
+    #
+    # @param value [String] See \{#value}
+    # @param type [Symbol] See \{#type}
+    def initialize(value, type = :identifier)
+      super(value)
+      @type = type
+    end
+
+    def plus(other)
+      other_str = other.is_a?(Sass::Script::String) ? other.value : other.to_s
+      Sass::Script::String.new(self.value + other_str, self.type)
+    end
+
+    # @see Node#to_s
+    def to_s
+      to_sass
+    end
+
+    # @param type [Symbol] The type of string to render this as.
+    #   `:string`s have double quotes, `:identifier`s do not.
+    # @see Node#to_sass
+    def to_sass(type = self.type)
+      if type == :identifier
+        if context == :equals && Sass::SCSS::RX.escape_ident(self.value).include?(?\\)
+          return "unquote(#{Sass::Script::String.new(self.value, :string).to_sass})"
+        end
+        return self.value
+      end
+
+      # Replace single backslashes with double. Really.
+      value = self.value.gsub("\\", "\\\\\\\\")
+      return "\"#{value}\"" unless value.include?('"')
+      return "'#{value}'" unless value.include?("'")
+      "\"#{value.gsub('"', "\\\"")}\"" #'
+    end
   end
 end

data/lib/sass/script/unary_operation.rb

@@ -1,6 +1,6 @@
 module Sass::Script
   # A SassScript parse node representing a unary operation,
-  # such as `-!b` or `not true`.
+  # such as `-$b` or `not true`.
   #
   # Currently only `-`, `/`, and `not` are unary operators.
   class UnaryOperation < Node
@@ -10,6 +10,7 @@ module Sass::Script
     def initialize(operand, operator)
       @operand = operand
       @operator = operator
+      super()
     end
 
     # @return [String] A human-readable s-expression representation of the operation
@@ -17,12 +18,34 @@ module Sass::Script
       "(#{@operator.inspect} #{@operand.inspect})"
     end
 
+    # @see Node#to_sass
+    def to_sass
+      operand = @operand.to_sass
+      if @operand.is_a?(Operation) ||
+          (@operator == :minus &&
+           (operand =~ Sass::SCSS::RX::IDENT) == 0)
+        operand = "(#{@operand.to_sass})"
+      end
+      op = Lexer::OPERATORS_REVERSE[@operator]
+      op + (op =~ /[a-z]/ ? " " : "") + operand
+    end
+
+    # Returns the operand of the operation.
+    #
+    # @return [Array<Node>]
+    # @see Node#children
+    def children
+      [@operand]
+    end
+
+    protected
+
     # Evaluates the operation.
     #
     # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
     # @return [Literal] The SassScript object that is the value of the operation
     # @raise [Sass::SyntaxError] if the operation is undefined for the operand
-    def perform(environment)
+    def _perform(environment)
       operator = "unary_#{@operator}"
       literal = @operand.perform(environment)
       literal.send(operator)

data/lib/sass/script/variable.rb

@@ -10,21 +10,38 @@ module Sass
       # @param name [String] See \{#name}
       def initialize(name)
         @name = name
+        super()
       end
 
       # @return [String] A string representation of the variable
       def inspect
-        "!#{name}"
+        return "!important" if name == "important"
+        "$#{name}"
       end
+      alias_method :to_sass, :inspect
+
+      # Returns an empty array.
+      #
+      # @return [Array<Node>] empty
+      # @see Node#children
+      def children
+        []
+      end
+
+      protected
 
       # Evaluates the variable.
       #
       # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
       # @return [Literal] The SassScript object that is the value of the variable
       # @raise [Sass::SyntaxError] if the variable is undefined
-      def perform(environment)
-        (val = environment.var(name)) && (return val)
-        raise SyntaxError.new("Undefined variable: \"!#{name}\".")
+      def _perform(environment)
+        raise SyntaxError.new("Undefined variable: \"$#{name}\".") unless val = environment.var(name)
+        if val.is_a?(Number)
+          val = val.dup
+          val.original = nil
+        end
+        return val
       end
     end
   end

data/lib/sass/scss.rb

@@ -0,0 +1,14 @@
+require 'sass/scss/rx'
+require 'sass/scss/script_lexer'
+require 'sass/scss/script_parser'
+require 'sass/scss/parser'
+
+module Sass
+  # SCSS is the CSS syntax for Sass.
+  # It parses into the same syntax tree as Sass,
+  # and generates the same sort of output CSS.
+  #
+  # This module contains code for the parsing of SCSS.
+  # The evaluation is handled by the broader {Sass} module.
+  module SCSS; end
+end

data/lib/sass/scss/css_parser.rb

@@ -0,0 +1,39 @@
+require 'sass/script/css_parser'
+
+module Sass
+  module SCSS
+    class CssParser < Parser
+      private
+
+      def variable; nil; end
+      def parent_selector; nil; end
+      def interpolation; nil; end
+      def interp_string; tok(STRING); end
+      def expected_property_separator; '":"'; end
+      def use_css_import?; true; end
+
+      def special_directive(name)
+        return unless name == 'media' || name == 'import'
+        super
+      end
+
+      def block_child(context)
+        case context
+        when :ruleset
+          declaration
+        when :stylesheet
+          directive || ruleset
+        when :directive
+          directive || declaration_or_ruleset
+        end
+      end
+
+      def nested_properties!(node, space)
+        expected('expression (e.g. 1px, bold)');
+      end
+
+      @sass_script_parser = Class.new(Sass::Script::CssParser)
+      @sass_script_parser.send(:include, ScriptParser)
+    end
+  end
+end

data/lib/sass/scss/parser.rb

@@ -0,0 +1,683 @@
+require 'strscan'
+require 'set'
+
+module Sass
+  module SCSS
+    # The parser for SCSS.
+    # It parses a string of code into a tree of {Sass::Tree::Node}s.
+    class Parser
+      # @param str [String] The source document to parse
+      def initialize(str)
+        @template = str
+        @line = 1
+        @strs = []
+      end
+
+      # Parses an SCSS document.
+      #
+      # @return [Sass::Tree::RootNode] The root node of the document tree
+      # @raise [Sass::SyntaxError] if there's a syntax error in the document
+      def parse
+        @scanner = StringScanner.new(
+          Haml::Util.check_encoding(@template) do |msg, line|
+            raise Sass::SyntaxError.new(msg, :line => line)
+          end.gsub("\r", ""))
+        root = stylesheet
+        expected("selector or at-rule") unless @scanner.eos?
+        root
+      end
+
+      private
+
+      include Sass::SCSS::RX
+
+      def stylesheet
+        node = node(Sass::Tree::RootNode.new(@scanner.string))
+        block_contents(node, :stylesheet) {s(node)}
+      end
+
+      def s(node)
+        while tok(S) || tok(CDC) || tok(CDO) || (c = tok(SINGLE_LINE_COMMENT)) || (c = tok(COMMENT))
+          next unless c
+          process_comment c, node
+          c = nil
+        end
+        true
+      end
+
+      def ss
+        nil while tok(S) || tok(SINGLE_LINE_COMMENT) || tok(COMMENT)
+        true
+      end
+
+      def ss_comments(node)
+        while tok(S) || (c = tok(SINGLE_LINE_COMMENT)) || (c = tok(COMMENT))
+          next unless c
+          process_comment c, node
+          c = nil
+        end
+
+        true
+      end
+
+      def whitespace
+        return unless tok(S) || tok(SINGLE_LINE_COMMENT) || tok(COMMENT)
+        ss
+      end
+
+      def process_comment(text, node)
+        single_line = text =~ /^\/\//
+        pre_str = single_line ? "" : @scanner.
+          string[0...@scanner.pos].
+          reverse[/.*?\*\/(.*?)($|\Z)/, 1].
+          reverse.gsub(/[^\s]/, ' ')
+        text = text.sub(/^\s*\/\//, '/*').gsub(/^\s*\/\//, ' *') + ' */' if single_line
+        comment = Sass::Tree::CommentNode.new(pre_str + text, single_line)
+        comment.line = @line - text.count("\n")
+        node << comment
+      end
+
+      DIRECTIVES = Set[:mixin, :include, :debug, :for, :while, :if, :import, :media]
+
+      def directive
+        return unless tok(/@/)
+        name = tok!(IDENT)
+        ss
+
+        if dir = special_directive(name)
+          return dir
+        end
+
+        val = str do
+          # Most at-rules take expressions (e.g. @import),
+          # but some (e.g. @page) take selector-like arguments
+          expr || selector
+        end
+        node = node(Sass::Tree::DirectiveNode.new("@#{name} #{val}".strip))
+
+        if tok(/\{/)
+          node.has_children = true
+          block_contents(node, :directive)
+          tok!(/\}/)
+        end
+
+        node
+      end
+
+      def special_directive(name)
+        sym = name.gsub('-', '_').to_sym
+        DIRECTIVES.include?(sym) && send(sym)
+      end
+
+      def mixin
+        name = tok! IDENT
+        args = sass_script(:parse_mixin_definition_arglist)
+        ss
+        block(node(Sass::Tree::MixinDefNode.new(name, args)), :directive)
+      end
+
+      def include
+        name = tok! IDENT
+        args = sass_script(:parse_mixin_include_arglist)
+        ss
+        node(Sass::Tree::MixinNode.new(name, args))
+      end
+
+      def debug
+        node(Sass::Tree::DebugNode.new(sass_script(:parse)))
+      end
+
+      def for
+        tok!(/\$/)
+        var = tok! IDENT
+        ss
+
+        tok!(/from/)
+        from = sass_script(:parse_until, Set["to", "through"])
+        ss
+
+        @expected = '"to" or "through"'
+        exclusive = (tok(/to/) || tok!(/through/)) == 'to'
+        to = sass_script(:parse)
+        ss
+
+        block(node(Sass::Tree::ForNode.new(var, from, to, exclusive)), :directive)
+      end
+
+      def while
+        expr = sass_script(:parse)
+        ss
+        block(node(Sass::Tree::WhileNode.new(expr)), :directive)
+      end
+
+      def if
+        expr = sass_script(:parse)
+        ss
+        node = block(node(Sass::Tree::IfNode.new(expr)), :directive)
+        ss
+        else_block(node)
+      end
+
+      def else_block(node)
+        return node unless tok(/@else/)
+        ss
+        else_node = block(
+          Sass::Tree::IfNode.new((sass_script(:parse) if tok(/if/))),
+          :directive)
+        node.add_else(else_node)
+        ss
+        else_block(node)
+      end
+
+      def import
+        @expected = "string or url()"
+        arg = tok(STRING) || tok!(URI)
+        path = @scanner[1] || @scanner[2] || @scanner[3]
+        ss
+
+        media = str {media_query_list}.strip
+
+        if !media.strip.empty? || use_css_import?
+          return node(Sass::Tree::DirectiveNode.new("@import #{arg} #{media}".strip))
+        end
+
+        node(Sass::Tree::ImportNode.new(path.strip))
+      end
+
+      def use_css_import?; false; end
+
+      def media
+        val = str {media_query_list}.strip
+        block(node(Sass::Tree::DirectiveNode.new("@media #{val}")), :directive)
+      end
+
+      # http://www.w3.org/TR/css3-mediaqueries/#syntax
+      def media_query_list
+        return unless media_query
+
+        ss
+        while tok(/,/)
+          ss; expr!(:media_query); ss
+        end
+
+        true
+      end
+
+      def media_query
+        if tok(/only|not/i)
+          ss
+          @expected = "media type (e.g. print, screen)"
+          tok!(IDENT)
+          ss
+        elsif !tok(IDENT) && !media_expr
+          return
+        end
+
+        ss
+        while tok(/and/i)
+          ss; expr!(:media_expr); ss
+        end
+
+        true
+      end
+
+      def media_expr
+        return unless tok(/\(/)
+        ss
+        @expected = "media feature (e.g. min-device-width, color)"
+        tok!(IDENT)
+        ss
+
+        if tok(/:/)
+          ss; expr!(:expr)
+        end
+        tok!(/\)/)
+        ss
+
+        true
+      end
+
+      def variable
+        return unless tok(/\$/)
+        name = tok!(IDENT)
+        ss; tok!(/:/); ss
+
+        expr = sass_script(:parse)
+        guarded = tok(DEFAULT)
+        node(Sass::Tree::VariableNode.new(name, expr, guarded))
+      end
+
+      def operator
+        # Many of these operators (all except / and ,)
+        # are disallowed by the CSS spec,
+        # but they're included here for compatibility
+        # with some proprietary MS properties
+        str {ss if tok(/[\/,:.=]/)}
+      end
+
+      def unary_operator
+        tok(/[+-]/)
+      end
+
+      def property
+        return unless e = (tok(IDENT) || interpolation)
+        res = [e, str{ss}]
+
+        while e = (interpolation || tok(IDENT))
+          res << e
+        end
+
+        ss
+        res
+      end
+
+      def ruleset
+        rules = []
+        return unless v = selector
+        rules.concat v
+
+        while tok(/,/)
+          rules << ',' << str {ss}
+          rules.concat expr!(:selector)
+        end
+
+        block(node(Sass::Tree::RuleNode.new(rules.flatten.compact)), :ruleset)
+      end
+
+      def block(node, context)
+        node.has_children = true
+        tok!(/\{/)
+        block_contents(node, context)
+        tok!(/\}/)
+        node
+      end
+
+      # A block may contain declarations and/or rulesets
+      def block_contents(node, context)
+        block_given? ? yield : ss_comments(node)
+        node << (child = block_child(context))
+        while tok(/;/) || (child && child.has_children)
+          block_given? ? yield : ss_comments(node)
+          node << (child = block_child(context))
+        end
+        node
+      end
+
+      def block_child(context)
+        variable || directive || declaration_or_ruleset
+      end
+
+      # This is a nasty hack, and the only place in the parser
+      # that requires backtracking.
+      # The reason is that we can't figure out if certain strings
+      # are declarations or rulesets with fixed finite lookahead.
+      # For example, "foo:bar baz baz baz..." could be either a property
+      # or a selector.
+      #
+      # To handle this, we simply check if it works as a property
+      # (which is the most common case)
+      # and, if it doesn't, try it as a ruleset.
+      #
+      # We could eke some more efficiency out of this
+      # by handling some easy cases (first token isn't an identifier,
+      # no colon after the identifier, whitespace after the colon),
+      # but I'm not sure the gains would be worth the added complexity.
+      def declaration_or_ruleset
+        pos = @scanner.pos
+        line = @line
+        old_use_property_exception, @use_property_exception =
+          @use_property_exception, false
+        begin
+          decl = declaration
+          # We want an exception if it's not there,
+          # but we don't want to consume if it is
+          tok!(/[;}]/) unless tok?(/[;}]/)
+          return decl
+        rescue Sass::SyntaxError => decl_err
+        end
+
+        @line = line
+        @scanner.pos = pos
+
+        begin
+          return ruleset
+        rescue Sass::SyntaxError => ruleset_err
+          raise @use_property_exception ? decl_err : ruleset_err
+        end
+      ensure
+        @use_property_exception = old_use_property_exception
+      end
+
+      def selector
+        # The combinator here allows the "> E" hack
+        return unless (comb = combinator) || (seq = simple_selector_sequence)
+        res = [comb] + (seq || [])
+
+        while v = combinator
+          res << v
+          res.concat(simple_selector_sequence || [])
+        end
+        res
+      end
+
+      def combinator
+        tok(PLUS) || tok(GREATER) || tok(TILDE) || str?{whitespace}
+      end
+
+      def simple_selector_sequence
+        # This allows for stuff like http://www.w3.org/TR/css3-animations/#keyframes-
+        return expr unless e = element_name || tok(HASH) || class_expr ||
+          attrib || negation || pseudo || parent_selector || interpolation
+        res = [e]
+
+        # The tok(/\*/) allows the "E*" hack
+        while v = element_name || tok(HASH) || class_expr ||
+            attrib || negation || pseudo || tok(/\*/) || interpolation
+          res << v
+        end
+        res
+      end
+
+      def parent_selector
+        tok(/&/)
+      end
+
+      def class_expr
+        return unless tok(/\./)
+        '.' + tok!(IDENT)
+      end
+
+      def element_name
+        return unless name = tok(IDENT) || tok(/\*/) || tok?(/\|/)
+        if tok(/\|/)
+          @expected = "element name or *"
+          name << "|" << (tok(IDENT) || tok!(/\*/))
+        end
+        name
+      end
+
+      def attrib
+        return unless tok(/\[/)
+        res = ['[', str{ss}, str{attrib_name!}, str{ss}]
+
+        if m = tok(/=/) ||
+            tok(INCLUDES) ||
+            tok(DASHMATCH) ||
+            tok(PREFIXMATCH) ||
+            tok(SUFFIXMATCH) ||
+            tok(SUBSTRINGMATCH)
+          @expected = "identifier or string"
+          res << m << str{ss} << (tok(IDENT) || expr!(:interp_string)) << str{ss}
+        end
+        res << tok!(/\]/)
+      end
+
+      def attrib_name!
+        if tok(IDENT)
+          # E, E|E, or E|
+          # The last is allowed so that E|="foo" will work
+          tok(IDENT) if tok(/\|/)
+        elsif tok(/\*/)
+          # *|E
+          tok!(/\|/)
+          tok! IDENT
+        else
+          # |E or E
+          tok(/\|/)
+          tok! IDENT
+        end
+      end
+
+      def pseudo
+        return unless s = tok(/::?/)
+
+        @expected = "pseudoclass or pseudoelement"
+        [s, functional_pseudo || tok!(IDENT)]
+      end
+
+      def functional_pseudo
+        return unless fn = tok(FUNCTION)
+        [fn, str{ss}, expr!(:pseudo_expr), tok!(/\)/)]
+      end
+
+      def pseudo_expr
+        return unless e = tok(PLUS) || tok(/-/) || tok(NUMBER) ||
+          interp_string || tok(IDENT) || interpolation
+        res = [e, str{ss}]
+        while e = tok(PLUS) || tok(/-/) || tok(NUMBER) ||
+            interp_string || tok(IDENT) || interpolation
+          res << e << str{ss}
+        end
+        res
+      end
+
+      def negation
+        return unless tok(NOT)
+        res = [":not(", str{ss}]
+        @expected = "selector"
+        res << (element_name || tok(HASH) || class_expr || attrib || expr!(:pseudo))
+        res << tok!(/\)/)
+      end
+
+      def declaration
+        # This allows the "*prop: val", ":prop: val", and ".prop: val" hacks
+        if s = tok(/[:\*\.]/)
+          @use_property_exception = s != '.'
+          name = [s, str{ss}] + expr!(:property)
+        else
+          return unless name = property
+        end
+
+        @expected = expected_property_separator
+        space, value = expr!(:value)
+        ss
+        require_block = tok?(/\{/)
+
+        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, :new))
+
+        return node unless require_block
+        nested_properties! node, space
+      end
+
+      def expected_property_separator
+        '":" or "="'
+      end
+
+      def value
+        return unless tok(/:/)
+        space = !str {ss}.empty?
+        @use_property_exception ||= space || !tok?(IDENT)
+
+        return true, Sass::Script::String.new("") if tok?(/\{/)
+        return space, sass_script(:parse)
+      end
+
+      def plain_value
+        return unless tok(/:/)
+        space = !str {ss}.empty?
+        @use_property_exception ||= space || !tok?(IDENT)
+
+        expression = expr
+        expression << tok(IMPORTANT) if expression
+        # expression, space, value
+        return expression, space, expression || [""]
+      end
+
+      def nested_properties!(node, space)
+        raise Sass::SyntaxError.new(<<MESSAGE, :line => @line) unless space
+Invalid CSS: a space is required between a property and its definition
+when it has other properties nested beneath it.
+MESSAGE
+
+        @use_property_exception = true
+        @expected = 'expression (e.g. 1px, bold) or "{"'
+        block(node, :property)
+      end
+
+      def expr
+        return unless t = term
+        res = [t, str{ss}]
+
+        while (o = operator) && (t = term)
+          res << o << t << str{ss}
+        end
+
+        res
+      end
+
+      def term
+        unless e = tok(NUMBER) ||
+            tok(URI) ||
+            function ||
+            interp_string ||
+            tok(UNICODERANGE) ||
+            tok(IDENT) ||
+            tok(HEXCOLOR) ||
+            interpolation
+
+          return unless op = unary_operator
+          @expected = "number or function"
+          return [op, tok(NUMBER) || expr!(:function)]
+        end
+        e
+      end
+
+      def function
+        return unless name = tok(FUNCTION)
+        if name == "expression(" || name == "calc("
+          str, _ = Haml::Shared.balance(@scanner, ?(, ?), 1)
+          [name, str]
+        else
+          [name, str{ss}, expr, tok!(/\)/)]
+        end
+      end
+
+      def interpolation
+        return unless tok(/#\{/)
+        sass_script(:parse_interpolated)
+      end
+
+      def interp_string
+        _interp_string(:double) || _interp_string(:single)
+      end
+
+      def _interp_string(type)
+        return unless start = tok(Sass::Script::Lexer::STRING_REGULAR_EXPRESSIONS[[type, false]])
+        res = [start]
+
+        mid_re = Sass::Script::Lexer::STRING_REGULAR_EXPRESSIONS[[type, true]]
+        # @scanner[2].empty? means we've started an interpolated section
+        res << expr!(:interpolation) << tok(mid_re) while @scanner[2].empty?
+        res
+      end
+
+      def str
+        @strs.push ""
+        yield
+        @strs.last
+      ensure
+        @strs.pop
+      end
+
+      def str?
+        @strs.push ""
+        yield && @strs.last
+      ensure
+        @strs.pop
+      end
+
+      def node(node)
+        node.line = @line
+        node
+      end
+
+      @sass_script_parser = Class.new(Sass::Script::Parser)
+      @sass_script_parser.send(:include, ScriptParser)
+      # @private
+      def self.sass_script_parser; @sass_script_parser; end
+
+      def sass_script(*args)
+        parser = self.class.sass_script_parser.new(@scanner, @line,
+          @scanner.pos - (@scanner.string[0...@scanner.pos].rindex("\n") || 0))
+        result = parser.send(*args)
+        @line = parser.line
+        result
+      end
+
+      EXPR_NAMES = {
+        :media_query => "media query (e.g. print, screen, print and screen)",
+        :media_expr => "media expression (e.g. (min-device-width: 800px)))",
+        :pseudo_expr => "expression (e.g. fr, 2n+1)",
+        :expr => "expression (e.g. 1px, bold)",
+      }
+
+      TOK_NAMES = Haml::Util.to_hash(
+        Sass::SCSS::RX.constants.map {|c| [Sass::SCSS::RX.const_get(c), c.downcase]}).
+        merge(IDENT => "identifier", /[;}]/ => '";"', /[=:]/ => '":"')
+
+      def tok?(rx)
+        @scanner.match?(rx)
+      end
+
+      def expr!(name)
+        (e = send(name)) && (return e)
+        expected(EXPR_NAMES[name] || name.to_s)
+      end
+
+      def tok!(rx)
+        (t = tok(rx)) && (return t)
+        name = TOK_NAMES[rx]
+
+        unless name
+          # Display basic regexps as plain old strings
+          string = rx.source.gsub(/\\(.)/, '\1')
+          name = rx.source == Regexp.escape(string) ? string.inspect : rx.inspect
+        end
+
+        expected(name)
+      end
+
+      def expected(name)
+        self.class.expected(@scanner, @expected || name, @line)
+      end
+
+      # @private
+      def self.expected(scanner, expected, line)
+        pos = scanner.pos
+
+        after = scanner.string[0...pos]
+        # Get rid of whitespace between pos and the last token,
+        # but only if there's a newline in there
+        after.gsub!(/\s*\n\s*$/, '')
+        # Also get rid of stuff before the last newline
+        after.gsub!(/.*\n/, '')
+        after = "..." + after[-15..-1] if after.size > 18
+
+        was = scanner.rest.dup
+        # Get rid of whitespace between pos and the next token,
+        # but only if there's a newline in there
+        was.gsub!(/^\s*\n\s*/, '')
+        # Also get rid of stuff after the next newline
+        was.gsub!(/\n.*/, '')
+        was = was[0...15] + "..." if was.size > 18
+
+        raise Sass::SyntaxError.new(
+          "Invalid CSS after \"#{after}\": expected #{expected}, was \"#{was}\"",
+          :line => line)
+      end
+
+      def tok(rx)
+        res = @scanner.scan(rx)
+        if res
+          @line += res.count("\n")
+          @expected = nil
+          if !@strs.empty? && rx != COMMENT && rx != SINGLE_LINE_COMMENT
+            @strs.each {|s| s << res}
+          end
+        end
+
+        res
+      end
+    end
+  end
+end