oreorenasass 3.4.4 → 3.4.5

data/lib/sass/script/{tree/operation.rb → operation.rb}

@@ -1,4 +1,13 @@
-module Sass::Script::Tree
+require 'set'
+require 'sass/script/string'
+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`.
   class Operation < Node
@@ -6,12 +15,12 @@ module Sass::Script::Tree
     attr_reader :operand2
     attr_reader :operator
 
-    # @param operand1 [Sass::Script::Tree::Node] The parse-tree node
+    # @param operand1 [Script::Node] The parse-tree node
     #   for the right-hand side of the operator
-    # @param operand2 [Sass::Script::Tree::Node] The parse-tree node
+    # @param operand2 [Script::Node] The parse-tree node
     #   for the left-hand side of the operator
     # @param operator [Symbol] The operator to perform.
-    #   This should be one of the binary operator names in {Sass::Script::Lexer::OPERATORS}
+    #   This should be one of the binary operator names in {Lexer::OPERATORS}
     def initialize(operand1, operand2, operator)
       @operand1 = operand1
       @operand2 = operand2
@@ -32,7 +41,7 @@ module Sass::Script::Tree
         case @operator
         when :comma; ", "
         when :space; " "
-        else; " #{Sass::Script::Lexer::OPERATORS_REVERSE[@operator]} "
+        else; " #{Lexer::OPERATORS_REVERSE[@operator]} "
         end
       "#{o1}#{sep}#{o2}"
     end
@@ -58,38 +67,36 @@ module Sass::Script::Tree
     # Evaluates the operation.
     #
     # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
-    # @return [Sass::Script::Value] The SassScript object that is the value of the operation
+    # @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)
-      value1 = @operand1.perform(environment)
+      literal1 = @operand1.perform(environment)
 
       # Special-case :and and :or to support short-circuiting.
       if @operator == :and
-        return value1.to_bool ? @operand2.perform(environment) : value1
+        return literal1.to_bool ? @operand2.perform(environment) : literal1
       elsif @operator == :or
-        return value1.to_bool ? value1 : @operand2.perform(environment)
+        return literal1.to_bool ? literal1 : @operand2.perform(environment)
       end
 
-      value2 = @operand2.perform(environment)
+      literal2 = @operand2.perform(environment)
 
-      if (value1.is_a?(Sass::Script::Value::Null) || value2.is_a?(Sass::Script::Value::Null)) &&
-          @operator != :eq && @operator != :neq
-        raise Sass::SyntaxError.new(
-          "Invalid null operation: \"#{value1.inspect} #{@operator} #{value2.inspect}\".")
+      if (literal1.is_a?(Null) || literal2.is_a?(Null)) && @operator != :eq && @operator != :neq
+        raise Sass::SyntaxError.new("Invalid null operation: \"#{literal1.inspect} #{@operator} #{literal2.inspect}\".")
       end
 
       begin
-        opts(value1.send(@operator, value2))
+        opts(literal1.send(@operator, literal2))
       rescue NoMethodError => e
         raise e unless e.name.to_s == @operator.to_s
-        raise Sass::SyntaxError.new("Undefined operation: \"#{value1} #{@operator} #{value2}\".")
+        raise Sass::SyntaxError.new("Undefined operation: \"#{literal1} #{@operator} #{literal2}\".")
       end
     end
 
     private
 
     def operand_to_sass(op, side, opts)
-      return "(#{op.to_sass(opts)})" if op.is_a?(Sass::Script::Tree::ListLiteral)
+      return "(#{op.to_sass(opts)})" if op.is_a?(List)
       return op.to_sass(opts) unless op.is_a?(Operation)
 
       pred = Sass::Script::Parser.precedence_of(@operator)

data/lib/sass/script/parser.rb

@@ -3,7 +3,7 @@ require 'sass/script/lexer'
 module Sass
   module Script
     # The parser for SassScript.
-    # It parses a string of code into a tree of {Script::Tree::Node}s.
+    # It parses a string of code into a tree of {Script::Node}s.
     class Parser
       # The line number of the parser's current position.
       #
@@ -12,18 +12,11 @@ module Sass
         @lexer.line
       end
 
-      # The column number of the parser's current position.
-      #
-      # @return [Fixnum]
-      def offset
-        @lexer.offset
-      end
-
       # @param str [String, StringScanner] The source text to parse
       # @param line [Fixnum] The line on which the SassScript appears.
-      #   Used for error reporting and sourcemap building
-      # @param offset [Fixnum] The character (not byte) offset where the script starts in the line.
-      #   Used for error reporting and sourcemap building
+      #   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 = {})
@@ -36,19 +29,13 @@ module Sass
       # which signals the end of an interpolated segment,
       # it returns rather than throwing an error.
       #
-      # @param warn_for_color [Boolean] Whether raw color values passed to
-      #   interoplation should cause a warning.
-      # @return [Script::Tree::Node] The root node of the parse tree
+      # @return [Script::Node] The root node of the parse tree
       # @raise [Sass::SyntaxError] if the expression isn't valid SassScript
-      def parse_interpolated(warn_for_color = false)
-        # Start two characters back to compensate for #{
-        start_pos = Sass::Source::Position.new(line, offset - 2)
+      def parse_interpolated
         expr = assert_expr :expr
         assert_tok :end_interpolation
-        expr = Sass::Script::Tree::Interpolation.new(
-          nil, expr, nil, !:wb, !:wa, !:originally_text, warn_for_color)
         expr.options = @options
-        node(expr, start_pos)
+        expr
       rescue Sass::SyntaxError => e
         e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
         raise e
@@ -56,7 +43,7 @@ module Sass
 
       # Parses a SassScript expression.
       #
-      # @return [Script::Tree::Node] The root node of the parse tree
+      # @return [Script::Node] The root node of the parse tree
       # @raise [Sass::SyntaxError] if the expression isn't valid SassScript
       def parse
         expr = assert_expr :expr
@@ -71,8 +58,8 @@ module Sass
       # Parses a SassScript expression,
       # ending it when it encounters one of the given identifier tokens.
       #
-      # @param tokens [#include?(String)] A set of strings that delimit the expression.
-      # @return [Script::Tree::Node] The root node of the parse tree
+      # @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
@@ -87,17 +74,14 @@ module Sass
 
       # Parses the argument list for a mixin include.
       #
-      # @return [(Array<Script::Tree::Node>,
-      #          {String => Script::Tree::Node},
-      #          Script::Tree::Node,
-      #          Script::Tree::Node)]
+      # @return [(Array<Script::Node>, {String => Script::Node}, Script::Node)]
       #   The root nodes of the positional arguments, keyword arguments, and
-      #   splat argument(s). Keyword arguments are in a hash from names to values.
+      #   splat argument. Keyword arguments are in a hash from names to values.
       # @raise [Sass::SyntaxError] if the argument list isn't valid SassScript
       def parse_mixin_include_arglist
         args, keywords = [], {}
         if try_tok(:lparen)
-          args, keywords, splat, kwarg_splat = mixin_arglist
+          args, keywords, splat = mixin_arglist || [[], {}]
           assert_tok(:rparen)
         end
         assert_done
@@ -105,8 +89,7 @@ module Sass
         args.each {|a| a.options = @options}
         keywords.each {|k, v| v.options = @options}
         splat.options = @options if splat
-        kwarg_splat.options = @options if kwarg_splat
-        return args, keywords, splat, kwarg_splat
+        return args, keywords, splat
       rescue Sass::SyntaxError => e
         e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
         raise e
@@ -114,7 +97,7 @@ module Sass
 
       # Parses the argument list for a mixin definition.
       #
-      # @return [(Array<Script::Tree::Node>, Script::Tree::Node)]
+      # @return [(Array<Script::Node>, Script::Node)]
       #   The root nodes of the arguments, and the splat argument.
       # @raise [Sass::SyntaxError] if the argument list isn't valid SassScript
       def parse_mixin_definition_arglist
@@ -134,7 +117,7 @@ module Sass
 
       # Parses the argument list for a function definition.
       #
-      # @return [(Array<Script::Tree::Node>, Script::Tree::Node)]
+      # @return [(Array<Script::Node>, Script::Node)]
       #   The root nodes of the arguments, and the splat argument.
       # @raise [Sass::SyntaxError] if the argument list isn't valid SassScript
       def parse_function_definition_arglist
@@ -155,7 +138,7 @@ module Sass
       # Parse a single string value, possibly containing interpolation.
       # Doesn't assert that the scanner is finished after parsing.
       #
-      # @return [Script::Tree::Node] The root node of the parse tree.
+      # @return [Script::Node] The root node of the parse tree.
       # @raise [Sass::SyntaxError] if the string isn't valid SassScript
       def parse_string
         unless (peek = @lexer.peek) &&
@@ -176,7 +159,7 @@ module Sass
       # Parses a SassScript expression.
       #
       # @overload parse(str, line, offset, filename = nil)
-      # @return [Script::Tree::Node] The root node of the parse tree
+      # @return [Script::Node] The root node of the parse tree
       # @see Parser#initialize
       # @see Parser#parse
       def self.parse(*args)
@@ -203,7 +186,7 @@ module Sass
           PRECEDENCE.each_with_index do |e, i|
             return i if Array(e).include?(op)
           end
-          raise "[BUG] Unknown operator #{op.inspect}"
+          raise "[BUG] Unknown operator #{op}"
         end
 
         # Returns whether or not the given operation is associative.
@@ -222,18 +205,17 @@ module Sass
         def production(name, sub, *ops)
           class_eval <<RUBY, __FILE__, __LINE__ + 1
             def #{name}
-              interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect})
-              return interp if interp
+              interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect}) and return interp
               return unless e = #{sub}
-              while tok = try_toks(#{ops.map {|o| o.inspect}.join(', ')})
+              while tok = try_tok(#{ops.map {|o| o.inspect}.join(', ')})
                 if interp = try_op_before_interp(tok, e)
-                  other_interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect}, interp)
-                  return interp unless other_interp
+                  return interp unless other_interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect}, interp)
                   return other_interp
                 end
 
-                e = node(Tree::Operation.new(e, assert_expr(#{sub.inspect}), tok.type),
-                         e.source_range.start_pos)
+                line = @lexer.line
+                e = Operation.new(e, assert_expr(#{sub.inspect}), tok.type)
+                e.line = line
               end
               e
             end
@@ -244,10 +226,11 @@ RUBY
           class_eval <<RUBY, __FILE__, __LINE__ + 1
             def unary_#{op}
               return #{sub} unless tok = try_tok(:#{op})
-              interp = try_op_before_interp(tok)
-              return interp if interp
-              start_pos = source_position
-              node(Tree::UnaryOperation.new(assert_expr(:unary_#{op}), :#{op}), start_pos)
+              interp = try_op_before_interp(tok) and return interp
+              line = @lexer.line 
+              op = UnaryOperation.new(assert_expr(:unary_#{op}), :#{op})
+              op.line = line
+              op
             end
 RUBY
         end
@@ -255,61 +238,21 @@ RUBY
 
       private
 
-      def source_position
-        Sass::Source::Position.new(line, offset)
-      end
-
-      def range(start_pos, end_pos = source_position)
-        Sass::Source::Range.new(start_pos, end_pos, @options[:filename], @options[:importer])
-      end
-
       # @private
       def lexer_class; Lexer; end
 
-      def map
-        start_pos = source_position
-        e = interpolation
-        return unless e
-        return list e, start_pos unless @lexer.peek && @lexer.peek.type == :colon
-
-        pair = map_pair(e)
-        map = node(Sass::Script::Tree::MapLiteral.new([pair]), start_pos)
-        while try_tok(:comma)
-          pair = map_pair
-          return map unless pair
-          map.pairs << pair
-        end
-        map
-      end
-
-      def map_pair(key = nil)
-        return unless key ||= interpolation
-        assert_tok :colon
-        return key, assert_expr(:interpolation)
-      end
-
       def expr
-        start_pos = source_position
-        e = interpolation
-        return unless e
-        list e, start_pos
-      end
-
-      def list(first, start_pos)
-        return first unless @lexer.peek && @lexer.peek.type == :comma
-
-        list = node(Sass::Script::Tree::ListLiteral.new([first], :comma), start_pos)
-        while (tok = try_tok(:comma))
-          element_before_interp = list.elements.length == 1 ? list.elements.first : list
-          if (interp = try_op_before_interp(tok, element_before_interp))
-            other_interp = try_ops_after_interp([:comma], :expr, interp)
-            return interp unless other_interp
+        line = @lexer.line
+        return unless e = interpolation
+        list = node(List.new([e], :comma), line)
+        while tok = try_tok(:comma)
+          if interp = try_op_before_interp(tok, list)
+            return interp unless other_interp = try_ops_after_interp([:comma], :expr, interp)
             return other_interp
           end
-          return list unless (e = interpolation)
-          list.elements << e
+          list.value << assert_expr(:interpolation)
         end
-        list
+        list.value.size == 1 ? list.value.first : list
       end
 
       production :equals, :interpolation, :single_eq
@@ -317,58 +260,47 @@ RUBY
       def try_op_before_interp(op, prev = nil)
         return unless @lexer.peek && @lexer.peek.type == :begin_interpolation
         wb = @lexer.whitespace?(op)
-        str = literal_node(Script::Value::String.new(Lexer::OPERATORS_REVERSE[op.type]),
-                           op.source_range)
-        interp = node(
-          Script::Tree::Interpolation.new(prev, str, nil, wb, !:wa, :originally_text),
-          (prev || str).source_range.start_pos)
+        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, prev = nil)
         return unless @lexer.after_interpolation?
-        op = try_toks(*ops)
-        return unless op
-        interp = try_op_before_interp(op, prev)
-        return interp if interp
+        return unless op = try_tok(*ops)
+        interp = try_op_before_interp(op, prev) and return interp
 
         wa = @lexer.whitespace?
-        str = literal_node(Script::Value::String.new(Lexer::OPERATORS_REVERSE[op.type]),
-                           op.source_range)
+        str = Script::String.new(Lexer::OPERATORS_REVERSE[op.type])
         str.line = @lexer.line
-        interp = node(
-          Script::Tree::Interpolation.new(prev, str, assert_expr(name), !:wb, wa, :originally_text),
-          (prev || str).source_range.start_pos)
-        interp
+        interp = Script::Interpolation.new(prev, str, assert_expr(name), !:wb, wa, :originally_text)
+        interp.line = @lexer.line
+        return interp
       end
 
       def interpolation(first = space)
         e = first
-        while (interp = try_tok(:begin_interpolation))
+        while interp = try_tok(:begin_interpolation)
           wb = @lexer.whitespace?(interp)
-          mid = assert_expr :expr
-          assert_tok :end_interpolation
+          line = @lexer.line
+          mid = parse_interpolated
           wa = @lexer.whitespace?
-          e = node(
-            Script::Tree::Interpolation.new(e, mid, space, wb, wa),
-            (e || mid).source_range.start_pos)
+          e = Script::Interpolation.new(e, mid, space, wb, wa)
+          e.line = line
         end
         e
       end
 
       def space
-        start_pos = source_position
-        e = or_expr
-        return unless e
+        line = @lexer.line
+        return unless e = or_expr
         arr = [e]
-        while (e = or_expr)
+        while e = or_expr
           arr << e
         end
-        if arr.size == 1
-          arr.first
-        else
-          node(Sass::Script::Tree::ListLiteral.new(arr, :space), start_pos)
-        end
+        arr.size == 1 ? arr.first : node(List.new(arr, :space), line)
       end
 
       production :or_expr, :and_expr, :or
@@ -388,26 +320,24 @@ RUBY
         return if @stop_at && @stop_at.include?(@lexer.peek.value)
 
         name = @lexer.next
-        if (color = Sass::Script::Value::Color::COLOR_NAMES[name.value.downcase])
-          literal_node(Sass::Script::Value::Color.new(color, name.value), name.source_range)
+        if color = Color::COLOR_NAMES[name.value.downcase]
+          node(Color.new(color))
         elsif name.value == "true"
-          literal_node(Sass::Script::Value::Bool.new(true), name.source_range)
+          node(Script::Bool.new(true))
         elsif name.value == "false"
-          literal_node(Sass::Script::Value::Bool.new(false), name.source_range)
+          node(Script::Bool.new(false))
         elsif name.value == "null"
-          literal_node(Sass::Script::Value::Null.new, name.source_range)
+          node(Script::Null.new)
         else
-          literal_node(Sass::Script::Value::String.new(name.value, :identifier), name.source_range)
+          node(Script::String.new(name.value, :identifier))
         end
       end
 
       def funcall
-        tok = try_tok(:funcall)
-        return raw unless tok
-        args, keywords, splat, kwarg_splat = fn_arglist
+        return raw unless tok = try_tok(:funcall)
+        args, keywords, splat = fn_arglist || [[], {}]
         assert_tok(:rparen)
-        node(Script::Tree::Funcall.new(tok.value, args, keywords, splat, kwarg_splat),
-          tok.source_range.start_pos, source_position)
+        node(Script::Funcall.new(tok.value, args, keywords, splat))
       end
 
       def defn_arglist!(must_have_parens)
@@ -423,16 +353,15 @@ RUBY
         must_have_default = false
         loop do
           c = assert_tok(:const)
-          var = node(Script::Tree::Variable.new(c.value), c.source_range)
+          var = Script::Variable.new(c.value)
           if try_tok(:colon)
             val = assert_expr(:space)
             must_have_default = true
+          elsif must_have_default
+            raise SyntaxError.new("Required argument #{var.inspect} must come before any optional arguments.")
           elsif try_tok(:splat)
             splat = var
             break
-          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)
@@ -450,108 +379,88 @@ RUBY
       end
 
       def arglist(subexpr, description)
-        args = []
-        keywords = Sass::Util::NormalizedMap.new
-        e = send(subexpr)
+        return unless e = send(subexpr)
 
-        return [args, keywords] unless e
-
-        splat = nil
+        args = []
+        keywords = {}
         loop do
           if @lexer.peek && @lexer.peek.type == :colon
             name = e
-            @lexer.expected!("comma") unless name.is_a?(Tree::Variable)
+            @lexer.expected!("comma") unless name.is_a?(Variable)
             assert_tok(:colon)
             value = assert_expr(subexpr, description)
 
-            if keywords[name.name]
+            if keywords[name.underscored_name]
               raise SyntaxError.new("Keyword argument \"#{name.to_sass}\" passed more than once")
             end
 
-            keywords[name.name] = value
+            keywords[name.underscored_name] = value
           else
-            if try_tok(:splat)
-              return args, keywords, splat, e if splat
-              splat, e = e, nil
-            elsif splat
-              raise SyntaxError.new("Only keyword arguments may follow variable arguments (...).")
-            elsif !keywords.empty?
+            if !keywords.empty?
               raise SyntaxError.new("Positional arguments must come before keyword arguments.")
             end
 
-            args << e if e
+            return args, keywords, e if try_tok(:splat)
+            args << e
           end
 
-          return args, keywords, splat unless try_tok(:comma)
+          return args, keywords unless try_tok(:comma)
           e = assert_expr(subexpr, description)
         end
       end
 
       def raw
-        tok = try_tok(:raw)
-        return special_fun unless tok
-        literal_node(Script::Value::String.new(tok.value), tok.source_range)
+        return special_fun unless tok = try_tok(:raw)
+        node(Script::String.new(tok.value))
       end
 
       def special_fun
-        first = try_tok(:special_fun)
-        return paren unless first
-        str = literal_node(first.value, first.source_range)
-        return str unless try_tok(:begin_interpolation)
-        mid = parse_interpolated
-        last = assert_expr(:special_fun)
-        node(Tree::Interpolation.new(str, mid, last, false, false),
-            first.source_range.start_pos)
+        return paren unless tok = try_tok(:special_fun)
+        first = node(Script::String.new(tok.value.first))
+        Sass::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
       end
 
       def paren
         return variable unless try_tok(:lparen)
         was_in_parens = @in_parens
         @in_parens = true
-        start_pos = source_position
-        e = map
-        end_pos = source_position
+        line = @lexer.line
+        e = expr
         assert_tok(:rparen)
-        return e || node(Sass::Script::Tree::ListLiteral.new([], nil), start_pos, end_pos)
+        return e || node(List.new([], :space), line)
       ensure
         @in_parens = was_in_parens
       end
 
       def variable
-        start_pos = source_position
-        c = try_tok(:const)
-        return string unless c
-        node(Tree::Variable.new(*c.value), start_pos)
+        return string unless c = try_tok(:const)
+        node(Variable.new(*c.value))
       end
 
       def string
-        first = try_tok(:string)
-        return number unless first
-        str = literal_node(first.value, first.source_range)
-        return str unless try_tok(:begin_interpolation)
-        mid = assert_expr :expr
-        assert_tok :end_interpolation
+        return number unless first = try_tok(:string)
+        return first.value unless try_tok(:begin_interpolation)
+        line = @lexer.line
+        mid = parse_interpolated
         last = assert_expr(:string)
-        node(Tree::StringInterpolation.new(str, mid, last), first.source_range.start_pos)
+        interp = StringInterpolation.new(first.value, mid, last)
+        interp.line = line
+        interp
       end
 
       def number
-        tok = try_tok(:number)
-        return selector unless tok
+        return literal unless tok = try_tok(:number)
         num = tok.value
         num.original = num.to_s unless @in_parens
-        literal_node(num, tok.source_range.start_pos)
-      end
-
-      def selector
-        tok = try_tok(:selector)
-        return literal unless tok
-        node(tok.value, tok.source_range.start_pos)
+        num
       end
 
       def literal
-        t = try_tok(:color)
-        return literal_node(t.value, t.source_range) if t
+        (t = try_tok(:color)) && (return t.value)
       end
 
       # It would be possible to have unified #assert and #try methods,
@@ -562,37 +471,20 @@ RUBY
         :default => "expression (e.g. 1px, bold)",
         :mixin_arglist => "mixin argument",
         :fn_arglist => "function argument",
-        :splat => "...",
-        :special_fun => '")"',
       }
 
       def assert_expr(name, expected = nil)
-        e = send(name)
-        return e if e
+        (e = send(name)) && (return e)
         @lexer.expected!(expected || EXPR_NAMES[name] || EXPR_NAMES[:default])
       end
 
-      def assert_tok(name)
-        # Avoids an array allocation caused by argument globbing in assert_toks.
-        t = try_tok(name)
-        return t if t
-        @lexer.expected!(Lexer::TOKEN_NAMES[name] || name.to_s)
-      end
-
-      def assert_toks(*names)
-        t = try_toks(*names)
-        return t if t
+      def assert_tok(*names)
+        (t = try_tok(*names)) && (return t)
         @lexer.expected!(names.map {|tok| Lexer::TOKEN_NAMES[tok] || tok}.join(" or "))
       end
 
-      def try_tok(name)
-        # Avoids an array allocation caused by argument globbing in the try_toks method.
-        peeked = @lexer.peek
-        peeked && name == peeked.type && @lexer.next
-      end
-
-      def try_toks(*names)
-        peeked = @lexer.peek
+      def try_tok(*names)
+        peeked =  @lexer.peek
         peeked && names.include?(peeked.type) && @lexer.next
       end
 
@@ -601,35 +493,8 @@ RUBY
         @lexer.expected!(EXPR_NAMES[:default])
       end
 
-      # @overload node(value, source_range)
-      #   @param value [Sass::Script::Value::Base]
-      #   @param source_range [Sass::Source::Range]
-      # @overload node(value, start_pos, end_pos = source_position)
-      #   @param value [Sass::Script::Value::Base]
-      #   @param start_pos [Sass::Source::Position]
-      #   @param end_pos [Sass::Source::Position]
-      def literal_node(value, source_range_or_start_pos, end_pos = source_position)
-        node(Sass::Script::Tree::Literal.new(value), source_range_or_start_pos, end_pos)
-      end
-
-      # @overload node(node, source_range)
-      #   @param node [Sass::Script::Tree::Node]
-      #   @param source_range [Sass::Source::Range]
-      # @overload node(node, start_pos, end_pos = source_position)
-      #   @param node [Sass::Script::Tree::Node]
-      #   @param start_pos [Sass::Source::Position]
-      #   @param end_pos [Sass::Source::Position]
-      def node(node, source_range_or_start_pos, end_pos = source_position)
-        source_range =
-          if source_range_or_start_pos.is_a?(Sass::Source::Range)
-            source_range_or_start_pos
-          else
-            range(source_range_or_start_pos, end_pos)
-          end
-
-        node.line = source_range.start_pos.line
-        node.source_range = source_range
-        node.filename = @options[:filename]
+      def node(node, line = @lexer.line)
+        node.line = line
         node
       end
     end