radiantcms-couchrest_model 0.1.3 → 0.1.4

data/vendor/plugins/haml/lib/sass/script/node.rb

@@ -3,110 +3,12 @@ module Sass::Script
   #
   # Use \{#perform} to evaluate a parse tree.
   class Node
-    # The options hash for this node.
-    #
-    # @return [{Symbol => Object}]
-    attr_reader :options
-
-    # The context in which this node was parsed,
-    # which determines how some operations are performed.
-    #
-    # Can be `:equals`, which means it's part of a `$var = val` or `prop = val` assignment,
-    # or `:default`, which means it's anywhere else
-    # (including `$var: val` and `prop: val` assignments,
-    # `#{}`-interpolations,
-    # and other script contexts such as `@if` conditions).
-    #
-    # @return [Symbol]
-    attr_reader :context
-
-    # The line of the document on which this node appeared.
-    #
-    # @return [Fixnum]
-    attr_accessor :line
-
-    # Sets the options hash for this node,
-    # as well as for all child nodes.
-    # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
-    #
-    # @param options [{Symbol => Object}] The options
-    def options=(options)
-      @options = options
-      children.each {|c| c.options = options}
-    end
-
-    # Sets the context for this node,
-    # as well as for all child nodes.
-    #
-    # @param context [Symbol]
-    # @see #context
-    def context=(context)
-      @context = context
-      children.each {|c| c.context = context}
-    end
-
-    # Creates a new script node.
-    def initialize
-      @context = :default
-    end
-
     # Evaluates the node.
     #
-    # \{#perform} shouldn't be overridden directly;
-    # instead, override \{#\_perform}.
-    #
     # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
     # @return [Literal] The SassScript object that is the value of the SassScript
     def perform(environment)
-      _perform(environment)
-    rescue Sass::SyntaxError => e
-      e.modify_backtrace(:line => line)
-      raise e
-    end
-
-    # Returns all child nodes of this node.
-    #
-    # @return [Array<Node>]
-    def children
-      raise NotImplementedError.new("All subclasses of Sass::Script::Node must override #children.")
-    end
-
-    # Returns the text of this SassScript expression.
-    #
-    # @return [String]
-    def to_sass(opts = {})
-      raise NotImplementedError.new("All subclasses of Sass::Script::Node must override #to_sass.")
-    end
-
-    protected
-
-    # Converts underscores to dashes if the :dasherize option is set.
-    def dasherize(s, opts)
-      if opts[:dasherize]
-        s.gsub(/_/,'-')
-      else
-        s
-      end
-    end
-
-    # Evaluates this node.
-    # Note that all {Literal} objects created within this method
-    # should have their \{#options} attribute set, probably via \{#opts}.
-    #
-    # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
-    # @return [Literal] The SassScript object that is the value of the SassScript
-    # @see #perform
-    def _perform(environment)
-      raise NotImplementedError.new("All subclasses of Sass::Script::Node must override #_perform.")
-    end
-
-    # Sets the \{#options} field on the given literal and returns it
-    #
-    # @param literal [Literal]
-    # @return [Literal]
-    def opts(literal)
-      literal.options = options
-      literal
+      raise NotImplementedError.new("All subclasses of Sass::Script::Node must override #perform.")
     end
   end
 end

data/vendor/plugins/haml/lib/sass/script/number.rb

@@ -25,20 +25,9 @@ module Sass::Script
     # @return [Array<String>]
     attr_reader :denominator_units
 
-    # The original representation of this number.
-    # For example, although the result of `1px/2px` is `0.5`,
-    # the value of `#original` is `"1px/2px"`.
-    #
-    # This is only non-nil when the original value should be used as the CSS value,
-    # as in `font: 1px/2px`.
-    #
-    # @return [Boolean, nil]
-    attr_accessor :original
-
     # The precision with which numbers will be printed to CSS files.
     # For example, if this is `1000.0`,
     # `3.1415926` will be printed as `3.142`.
-    # @api public
     PRECISION = 1000.0
 
     # @param value [Numeric] The value of the number
@@ -76,7 +65,7 @@ module Sass::Script
       end
     end
 
