haml 2.2.24 → 3.0.0.beta.1

data/lib/sass/script/interpolation.rb

@@ -0,0 +1,42 @@
+module Sass::Script
+  class Interpolation < Node
+    def initialize(before, mid, after, wb, wa)
+      @before = before
+      @mid = mid
+      @after = after
+      @whitespace_before = wb
+      @whitespace_after = wa
+    end
+
+    def inspect
+      "(interpolation #{@before.inspect} #{@mid.inspect} #{after.inspect})"
+    end
+
+    def to_sass
+      res = ""
+      res << @before.to_sass if @before
+      res << ' ' if @before && @whitespace_before
+      res << '#{' << @mid.to_sass << '}'
+      res << ' ' if @after && @whitespace_after
+      res << @after.to_sass if @after
+      res
+    end
+
+    def children
+      [@before, @mid, @after].compact
+    end
+
+    protected
+
+    def _perform(environment)
+      res = ""
+      res << @before.perform(environment).to_s if @before
+      res << " " if @before && @whitespace_before
+      val = @mid.perform(environment)
+      res << (val.is_a?(Sass::Script::String) ? val.value : val.to_s)
+      res << " " if @after && @whitespace_after
+      res << @after.perform(environment).to_s if @after
+      Sass::Script::String.new(res)
+    end
+  end
+end

data/lib/sass/script/lexer.rb

@@ -1,3 +1,5 @@
+require 'sass/scss/rx'
+
 require 'strscan'
 
 module Sass
@@ -6,6 +8,8 @@ module Sass
     # It takes a raw string and converts it to individual tokens
     # that are easier to parse.
     class Lexer
+      include Sass::SCSS::RX
+
       # A struct containing information about an individual token.
       #
       # `type`: \[`Symbol`\]
@@ -19,7 +23,21 @@ module Sass
       #
       # `offset`: \[`Fixnum`\]
       # : The number of bytes into the line the SassScript token appeared.
-      Token = Struct.new(:type, :value, :line, :offset)
+      #
+      # `pos`: \[`Fixnum`\]
+      # : The scanner position at which the SassScript token appeared.
+      Token = Struct.new(:type, :value, :line, :offset, :pos)
+
+      # The line number of the lexer's current position.
+      #
+      # @return [Fixnum]
+      attr_reader :line
+
+      # The number of bytes into the current line
+      # of the lexer's current position.
+      #
+      # @return [Fixnum]
+      attr_reader :offset
 
       # A hash from operator strings to the corresponding token types.
       # @private
@@ -30,6 +48,7 @@ module Sass
         '/' => :div,
         '%' => :mod,
         '=' => :single_eq,
+        ':' => :colon,
         '(' => :lparen,
         ')' => :rparen,
         ',' => :comma,
@@ -44,24 +63,63 @@ module Sass
         '<' => :lt,
         '#{' => :begin_interpolation,
         '}' => :end_interpolation,
+        ';' => :semicolon,
+        '{' => :lcurly,
       }
 
+      # @private
+      OPERATORS_REVERSE = Haml::Util.map_hash(OPERATORS) {|k, v| [v, k]}
+
+      # @private
+      TOKEN_NAMES = Haml::Util.map_hash(OPERATORS_REVERSE) {|k, v| [k, v.inspect]}.merge({
+          :const => "variable (e.g. $foo)",
+          :ident => "identifier (e.g. middle)",
+          :bool => "boolean (e.g. true, false)",
+        })
+
       # A list of operator strings ordered with longer names first
       # so that `>` and `<` don't clobber `>=` and `<=`.
       # @private
       OP_NAMES = OPERATORS.keys.sort_by {|o| -o.size}
 
