haml 3.0.0.beta.3 → 3.0.0.rc.1

data/lib/sass/selector/comma_sequence.rb

@@ -0,0 +1,80 @@
+module Sass
+  module Selector
+    # A comma-separated sequence of selectors.
+    class CommaSequence < AbstractSequence
+      # The comma-separated selector sequences
+      # represented by this class.
+      #
+      # @return [Array<Sequence>]
+      attr_reader :members
+
+      # @param seqs [Array<Sequence>] See \{#members}
+      def initialize(seqs)
+        @members = seqs
+      end
+
+      # Resolves the {Parent} selectors within this selector
+      # by replacing them with the given parent selector,
+      # handling commas appropriately.
+      #
+      # @param super_cseq [CommaSequence] The parent selector
+      # @return [CommaSequence] This selector, with parent references resolved
+      # @raise [Sass::SyntaxError] If a parent selector is invalid
+      def resolve_parent_refs(super_cseq)
+        if super_cseq.nil?
+          if @members.any? do |sel|
+              sel.members.any? do |sel_or_op|
+                sel_or_op.is_a?(SimpleSequence) && sel_or_op.members.any? {|ssel| ssel.is_a?(Parent)}
+              end
+            end
+            raise Sass::SyntaxError.new("Base-level rules cannot contain the parent-selector-referencing character '&'.")
+          end
+          return self
+        end
+
+        CommaSequence.new(
+          super_cseq.members.map do |super_seq|
+            @members.map {|seq| seq.resolve_parent_refs(super_seq)}
+          end.flatten)
+      end
+
+      # Non-destrucively extends this selector
+      # with the extensions specified in a hash
+      # (which should be populated via {Sass::Tree::Node#cssize}).
+      #
+      # @todo Link this to the reference documentation on `@extend`
+      #   when such a thing exists.
+      #
+      # @param extends [Haml::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
+      #   The extensions to perform on this selector
+      # @return [CommaSequence] A copy of this selector,
+      #   with extensions made according to `extends`
+      def do_extend(extends)
+        CommaSequence.new(members.map {|seq| seq.do_extend(extends)}.flatten)
+      end
+
+      # Returns a string representation of the sequence.
+      # This is basically the selector string.
+      #
+      # @return [String]
+      def inspect
+        members.map {|m| m.inspect}.join(", ")
+      end
+
+      # Returns a hash code for this sequence.
+      #
+      # @return [Fixnum]
+      def hash
+        members.hash
+      end
+
+      # Checks equality between this and another object.
+      #
+      # @param other [Object] The object to test equality against
+      # @return [Boolean] Whether or not this is equal to `other`
+      def eql?(other)
+        other.class == self.class && other.members.eql?(self.members)
+      end
+    end
+  end
+end

data/lib/sass/selector/sequence.rb