-    # The SassScript binary `-` operation (e.g. `$a - $b`).
+    # The SassScript binary `-` operation (e.g. `!a - !b`).
     # Its functionality depends on the type of its argument:
     #
     # {Number}
@@ -96,14 +85,7 @@ module Sass::Script
       end
     end
 
-    # The SassScript unary `+` operation (e.g. `+$a`).
-    #
-    # @return [Number] The value of this number
-    def unary_plus
-      self
-    end
-
-    # The SassScript unary `-` operation (e.g. `-$a`).
+    # The SassScript unary `-` operation (e.g. `-!a`).
     #
     # @return [Number] The negative value of this number
     def unary_minus
@@ -145,11 +127,7 @@ module Sass::Script
     # @return [Literal] The result of the operation
     def div(other)
       if other.is_a? Number
-        res = operate(other, :/)
-        if self.original && other.original && context != :equals
-          res.original = "#{self.original}/#{other.original}"
-        end
-        res
+        operate(other, :/)
       else
         super
       end
@@ -236,7 +214,6 @@ module Sass::Script
     # @raise [Sass::SyntaxError] if this number has units that can't be used in CSS
     #   (e.g. `px*in`)
     def to_s
-      return original if original
       raise Sass::SyntaxError.new("#{inspect} isn't a valid CSS value.") unless legal_units?
       inspect
     end
@@ -247,10 +224,17 @@ module Sass::Script
     # as long as there is only one unit.
     #
     # @return [String] The representation
-    def inspect(opts = {})
-      "#{self.class.round(self.value)}#{unit_str}"
+    def inspect
+      value =
+        if self.value.is_a?(Float) && (self.value.infinite? || self.value.nan?)
+          self.value
+        elsif int?
+          self.value.to_i
+        else
+          (self.value * PRECISION).round / PRECISION
+        end
+      "#{value}#{unit_str}"
     end
-    alias_method :to_sass, :inspect
 
     # @return [Fixnum] The integer value of the number
     # @raise [Sass::SyntaxError] if the number isn't an integer
@@ -300,43 +284,8 @@ module Sass::Script
                  end, num_units, den_units)
     end
 
-    # @param other [Number] A number to decide if it can be compared with this number.
-    # @return [Boolean] Whether or not this number can be compared with the other.
-    def comparable_to?(other)
-      begin
-        operate(other, :+)
-        true
-      rescue Sass::UnitConversionError
-        false
-      end
-    end
-
-    # Returns a human readable representation of the units in this number.
-    # For complex units this takes the form of:
-    # numerator_unit1 * numerator_unit2 / denominator_unit1 * denominator_unit2
-    # @return [String] a string that represents the units in this number
-    def unit_str
-      rv = numerator_units.sort.join("*")
-      if denominator_units.any?
-        rv << "/"
-        rv << denominator_units.sort.join("*")
-      end
-      rv
-    end
-
     private
 
-    # @private
-    def self.round(num)
-      if num.is_a?(Float) && (num.infinite? || num.nan?)
-        num
-      elsif num % 1 == 0.0
-        num.to_i
-      else
-        (num * PRECISION).round / PRECISION
-      end
-    end
-
     def operate(other, operation)
       this = self
       if [:+, :-, :<=, :<, :>, :>=].include?(operation)
@@ -379,6 +328,15 @@ module Sass::Script
       end
     end
 
+    def unit_str
+      rv = numerator_units.join("*")
+      if denominator_units.any?
+        rv << "/"
+        rv << denominator_units.join("*")
+      end
+      rv
+    end
+
     def normalize!
       return if unitless?
       @numerator_units, @denominator_units = sans_common_units(numerator_units, denominator_units)
@@ -393,7 +351,9 @@ module Sass::Script
     end
 
     # A hash of unit names to their index in the conversion table
+    # @private
     CONVERTABLE_UNITS = {"in" => 0,        "cm" => 1,    "pc" => 2,    "mm" => 3,   "pt" => 4}