+      # A sub-list of {OP_NAMES} that only includes operators
+      # with identifier names.
+      # @private
+      IDENT_OP_NAMES = OP_NAMES.select {|k, v| k =~ /^\w+/}
+
       # A hash of regular expressions that are used for tokenizing.
       # @private
       REGULAR_EXPRESSIONS = {
-        :whitespace => /\s*/,
-        :variable => /!(\w+)/,
-        :ident => /(\\.|[^\s\\+\-*\/%(),=!])+/,
-        :string_end => /((?:\\.|\#(?!\{)|[^"\\#])*)(?:"|(?=#\{))/,
+        :whitespace => /\s+/,
+        :comment => COMMENT,
+        :single_line_comment => SINGLE_LINE_COMMENT,
+        :variable => /([!\$])(#{IDENT})/,
+        :ident => IDENT,
         :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
-        :color => /\##{"([0-9a-fA-F]{1,2})" * 3}|(#{Color::HTML4_COLORS.keys.join("|")})/,
+        :color => HEXCOLOR,
         :bool => /(true|false)\b/,
-        :op => %r{(#{Regexp.union(*OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + (s =~ /\w$/ ? '(?:\b|$)' : ''))})})}
+        :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + '(?:\b|$)')})})},
+        :op => %r{(#{Regexp.union(*OP_NAMES)})},
+      }
+
+      class << self
+        private
+        def string_re(open, close)
+          /#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|(?=#\{))/
+        end
+      end
+
+      # A hash of regular expressions that are used for tokenizing strings.
+      #
+      # The key is a [Symbol, Boolean] pair.
+      # The symbol represents which style of quotation to use,
+      # while the boolean represents whether or not the string
+      # is following an interpolated segment.
+      STRING_REGULAR_EXPRESSIONS = {
+        [:double, false] => string_re('"', '"'),
+        [:single, false] => string_re("'", "'"),
+        [:double, true] => string_re('', '"'),
+        [:single, true] => string_re('', "'"),
       }
 
       # @param str [String, StringScanner] The source text to lex
@@ -69,11 +127,14 @@ module Sass
       #   Used for error reporting
       # @param offset [Fixnum] The number of characters in on which the SassScript appears.
       #   Used for error reporting
-      def initialize(str, line, offset, filename)
+      # @param options [{Symbol => Object}] An options hash;
+      #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
+      def initialize(str, line, offset, options)
         @scanner = str.is_a?(StringScanner) ? str : StringScanner.new(str)
         @line = line
         @offset = offset
-        @filename = filename
+        @options = options
+        @interpolation_stack = []
         @prev = nil
       end
 
@@ -87,6 +148,18 @@ module Sass
         return tok
       end
 
+      # Returns whether or not there's whitespace before the next token.
+      #
+      # @return [Boolean]
+      def whitespace?(tok = @tok)
+        if tok
+          @scanner.string[0...tok.pos] =~ /\s$/
+        else
+          @scanner.string[@scanner.pos, 1] =~ /^\s/ ||
+            @scanner.string[@scanner.pos - 1, 1] =~ /\s$/
+        end
+      end
+
       # Returns the next token without moving the lexer forward.
       #
       # @return [Token] The next token
@@ -94,96 +167,140 @@ module Sass
         @tok ||= read_token
       end
 
+      # Rewinds the underlying StringScanner
+      # to before the token returned by \{#peek}.
+      def unpeek!
+        @scanner.pos = @tok.pos if @tok
+      end
+
       # @return [Boolean] Whether or not there's more source text to lex.
       def done?
-        whitespace unless after_interpolation?
+        whitespace unless after_interpolation? && @interpolation_stack.last
         @scanner.eos? && @tok.nil?
       end
 
+      def expected!(name)
+        unpeek!
+        Sass::SCSS::Parser.expected(@scanner, name, @line)
+      end
+
+      def str
+        old_pos = @tok ? @tok.pos : @scanner.pos
+        yield
+        new_pos = @tok ? @tok.pos : @scanner.pos
+        @scanner.string[old_pos...new_pos]
+      end
+
       private
 
       def read_token
         return if done?
+        return unless value = token
 
-        value = token
-        unless value
-          raise SyntaxError.new("Syntax error in '#{@scanner.string}' at character #{current_position}.")
-        end
-        Token.new(value.first, value.last, @line, last_match_position)
+        value.last.line = @line if value.last.is_a?(Script::Node)
+        Token.new(value.first, value.last, @line,
+          current_position - @scanner.matched_size,
+          @scanner.pos - @scanner.matched_size)
       end
 
       def whitespace
-        @scanner.scan(REGULAR_EXPRESSIONS[:whitespace])
+        nil while scan(REGULAR_EXPRESSIONS[:whitespace]) ||
+          scan(REGULAR_EXPRESSIONS[:comment]) ||
+          scan(REGULAR_EXPRESSIONS[:single_line_comment])
       end
 
       def token
-        return string('') if after_interpolation?
-        variable || string || number || color || bool || op || ident
+        if after_interpolation? && (interp_type = @interpolation_stack.pop)
+          return string(interp_type, true)
+        end
+
+        variable || string(:double, false) || string(:single, false) || number ||
+          color || bool || raw(URI) || raw(UNICODERANGE) || special_fun ||
+          ident_op || ident || op
       end
 
       def variable
-        return unless @scanner.scan(REGULAR_EXPRESSIONS[:variable])
-        [:const, @scanner[1]]
+        _variable(REGULAR_EXPRESSIONS[:variable])
       end
 
-      def ident
-        return unless s = @scanner.scan(REGULAR_EXPRESSIONS[:ident])
-        [:ident, s.gsub(/\\(.)/, '\1')]
+      def _variable(rx)
+        line = @line
+        offset = @offset
+        return unless scan(rx)
+        if @scanner[1] == '!' && @scanner[2] != 'important'
+          Script.var_warning(@scanner[2], line, offset + 1, @options[:filename])
+        end
+
+        [:const, @scanner[2]]
       end
 
-      def string(start_char = '"')
-        return unless @scanner.scan(/#{start_char}#{REGULAR_EXPRESSIONS[:string_end]}/)
-        [:string, Script::String.new(@scanner[1].gsub(/\\([^0-9a-f])/, '\1').gsub(/\\([0-9a-f]{1,4})/, "\\\\\\1"))]
+      def ident
+        return unless s = scan(REGULAR_EXPRESSIONS[:ident])
+        [:ident, s.gsub(/\\(.)/, '\1')]
       end
 
-      def begin_interpolation
-        @scanner.scan
+      def string(re, open)
+        return unless scan(STRING_REGULAR_EXPRESSIONS[[re, open]])
+        @interpolation_stack << re if @scanner[2].empty? # Started an interpolated section
+        [:string, Script::String.new(@scanner[1].gsub(/\\([^0-9a-f])/, '\1').gsub(/\\([0-9a-f]{1,4})/, "\\\\\\1"), :string)]
       end
 
       def number
-        return unless @scanner.scan(REGULAR_EXPRESSIONS[:number])
+        return unless scan(REGULAR_EXPRESSIONS[:number])
         value = @scanner[2] ? @scanner[2].to_f : @scanner[3].to_i
         value = -value if @scanner[1]
         [:number, Script::Number.new(value, Array(@scanner[4]))]
       end
 
       def color
-        return unless @scanner.scan(REGULAR_EXPRESSIONS[:color])
-        value = if @scanner[4]
-                  color = Color::HTML4_COLORS[@scanner[4].downcase]
-                else
-                  (1..3).map {|i| @scanner[i]}.map {|num| num.ljust(2, num).to_i(16)}
-                end
+        return unless s = scan(REGULAR_EXPRESSIONS[:color])
+        value = s.scan(/^#(..?)(..?)(..?)$/).first.
+          map {|num| num.ljust(2, num).to_i(16)}
         [:color, Script::Color.new(value)]
       end
 
       def bool
-        return unless s = @scanner.scan(REGULAR_EXPRESSIONS[:bool])
+        return unless s = scan(REGULAR_EXPRESSIONS[:bool])
         [:bool, Script::Bool.new(s == 'true')]
       end
 
-      def op
-        prev_chr = @scanner.string[@scanner.pos - 1].chr
-        return unless op = @scanner.scan(REGULAR_EXPRESSIONS[:op])
-        if @prev && op == '-' && prev_chr !~ /\s/ &&
-            [:bool, :ident, :const].include?(@prev.type)
-          warn(<<END)
-DEPRECATION WARNING:
-On line #{@line}, character #{last_match_position}#{" of '#{@filename}'" if @filename}
-- will be allowed as part of variable names in version 3.0.
-Please add whitespace to separate it from the previous token.
-END
-        end
+      def special_fun
+        return unless str1 = scan(/(calc|expression|progid:[a-z\.]*)\(/i)
+        str2, _ = Haml::Shared.balance(@scanner, ?(, ?), 1)
+        c = str2.count("\n")
+        @line += c
+        @offset = (c == 0 ? @offset + str2.size : str2[/\n(.*)/, 1].size)
+        [:special_fun,
+          Haml::Util.merge_adjacent_strings(
+            [str1] + Sass::Engine.parse_interp(str2, @line, @options))]
+      end
 
+      def ident_op
+        return unless op = scan(REGULAR_EXPRESSIONS[:ident_op])
         [OPERATORS[op]]
       end
 
-      def current_position
-        @offset + @scanner.pos + 1
+      def op
+        return unless op = scan(REGULAR_EXPRESSIONS[:op])
+        @interpolation_stack << nil if op == :begin_interpolation
+        [OPERATORS[op]]
+      end
+
+      def raw(rx)
+        return unless val = scan(rx)
+        [:raw, val]
       end
 
-      def last_match_position
-        current_position - @scanner.matched_size
+      def scan(re)
+        return unless str = @scanner.scan(re)
+        c = str.count("\n")
+        @line += c
+        @offset = (c == 0 ? @offset + str.size : str[/\n(.*)/, 1].size)
+        str
+      end
+
+      def current_position
+        @offset + 1
       end
 
       def after_interpolation?

data/lib/sass/script/literal.rb

@@ -21,14 +21,32 @@ module Sass::Script
     # @param value [Object] The object for \{#value}
     def initialize(value = nil)
       @value = value
+      super()
     end
 
-    # Evaluates the literal.
+    # Returns an empty array.
     #
-    # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
-    # @return [Literal] This literal
-    def perform(environment)
-      self
+    # @return [Array<Node>] empty
+    # @see Node#children
+    def children
+      []
+    end
+
+    # Returns the options hash for this node.
+    #
+    # @return [{Symbol => Object}]
+    # @raise [Sass::SyntaxError] if the options hash hasn't been set.
+    #   This should only happen when the literal was created
+    #   outside of the parser and \{#to\_s} was called on it
+    def options
+      opts = super
+      return opts if opts
+      raise Sass::SyntaxError.new(<<MSG)
+The #options attribute is not set on this #{self.class}.
+  This error is probably occurring because #to_s was called
+  on this literal within a custom Sass function without first
+  setting the #option attribute.
+MSG
     end
 
     # The SassScript `and` operation.
@@ -84,7 +102,7 @@ module Sass::Script
       Sass::Script::Bool.new(!to_bool)
     end
 
-    # The SassScript default operation (e.g. `!a !b`, `"foo" "bar"`).
+    # The SassScript default operation (e.g. `$a $b`, `"foo" "bar"`).
     #
     # @param other [Literal] The right-hand side of the operator
     # @return [Script::String] A string containing both literals
@@ -93,7 +111,7 @@ module Sass::Script
       Sass::Script::String.new("#{self.to_s} #{other.to_s}")
     end
 
-    # The SassScript `,` operation (e.g. `!a, !b`, `"foo", "bar"`).
+    # The SassScript `,` operation (e.g. `$a, $b`, `"foo", "bar"`).
     #
     # @param other [Literal] The right-hand side of the operator
     # @return [Script::String] A string containing both literals
@@ -108,6 +126,9 @@ module Sass::Script
     # @return [Script::String] A string containing both literals
     #   without any separation
     def plus(other)
+      if other.is_a?(Sass::Script::String)
+        return Sass::Script::String.new(self.to_s + other.value, other.type)
+      end
       Sass::Script::String.new(self.to_s + other.to_s)
     end
 
@@ -129,7 +150,16 @@ module Sass::Script
       Sass::Script::String.new("#{self.to_s}/#{other.to_s}")
     end
 
-    # The SassScript unary `-` operation (e.g. `-!a`).
+    # The SassScript unary `+` operation (e.g. `+$a`).
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing the literal
+    #   preceded by `"+"`
+    def unary_plus
+      Sass::Script::String.new("+#{self.to_s}")
+    end
+
+    # The SassScript unary `-` operation (e.g. `-$a`).
     #
     # @param other [Literal] The right-hand side of the operator
     # @return [Script::String] A string containing the literal
@@ -138,7 +168,7 @@ module Sass::Script
       Sass::Script::String.new("-#{self.to_s}")
     end
 
-    # The SassScript unary `/` operation (e.g. `/!a`).
+    # The SassScript unary `/` operation (e.g. `/$a`).
     #
     # @param other [Literal] The right-hand side of the operator
     # @return [Script::String] A string containing the literal
@@ -173,5 +203,24 @@ module Sass::Script
 
     # @raise [Sass::SyntaxError] if this literal isn't an integer
     def assert_int!; to_i; end
+
+    # Returns the string representation of this literal
+    # as it would be output to the CSS document.
+    #
+    # @return [String]
+    def to_s
+      raise Sass::SyntaxError.new("[BUG] All subclasses of Sass::Literal must implement #to_s.")
+    end
+    alias_method :to_sass, :to_s
+
+    protected
+
+    # Evaluates the literal.
+    #
+    # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
+    # @return [Literal] This literal
+    def _perform(environment)
+      self
+    end
   end
 end