@@ -0,0 +1,194 @@
+module Sass
+  module Selector
+    # An operator-separated sequence of
+    # {SimpleSequence simple selector sequences}.
+    class Sequence < AbstractSequence
+      # Sets the line of the Sass template on which this selector was declared.
+      # This also sets the line for all child selectors.
+      #
+      # @param line [Fixnum]
+      # @return [Fixnum]
+      def line=(line)
+        members.each {|m| m.line = line if m.is_a?(SimpleSequence)}
+        line
+      end
+
+      # Sets the name of the file in which this selector was declared,
+      # or `nil` if it was not declared in a file (e.g. on stdin).
+      # This also sets the filename for all child selectors.
+      #
+      # @param filename [String, nil]
+      # @return [String, nil]
+      def filename=(filename)
+        members.each {|m| m.filename = filename if m.is_a?(SimpleSequence)}
+        filename
+      end
+
+      # The array of {SimpleSequence simple selector sequences}, operators, and newlines.
+      # The operators are strings such as `"+"` and `">"`
+      # representing the corresponding CSS operators.
+      # Newlines are also newline strings;
+      # these aren't semantically relevant,
+      # but they do affect formatting.
+      #
+      # @return [Array<SimpleSequence, String>]
+      attr_reader :members
+
+      # @param seqs_and_ops [Array<SimpleSequence, String>] See \{#members}
+      def initialize(seqs_and_ops)
+        @members = seqs_and_ops
+      end
+
+      # Resolves the {Parent} selectors within this selector
+      # by replacing them with the given parent selector,
+      # handling commas appropriately.
+      #
+      # @param super_seq [Sequence] The parent selector sequence
+      # @return [Sequence] This selector, with parent references resolved
+      # @raise [Sass::SyntaxError] If a parent selector is invalid
+      def resolve_parent_refs(super_seq)
+        members = @members
+        members.slice!(0) if nl = (members.first == "\n")
+        unless members.any? do |seq_or_op|
+            seq_or_op.is_a?(SimpleSequence) && seq_or_op.members.first.is_a?(Parent)
+          end
+          members = []
+          members << "\n" if nl
+          members << SimpleSequence.new([Parent.new])
+          members += @members
+        end
+
+        Sequence.new(
+          members.map do |seq_or_op|
+            next seq_or_op unless seq_or_op.is_a?(SimpleSequence)
+            seq_or_op.resolve_parent_refs(super_seq)
+          end.flatten)
+      end
+
+      # Non-destructively extends this selector
+      # with the extensions specified in a hash
+      # (which should be populated via {Sass::Tree::Node#cssize}).
+      #
+      # @overload def do_extend(extends)
+      # @param extends [Haml::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
+      #   The extensions to perform on this selector
+      # @return [Array<Sequence>] A list of selectors generated
+      #   by extending this selector with `extends`.
+      #   These correspond to a {CommaSequence}'s {CommaSequence#members members array}.
+      # @see CommaSequence#do_extend
+      def do_extend(extends, supers = [])
+        Haml::Util.paths(members.map do |sseq_or_op|
+            next [[sseq_or_op]] unless sseq_or_op.is_a?(SimpleSequence)
+            [[sseq_or_op], *sseq_or_op.do_extend(extends, supers).map {|seq| seq.members}]
+          end).map {|path| weave(path)}.flatten(1).map {|p| Sequence.new(p)}
+      end
+
+      # @see Simple#to_a
+      def to_a
+        ary = @members.map {|seq_or_op| seq_or_op.is_a?(SimpleSequence) ? seq_or_op.to_a : seq_or_op}
+        ary = Haml::Util.intersperse(ary, " ")
+        ary = Haml::Util.substitute(ary, [" ", "\n", " "], ["\n"])
+        ary.flatten.compact
+      end
+
+      # Returns a string representation of the sequence.
+      # This is basically the selector string.
+      #
+      # @return [String]
+      def inspect
+        members.map {|m| m.inspect}.join(" ")
+      end
+
+      # Returns a hash code for this sequence.
+      #
+      # @return [Fixnum]
+      def hash
+        members.reject {|m| m == "\n"}.hash
+      end
+
+      # Checks equality between this and another object.
+      #
+      # @param other [Object] The object to test equality against
+      # @return [Boolean] Whether or not this is equal to `other`
+      def eql?(other)
+        other.class == self.class &&
+          other.members.reject {|m| m == "\n"}.eql?(self.members.reject {|m| m == "\n"})
+      end
+
+      private
+
+      # Conceptually, this expands "parenthesized selectors".
+      # That is, if we have `.A .B {@extend .C}` and `.D .C {...}`,
+      # this conceptually expands into `.D .C, .D (.A .B)`,
+      # and this function translates `.D (.A .B)` into `.D .A .B, .A.D .B, .D .A .B`.
+      #
+      # @param path [Array<Array<SimpleSequence or String>>] A list of parenthesized selector groups.
+      # @return [Array<Array<SimpleSequence or String>>] A list of fully-expanded selectors.
+      def weave(path)
+        befores = [[]]
+        afters = path.dup
+
+        until afters.empty?
+          current = afters.shift.dup
+          last_current = [current.pop]
+          while !current.empty? && last_current.first.is_a?(String) || current.last.is_a?(String)
+            last_current.unshift(current.pop)
+          end
+          befores = befores.map do |before|
+            subweave(before, current).map {|seqs| seqs + last_current}
+          end.flatten(1)
+          return befores if afters.empty?
+        end
+      end
+
+      # This interweaves two lists of selectors,
+      # returning all possible orderings of them (including using unification)
+      # that maintain the relative ordering of the input arrays.
+      #
+      # For example, given `.foo .bar` and `.baz .bang`,
+      # this would return `.foo .bar .baz .bang`, `.foo .bar.baz .bang`,
+      # `.foo .baz .bar .bang`, `.foo .baz .bar.bang`, `.foo .baz .bang .bar`,
+      # and so on until `.baz .bang .foo .bar`.
+      #
+      # @overload def subweave(seq1, seq2)
+      # @param seq1 [Array<SimpleSequence or String>]
+      # @param seq2 [Array<SimpleSequence or String>]
+      # @return [Array<Array<SimpleSequence or String>>]
+      def subweave(seq1, seq2, cache = {})
+        return [seq2] if seq1.empty?
+        return [seq1] if seq2.empty?
+        cache[[seq1, seq2]] ||=
+          begin
+            sseq1, rest1 = seq_split(seq1)
+            sseq2, rest2 = seq_split(seq2)
+
+            if sseq1.eql?(sseq2)
+              subweave(rest1, rest2, cache).map {|subseq| sseq1 + subseq}
+            else
+              unified = unify_heads(sseq1, sseq2) || unify_heads(sseq2, sseq1)
+              res = []
+              subweave(rest1, seq2, cache).each {|subseq| res << sseq1 + subseq}
+              subweave(rest1, rest2, cache).each {|subseq| res << unified + subseq} if unified
+              subweave(seq1, rest2, cache).each {|subseq| res << sseq2 + subseq}
+              res
+            end
+          end
+      end
+
+      def seq_split(seq)
+        tail = seq.dup
+        head = []
+        begin
+          head << tail.shift
+        end while !tail.empty? && head.last.is_a?(String) || tail.first.is_a?(String)
+        return head, tail
+      end
+
+      def unify_heads(sseq1, sseq2)
+        return unless sseq2.size == 1 # Can't unify ".foo > .bar" and ".baz > .bang"
+        unified = sseq1.last.unify(sseq2.last.members) unless sseq1.last.is_a?(String) || sseq2.last.is_a?(String)
+        sseq1[0...-1] << unified if unified
+      end
+    end
+  end
+end