+    # @private
     CONVERSION_TABLE = [[ 1,                2.54,         6,            25.4,        72        ], # in
                         [ nil,              1,            2.36220473,   10,          28.3464567], # cm
                         [ nil,              nil,          1,            4.23333333,  12        ], # pc

data/vendor/plugins/haml/lib/sass/script/operation.rb

@@ -4,17 +4,11 @@ require 'sass/script/number'
 require 'sass/script/color'
 require 'sass/script/functions'
 require 'sass/script/unary_operation'
-require 'sass/script/interpolation'
-require 'sass/script/string_interpolation'
 
 module Sass::Script
   # A SassScript parse node representing a binary operation,
-  # such as `$a + $b` or `"foo" + 1`.
+  # such as `!a + !b` or `"foo" + 1`.
   class Operation < Node
-    attr_reader :operand1
-    attr_reader :operand2
-    attr_reader :operator
-
     # @param operand1 [Script::Node] The parse-tree node
     #   for the right-hand side of the operator
     # @param operand2 [Script::Node] The parse-tree node
@@ -25,7 +19,6 @@ module Sass::Script
       @operand1 = operand1
       @operand2 = operand2
       @operator = operator
-      super()
     end
 
     # @return [String] A human-readable s-expression representation of the operation
@@ -33,63 +26,20 @@ module Sass::Script
       "(#{@operator.inspect} #{@operand1.inspect} #{@operand2.inspect})"
     end
 
-    # @see Node#to_sass
-    def to_sass(opts = {})
-      pred = Sass::Script::Parser.precedence_of(@operator)
-      o1 = operand_to_sass @operand1, :left, opts
-      o2 = operand_to_sass @operand2, :right, opts
-      sep =
-        case @operator
-        when :comma; ", "
-        when :concat; " "
-        else; " #{Lexer::OPERATORS_REVERSE[@operator]} "
-        end
-      "#{o1}#{sep}#{o2}"
-    end
-
-    # Returns the operands for this operation.
-    #
-    # @return [Array<Node>]
-    # @see Node#children
-    def children
-      [@operand1, @operand2]
-    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 operands
-    def _perform(environment)
+    def perform(environment)
       literal1 = @operand1.perform(environment)
       literal2 = @operand2.perform(environment)
-
-      if @operator == :concat && context == :equals
-        literal1 = Sass::Script::String.new(literal1.value) if literal1.is_a?(Sass::Script::String)
-        literal2 = Sass::Script::String.new(literal2.value) if literal2.is_a?(Sass::Script::String)
-      end
-
       begin
-        opts(literal1.send(@operator, literal2))
+        literal1.send(@operator, literal2)
       rescue NoMethodError => e
         raise e unless e.name.to_s == @operator.to_s
         raise Sass::SyntaxError.new("Undefined operation: \"#{literal1} #{@operator} #{literal2}\".")
       end
     end
-
-    private
-
-    def operand_to_sass(op, side, opts)
-      return op.to_sass(opts) unless op.is_a?(Operation)
-
-      pred = Sass::Script::Parser.precedence_of(@operator)
-      sub_pred = Sass::Script::Parser.precedence_of(op.operator)
-      assoc = Sass::Script::Parser.associative?(@operator)
-      return "(#{op.to_sass(opts)})" if sub_pred < pred ||
-        (side == :right && sub_pred == pred && !assoc)
-      op.to_sass(opts)
-    end
   end
 end

data/vendor/plugins/haml/lib/sass/script/parser.rb

@@ -5,23 +5,16 @@ module Sass
     # The parser for SassScript.
     # It parses a string of code into a tree of {Script::Node}s.
     class Parser
-      # The line number of the parser's current position.
-      #
-      # @return [Fixnum]
-      def line
-        @lexer.line
-      end
-
       # @param str [String, StringScanner] The source text to parse
       # @param line [Fixnum] The line on which the SassScript appears.
       #   Used for error reporting
       # @param offset [Fixnum] The number of characters in on which the SassScript appears.
       #   Used for error reporting
-      # @param options [{Symbol => Object}] An options hash;
-      #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
-      def initialize(str, line, offset, options = {})
-        @options = options
-        @lexer = lexer_class.new(str, line, offset, options)
+      # @param filename [String] The name of the file in which the SassScript appears.
+      #   Used for error reporting
+      def initialize(str, line, offset, filename = nil)
+        @filename = filename
+        @lexer = Lexer.new(str, line, offset, filename)
       end
 
       # Parses a SassScript expression within an interpolated segment (`#{}`).
@@ -34,11 +27,7 @@ module Sass
       def parse_interpolated
         expr = assert_expr :expr
         assert_tok :end_interpolation
-        expr.options = @options
         expr
-      rescue Sass::SyntaxError => e
-        e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
-        raise e
       end
 
       # Parses a SassScript expression.
@@ -48,28 +37,7 @@ module Sass
       def parse
         expr = assert_expr :expr
         assert_done
-        expr.options = @options
-        expr
-      rescue Sass::SyntaxError => e
-        e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
-        raise e
-      end
-
-      # Parses a SassScript expression,
-      # ending it when it encounters one of the given identifier tokens.
-      #
-      # @param [#include?(String)] A set of strings that delimit the expression.
-      # @return [Script::Node] The root node of the parse tree
-      # @raise [Sass::SyntaxError] if the expression isn't valid SassScript
-      def parse_until(tokens)
-        @stop_at = tokens
-        expr = assert_expr :expr
-        assert_done
-        expr.options = @options
         expr
-      rescue Sass::SyntaxError => e
-        e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
-        raise e
       end
 
       # Parses the argument list for a mixin include.
@@ -85,11 +53,7 @@ module Sass
         end
         assert_done
 
-        args.each {|a| a.options = @options}
         args
-      rescue Sass::SyntaxError => e
-        e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
-        raise e
       end
 
       # Parses the argument list for a mixin definition.
@@ -97,17 +61,15 @@ module Sass
       # @return [Array<Script::Node>] The root nodes of the arguments.
       # @raise [Sass::SyntaxError] if the argument list isn't valid SassScript
       def parse_mixin_definition_arglist
-        args = defn_arglist!(false)
-        assert_done
+        args = []
 
-        args.each do |k, v|
-          k.options = @options
-          v.options = @options if v
+        if try_tok(:lparen)
+          args = defn_arglist(false) || args
+          assert_tok(:rparen)
         end
+        assert_done
+
         args
-      rescue Sass::SyntaxError => e
-        e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
-        raise e
       end
 
       # Parses a SassScript expression.
@@ -120,36 +82,7 @@ module Sass
         new(*args).parse
       end
 
-      PRECEDENCE = [
-        :comma, :single_eq, :concat, :or, :and,
-        [:eq, :neq],
-        [:gt, :gte, :lt, :lte],
-        [:plus, :minus],
-        [:times, :div, :mod],
-      ]
-
-      ASSOCIATIVE = [:comma, :concat, :plus, :times]
-
       class << self
-        # Returns an integer representing the precedence
-        # of the given operator.
-        # A lower integer indicates a looser binding.
-        #
-        # @private
-        def precedence_of(op)
-          PRECEDENCE.each_with_index do |e, i|
-            return i if Array(e).include?(op)
-          end
-          raise "[BUG] Unknown operator #{op}"
-        end
-
-        # Returns whether or not the given operation is associative.
-        #
-        # @private
-        def associative?(op)
-          ASSOCIATIVE.include?(op)
-        end
-
         private
 
         # Defines a simple left-associative production.
@@ -159,13 +92,9 @@ module Sass
         def production(name, sub, *ops)
           class_eval <<RUBY
             def #{name}
-              interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect}) and return interp
               return unless e = #{sub}
               while tok = try_tok(#{ops.map {|o| o.inspect}.join(', ')})
-                interp = try_op_before_interp(tok, e) and return interp
-                line = @lexer.line
                 e = Operation.new(e, assert_expr(#{sub.inspect}), tok.type)
-                e.line = line
               end
               e
             end
@@ -175,12 +104,8 @@ RUBY
         def unary(op, sub)
           class_eval <<RUBY
             def unary_#{op}
-              return #{sub} unless tok = try_tok(:#{op})
-              interp = try_op_before_interp(tok) and return interp
-              line = @lexer.line 
-              op = UnaryOperation.new(assert_expr(:unary_#{op}), :#{op})
-              op.line = line
-              op
+              return #{sub} unless try_tok(:#{op})
+              UnaryOperation.new(assert_expr(:unary_#{op}), :#{op})
             end
 RUBY
         end
@@ -188,52 +113,12 @@ RUBY
 
       private
 
-      # @private
-      def lexer_class; Lexer; end
-
-      production :expr, :interpolation, :comma
-      production :equals, :interpolation, :single_eq
-
-      def try_op_before_interp(op, prev = nil)
-        return unless @lexer.peek && @lexer.peek.type == :begin_interpolation
-        wb = @lexer.whitespace?(op)
-        str = Script::String.new(Lexer::OPERATORS_REVERSE[op.type])
-        str.line = @lexer.line
-        interp = Script::Interpolation.new(prev, str, nil, wb, !:wa, :originally_text)
-        interp.line = @lexer.line
-        interpolation(interp)
-      end
-
-      def try_ops_after_interp(ops, name)
-        return unless @lexer.after_interpolation?
-        return unless op = try_tok(*ops)
-        interp = try_op_before_interp(op) and return interp
-
-        wa = @lexer.whitespace?
-        str = Script::String.new(Lexer::OPERATORS_REVERSE[op.type])
-        str.line = @lexer.line
-        interp = Script::Interpolation.new(nil, str, assert_expr(name), !:wb, wa, :originally_text)
-        interp.line = @lexer.line
-        return interp
-      end
-
-      def interpolation(first = concat)
-        e = first
-        while interp = try_tok(:begin_interpolation)
-          wb = @lexer.whitespace?(interp)
-          line = @lexer.line
-          mid = parse_interpolated
-          wa = @lexer.whitespace?
-          e = Script::Interpolation.new(e, mid, concat, wb, wa)
-          e.line = line
-        end
-        e
-      end
+      production :expr, :concat, :comma
 
       def concat
         return unless e = or_expr
         while sub = or_expr
-          e = node(Operation.new(e, sub, :concat))
+          e = Operation.new(e, sub, :concat)
         end
         e
       end
@@ -243,143 +128,84 @@ RUBY
       production :eq_or_neq, :relational, :eq, :neq
       production :relational, :plus_or_minus, :gt, :gte, :lt, :lte
       production :plus_or_minus, :times_div_or_mod, :plus, :minus
-      production :times_div_or_mod, :unary_plus, :times, :div, :mod
+      production :times_div_or_mod, :unary_minus, :times, :div, :mod
 
-      unary :plus, :unary_minus
       unary :minus, :unary_div
       unary :div, :unary_not # For strings, so /foo/bar works
-      unary :not, :ident
-
-      def ident
-        return funcall unless @lexer.peek && @lexer.peek.type == :ident
-        return if @stop_at && @stop_at.include?(@lexer.peek.value)
-
-        name = @lexer.next
-        if color = Color::HTML4_COLORS[name.value.downcase]
-          return node(Color.new(color))
-        end
-        node(Script::String.new(name.value, :identifier))
-      end
+      unary :not, :funcall
 
       def funcall
-        return raw unless tok = try_tok(:funcall)
-        args = fn_arglist || []
-        assert_tok(:rparen)
-        node(Script::Funcall.new(tok.value, args))
+        return paren unless name = try_tok(:ident)
+        # An identifier without arguments is just a string
+        unless try_tok(:lparen)
+          warn(<<END)
+DEPRECATION WARNING:
+On line #{name.line}, character #{name.offset}#{" of '#{@filename}'" if @filename}
+Implicit strings have been deprecated and will be removed in version 3.0.
+'#{name.value}' was not quoted. Please add double quotes (e.g. "#{name.value}").
+END
+          Script::String.new(name.value)
+        else
+          args = arglist || []
+          assert_tok(:rparen)
+          Script::Funcall.new(name.value, args)
+        end
       end
 
-      def defn_arglist!(must_have_default)
-        return [] unless try_tok(:lparen)
-        return [] if try_tok(:rparen)
-        res = []
-        loop do
-          line = @lexer.line
-          offset = @lexer.offset + 1
-          c = assert_tok(:const)
-          var = Script::Variable.new(c.value)
-          if tok = (try_tok(:colon) || try_tok(:single_eq))
-            val = assert_expr(:concat)
-
-            if tok.type == :single_eq
-              val.context = :equals
-              val.options = @options
-              Script.equals_warning("mixin argument defaults", "$#{c.value}",
-                val.to_sass, false, line, offset, @options[:filename])
-            end
-            must_have_default = true
-          elsif must_have_default
-            raise SyntaxError.new("Required argument #{var.inspect} must come before any optional arguments.")
-          end
-          res << [var, val]
-          break unless try_tok(:comma)
+      def defn_arglist(must_have_default)
+        return unless c = try_tok(:const)
+        var = Script::Variable.new(c.value)
+        if try_tok(:single_eq)
+          val = assert_expr(:concat)
+        elsif must_have_default
+          raise SyntaxError.new("Required argument #{var.inspect} must come before any optional arguments.", @line)
         end
-        assert_tok(:rparen)
-        res
-      end
 
-      def fn_arglist
-        return unless e = equals
-        return [e] unless try_tok(:comma)
-        [e, *assert_expr(:fn_arglist)]
+        return [[var, val]] unless try_tok(:comma)
+        [[var, val], *defn_arglist(val)]
       end
 
       def arglist
-        return unless e = interpolation
+        return unless e = concat
         return [e] unless try_tok(:comma)
-        [e, *assert_expr(:arglist)]
-      end
-
-      def raw
-        return special_fun unless tok = try_tok(:raw)
-        node(Script::String.new(tok.value))
-      end
-
-      def special_fun
-        return paren unless tok = try_tok(:special_fun)
-        first = node(Script::String.new(tok.value.first))
-        Haml::Util.enum_slice(tok.value[1..-1], 2).inject(first) do |l, (i, r)|
-          Script::Interpolation.new(
-            l, i, r && node(Script::String.new(r)),
-            false, false)
-        end
+        [e, *arglist]
       end
 
       def paren
         return variable unless try_tok(:lparen)
-        was_in_parens = @in_parens
-        @in_parens = true
         e = assert_expr(:expr)
         assert_tok(:rparen)
         return e
-      ensure
-        @in_parens = was_in_parens
       end
 
       def variable
         return string unless c = try_tok(:const)
-        node(Variable.new(*c.value))
+        Variable.new(c.value)
       end
 
       def string
-        return number unless first = try_tok(:string)
+        return literal unless first = try_tok(:string)
         return first.value unless try_tok(:begin_interpolation)
-        line = @lexer.line
         mid = parse_interpolated
         last = assert_expr(:string)
-        interp = StringInterpolation.new(first.value, mid, last)
-        interp.line = line
-        interp
-      end
-
-      def number
-        return literal unless tok = try_tok(:number)
-        num = tok.value
-        num.original = num.to_s unless @in_parens
-        num
+        Operation.new(first.value, Operation.new(mid, last, :plus), :plus)
       end
 
       def literal
-        (t = try_tok(:color, :bool)) && (return t.value)
+        (t = try_tok(:number, :color, :bool)) && (return t.value)
       end
 
       # It would be possible to have unified #assert and #try methods,
       # but detecting the method/token difference turns out to be quite expensive.
 
-      EXPR_NAMES = {
-        :string => "string",
-        :default => "expression (e.g. 1px, bold)",
-        :arglist => "mixin argument",
-        :fn_arglist => "function argument",
-      }
-
       def assert_expr(name)
         (e = send(name)) && (return e)
-        @lexer.expected!(EXPR_NAMES[name] || EXPR_NAMES[:default])
+        raise Sass::SyntaxError.new("Expected expression, was #{@lexer.done? ? 'end of text' : "#{@lexer.peek.type} token"}.")
       end
 
       def assert_tok(*names)
         (t = try_tok(*names)) && (return t)
-        @lexer.expected!(names.map {|tok| Lexer::TOKEN_NAMES[tok] || tok}.join(" or "))
+        raise Sass::SyntaxError.new("Expected #{names.join(' or ')} token, was #{@lexer.done? ? 'end of text' : "#{@lexer.peek.type} token"}.")
       end
 
       def try_tok(*names)
@@ -389,12 +215,7 @@ RUBY
 
       def assert_done
         return if @lexer.done?
-        @lexer.expected!(EXPR_NAMES[:default])
-      end
-
-      def node(node)
-        node.line = @lexer.line
-        node
+        raise Sass::SyntaxError.new("Unexpected #{@lexer.peek.type} token.")
       end
     end
   end