data/lib/sass/selector/simple.rb

@@ -0,0 +1,107 @@
+module Sass
+  module Selector
+    # The abstract superclass for simple selectors
+    # (that is, those that don't compose multiple selectors).
+    class Simple
+      # The line of the Sass template on which this selector was declared.
+      #
+      # @return [Fixnum]
+      attr_accessor :line
+
+      # The name of the file in which this selector was declared,
+      # or `nil` if it was not declared in a file (e.g. on stdin).
+      #
+      # @return [String, nil]
+      attr_accessor :filename
+
+      # Returns a representation of the node
+      # as an array of strings and potentially {Sass::Script::Node}s
+      # (if there's interpolation in the selector).
+      # When the interpolation is resolved and the strings are joined together,
+      # this will be the string representation of this node.
+      #
+      # @return [Array<String, Sass::Script::Node>]
+      def to_a
+        raise NotImplementedError.new("All subclasses of Sass::Selector::Simple must override #to_a.")
+      end
+
+      # Returns a string representation of the node.
+      # This is basically the selector string.
+      #
+      # @return [String]
+      def inspect
+        to_a.map {|e| e.is_a?(Sass::Script::Node) ? "\#{#{e.to_sass}}" : e}.join
+      end
+
+      # Returns a hash code for this selector object.
+      #
+      # By default, this is based on the value of \{#to\_a},
+      # so if that contains information irrelevant to the identity of the selector,
+      # this should be overridden.
+      #
+      # @return [Fixnum]
+      def hash
+        to_a.hash
+      end
+
+      # Checks equality between this and another object.
+      #
+      # By default, this is based on the value of \{#to\_a},
+      # so if that contains information irrelevant to the identity of the selector,
+      # this should be overridden.
+      #
+      # @param other [Object] The object to test equality against
+      # @return [Boolean] Whether or not this is equal to `other`
+      def eql?(other)
+        other.class == self.class && other.to_a.eql?(to_a)
+      end
+
+      # Unifies this selector with a {SimpleSequence}'s {SimpleSequence#members members array},
+      # returning another `SimpleSequence` members array
+      # that matches both this selector and the input selector.
+      #
+      # By default, this just appends this selector to the end of the array
+      # (or returns the original array if this selector already exists in it).
+      #
+      # @param sels [Array<Simple>] A {SimpleSequence}'s {SimpleSequence#members members array}
+      # @return [Array<Simple>, nil] A {SimpleSequence} {SimpleSequence#members members array}
+      #   matching both `sels` and this selector,
+      #   or `nil` if this is impossible (e.g. unifying `#foo` and `#bar`)
+      # @raise [Sass::SyntaxError] If this selector cannot be unified.
+      #   This will only ever occur when a dynamic selector,
+      #   such as {Parent} or {Interpolation}, is used in unification.
+      #   Since these selectors should be resolved
+      #   by the time extension and unification happen,
+      #   this exception will only ever be raised as a result of programmer error
+      def unify(sels)
+        return sels if sels.any? {|sel2| eql?(sel2)}
+        if sels.last.is_a?(Pseudo) && sels.last.type == :element
+          return sels[0...-1] + [self, sels.last]
+        end
+        sels + [self]
+      end
+
+      protected
+
+      # Unifies two namespaces,
+      # returning a namespace that works for both of them if possible.
+      #
+      # @param ns1 [String, nil] The first namespace.
+      #   `nil` means none specified, e.g. `foo`.
+      #   The empty string means no namespace specified, e.g. `|foo`.
+      #   `"*"` means any namespace is allowed, e.g. `*|foo`.
+      # @param ns2 [String, nil] The second namespace. See `ns1`.
+      # @return [Array(String or nil, Boolean)]
+      #   The first value is the unified namespace, or `nil` for no namespace.
+      #   The second value is whether or not a namespace that works for both inputs
+      #   could be found at all.
+      #   If the second value is `false`, the first should be ignored.
+      def unify_namespaces(ns1, ns2)
+        return nil, false unless ns1 == ns2 || ns1.nil? || ns1 == ['*'] || ns2.nil? || ns2 == ['*']
+        return ns2, true if ns1 == ['*']
+        return ns1, true if ns2 == ['*']
+        return ns1 || ns2, true
+      end
+    end
+  end
+end

data/lib/sass/selector/simple_sequence.rb

@@ -0,0 +1,161 @@
+module Sass
+  module Selector
+    # A unseparated sequence of selectors
+    # that all apply to a single element.
+    # For example, `.foo#bar[attr=baz]` is a simple sequence
+    # of the selectors `.foo`, `#bar`, and `[attr=baz]`.
+    class SimpleSequence < AbstractSequence
+      # The array of individual selectors.
+      #
+      # @return [Array<Simple>]
+      attr_reader :members
+
+      # Returns the element or universal selector in this sequence,
+      # if it exists.
+      #
+      # @return [Element, Universal, nil]
+      def base
+        @base ||= (members.first if members.first.is_a?(Element) || members.first.is_a?(Universal))
+      end
+
+      # Returns the non-base selectors in this sequence.
+      #
+      # @return [Set<Simple>]
+      def rest
+        @rest ||= Set.new(base ? members[1..-1] : members)
+      end
+
+      # @param selectors [Array<Simple>] See \{#members}
+      def initialize(selectors)
+        @members = selectors
+      end
+
+      # Resolves the {Parent} selectors within this selector
+      # by replacing them with the given parent selector,
+      # handling commas appropriately.
+      #
+      # @param super_seq [Sequence] The parent selector sequence
+      # @return [Array<SimpleSequence>] This selector, with parent references resolved.
+      #   This is an array because the parent selector is itself a {Sequence}
+      # @raise [Sass::SyntaxError] If a parent selector is invalid
+      def resolve_parent_refs(super_seq)
+        # Parent selector only appears as the first selector in the sequence
+        return [self] unless @members.first.is_a?(Parent)
+
+        return super_seq.members if @members.size == 1
+        unless super_seq.members.last.is_a?(SimpleSequence)
+          raise Sass::SyntaxError.new("Invalid parent selector: " + super_seq.to_a.join)
+        end
+
+        super_seq.members[0...-1] +
+          [SimpleSequence.new(super_seq.members.last.members + @members[1..-1])]
+      end
+
+      # Non-destrucively extends this selector
+      # with the extensions specified in a hash
+      # (which should be populated via {Sass::Tree::Node#cssize}).
+      #
+      # @overload def do_extend(extends)
+      # @param extends [{Selector::Simple => Selector::Sequence}]
+      #   The extensions to perform on this selector
+      # @return [Array<Sequence>] A list of selectors generated
+      #   by extending this selector with `extends`.
+      # @see CommaSequence#do_extend
+      def do_extend(extends, supers = [])
+        seqs = extends.get(members.to_set).map do |seq, sels|
+          # If A {@extend B} and C {...},
+          # seq is A, sels is B, and self is C
+
+          self_without_sel = self.members - sels
+          next unless unified = seq.members.last.unify(self_without_sel)
+          [sels, seq.members[0...-1] + [unified]]
+        end.compact.map {|sels, seq| [sels, Sequence.new(seq)]}
+
+        seqs.map {|_, seq| seq}.concat(
+          seqs.map do |sels, seq|
+            new_seqs = seq.do_extend(extends, supers.unshift(sels))[1..-1]
+            supers.shift
+            new_seqs
+          end.flatten.uniq)
+      rescue SystemStackError
+        handle_extend_loop(supers)
+      end
+
+      # Unifies this selector with another {SimpleSequence}'s {SimpleSequence#members members array},
+      # returning another `SimpleSequence`
+      # that matches both this selector and the input selector.
+      #
+      # @param sels [Array<Simple>] A {SimpleSequence}'s {SimpleSequence#members members array}
+      # @return [SimpleSequence, nil] A {SimpleSequence} matching both `sels` and this selector,
+      #   or `nil` if this is impossible (e.g. unifying `#foo` and `#bar`)
+      # @raise [Sass::SyntaxError] If this selector cannot be unified.
+      #   This will only ever occur when a dynamic selector,
+      #   such as {Parent} or {Interpolation}, is used in unification.
+      #   Since these selectors should be resolved
+      #   by the time extension and unification happen,
+      #   this exception will only ever be raised as a result of programmer error
+      def unify(sels)
+        return unless sseq = members.inject(sels) do |sseq, sel|
+          return unless sseq
+          sel.unify(sseq)
+        end
+        SimpleSequence.new(sseq)
+      end
+
+      # @see Simple#to_a
+      def to_a
+        @members.map {|sel| sel.to_a}.flatten
+      end
+
+      # Returns a string representation of the sequence.
+      # This is basically the selector string.
+      #
+      # @return [String]
+      def inspect
+        members.map {|m| m.inspect}.join
+      end
+
+      # Returns a hash code for this sequence.
+      #
+      # @return [Fixnum]
+      def hash
+        [base, rest].hash
+      end
+
+      # Checks equality between this and another object.
+      #
+      # @param other [Object] The object to test equality against
+      # @return [Boolean] Whether or not this is equal to `other`
+      def eql?(other)
+        other.class == self.class && other.base.eql?(self.base) && other.rest.eql?(self.rest)
+      end
+
+      private
+
+      # Raise a {Sass::SyntaxError} describing a loop of `@extend` directives.
+      #
+      # @param supers [Array<Simple>] The stack of selectors that contains the loop,
+      #   ordered from deepest to most shallow.
+      # @raise [Sass::SyntaxError] Describing the loop
+      def handle_extend_loop(supers)
+        supers.inject([]) do |sseqs, sseq|
+          next sseqs.push(sseq) unless sseqs.first.eql?(sseq)
+          conses = Haml::Util.enum_cons(sseqs.push(sseq), 2).to_a
+          _, i = Haml::Util.enum_with_index(conses).max do |((_, sseq1), _), ((_, sseq2), _)|
+            sseq1.first.line <=> sseq2.first.line
+          end
+          loop = (conses[i..-1] + conses[0...i]).map do |sseq1, sseq2|
+            sel1 = SimpleSequence.new(sseq1).inspect
+            sel2 = SimpleSequence.new(sseq2).inspect
+            str = "  #{sel1} extends #{sel2} on line #{sseq2.first.line}"
+            str << " of " << sseq2.first.filename if sseq2.first.filename
+            str
+          end.join(",\n")
+          raise Sass::SyntaxError.new("An @extend loop was found:\n#{loop}")
+        end
+        # Should never get here
+        raise Sass::SyntaxError.new("An @extend loop exists, but the exact loop couldn't be found")
+      end
+    end
+  end
+end