haml 3.1.0 → 3.1.1

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

@@ -149,7 +149,7 @@ module Sass::Script
     def div(other)
       if other.is_a? Number
         res = operate(other, :/)
-        if self.original && other.original && context != :equals
+        if self.original && other.original
           res.original = "#{self.original}/#{other.original}"
         end
         res

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

@@ -66,11 +66,6 @@ module Sass::Script
       literal1 = @operand1.perform(environment)
       literal2 = @operand2.perform(environment)
 
-      if @operator == :space && 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))
       rescue NoMethodError => e

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

@@ -112,6 +112,24 @@ module Sass
         raise e
       end
 
+      # Parses the argument list for a function definition.
+      #
+      # @return [Array<Script::Node>] The root nodes of the arguments.
+      # @raise [Sass::SyntaxError] if the argument list isn't valid SassScript
+      def parse_function_definition_arglist
+        args = defn_arglist!(true)
+        assert_done
+
+        args.each do |k, v|
+          k.options = @options
+          v.options = @options if v
+        end
+        args
+      rescue Sass::SyntaxError => e
+        e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
+        raise e
+      end
+
       # Parses a SassScript expression.
       #
       # @overload parse(str, line, offset, filename = nil)
@@ -283,24 +301,23 @@ RUBY
         node(Script::Funcall.new(tok.value, args, keywords))
       end
 
-      def defn_arglist!(must_have_default)
-        return [] unless try_tok(:lparen)
+      def defn_arglist!(must_have_parens)
+        if must_have_parens
+          assert_tok(:lparen)
+        else
+          return [] unless try_tok(:lparen)
+        end
         return [] if try_tok(:rparen)
+
         res = []
+        must_have_default = false
         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))
+          if tok = try_tok(:colon)
             val = assert_expr(:space)
-
-            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.")
@@ -376,9 +393,10 @@ RUBY
         return variable unless try_tok(:lparen)
         was_in_parens = @in_parens
         @in_parens = true
-        e = assert_expr(:expr)
+        line = @lexer.line
+        e = expr
         assert_tok(:rparen)
-        return e
+        return e || node(List.new([], :space), line)
       ensure
         @in_parens = was_in_parens
       end

data/vendor/sass/lib/sass/script/string.rb

@@ -15,15 +15,6 @@ module Sass::Script
     # @return [Symbol] `:string` or `:identifier`
     attr_reader :type
 
-    # In addition to setting the \{#context} of the string,
-    # this sets the string to be an identifier if the context is `:equals`.
-    #
-    # @see Node#context=
-    def context=(context)
-      super
-      @type = :identifier if context == :equals
-    end
-
     # Creates a new string.
     #
     # @param value [String] See \{#value}
@@ -42,7 +33,7 @@ module Sass::Script
     # @see Node#to_s
     def to_s(opts = {})
       if @type == :identifier
-        return @context == :equals && @value.empty? ? %q{""} : @value.tr("\n", " ")
+        return @value.tr("\n", " ")
       end
 
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}
@@ -54,13 +45,7 @@ module Sass::Script
 
     # @see Node#to_sass
     def to_sass(opts = {})
-      if self.type == :identifier && context == :equals &&
-          self.value !~ Sass::SCSS::RX::URI &&
-          Sass::SCSS::RX.escape_ident(self.value).include?(?\\)
-        return "unquote(#{Sass::Script::String.new(self.value, :string).to_sass})"
-      else
-        return to_s
-      end
+      to_s
     end
   end
 end

data/vendor/sass/lib/sass/script/string_interpolation.rb

@@ -23,6 +23,7 @@ module Sass::Script
     # @see Node#to_sass
     def to_sass(opts = {})
       # We can get rid of all of this when we remove the deprecated :equals context
+      # XXX CE: It's gone now but I'm not sure what can be removed now.
       before_unquote, before_quote_char, before_str = parse_str(@before.to_sass(opts))
       after_unquote, after_quote_char, after_str = parse_str(@after.to_sass(opts))
       unquote = before_unquote || after_unquote ||

data/vendor/sass/lib/sass/scss/parser.rb

@@ -98,8 +98,8 @@ module Sass
         node << comment
       end
 
-      DIRECTIVES = Set[:mixin, :include, :debug, :warn, :for, :each, :while, :if,
-        :else, :extend, :import, :media, :charset]
+      DIRECTIVES = Set[:mixin, :include, :function, :return, :debug, :warn, :for,
+        :each, :while, :if, :else, :extend, :import, :media, :charset]
 
       def directive
         return unless tok(/@/)
@@ -144,6 +144,17 @@ module Sass
         node(Sass::Tree::MixinNode.new(name, args, keywords))
       end
 
+      def function_directive
+        name = tok! IDENT
+        args = sass_script(:parse_function_definition_arglist)
+        ss
+        block(node(Sass::Tree::FunctionNode.new(name, args)), :function)
+      end
+
+      def return_directive
+        node(Sass::Tree::ReturnNode.new(sass_script(:parse)))
+      end
+
       def debug_directive
         node(Sass::Tree::DebugNode.new(sass_script(:parse)))
       end
@@ -225,8 +236,7 @@ module Sass
       end
 
       def else_directive
-        raise Sass::SyntaxError.new(
-          "Invalid CSS: @else must come after @if", :line => @line)
+        err("Invalid CSS: @else must come after @if")
       end
 
       def extend_directive
@@ -365,6 +375,7 @@ module Sass
       end
 
       def block_child(context)
+        return variable || directive if context == :function
         return variable || directive || ruleset if context == :stylesheet
         variable || directive || declaration_or_ruleset
       end
@@ -391,11 +402,9 @@ module Sass
       # no colon after the identifier, whitespace after the colon),
       # but I'm not sure the gains would be worth the added complexity.
       def declaration_or_ruleset
-        pos = @scanner.pos
-        line = @line
         old_use_property_exception, @use_property_exception =
           @use_property_exception, false
-        begin
+        decl_err = catch_error do
           decl = declaration
           unless decl && decl.has_children
             # We want an exception if it's not there,
@@ -403,17 +412,10 @@ module Sass
             tok!(/[;}]/) unless tok?(/[;}]/)
           end
           return decl
-        rescue Sass::SyntaxError => decl_err
         end
 
-        @line = line
-        @scanner.pos = pos
-
-        begin
-          return ruleset
-        rescue Sass::SyntaxError => ruleset_err
-          raise @use_property_exception ? decl_err : ruleset_err
-        end
+        ruleset_err = catch_error {return ruleset}
+        rethrow(@use_property_exception ? decl_err : ruleset_err)
       ensure
         @use_property_exception = old_use_property_exception
       end
@@ -636,9 +638,11 @@ MESSAGE
         tok!(/:/)
         space, value = value!
         ss
+        important = tok(IMPORTANT)
+        ss
         require_block = tok?(/\{/)
 
-        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, :new))
+        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, !!important, :new))
 
         return node unless require_block
         nested_properties! node, space
@@ -672,7 +676,7 @@ MESSAGE
       end
 
       def nested_properties!(node, space)
-        raise Sass::SyntaxError.new(<<MESSAGE, :line => @line) unless space
+        err(<<MESSAGE) unless space
 Invalid CSS: a space is required between a property and its definition
 when it has other properties nested beneath it.
 MESSAGE
@@ -786,6 +790,9 @@ MESSAGE
         result = parser.send(*args)
         @line = parser.line
         result
+      rescue Sass::SyntaxError => e
+        throw(:_sass_parser_error, true) if @throw_error
+        raise e
       end
 
       def merge(arr)
@@ -832,9 +839,42 @@ MESSAGE
       end
 
       def expected(name)
+        throw(:_sass_parser_error, true) if @throw_error
         self.class.expected(@scanner, @expected || name, @line)
       end
 
+      def err(msg)
+        throw(:_sass_parser_error, true) if @throw_error
+        raise Sass::SyntaxError.new(msg, :line => @line)
+      end
+
+      def catch_error(&block)
+        old_throw_error, @throw_error = @throw_error, true
+        pos = @scanner.pos
+        line = @line
+        expected = @expected
+        if catch(:_sass_parser_error, &block)
+          @scanner.pos = pos
+          @line = line
+          @expected = expected
+          {:pos => pos, :line => line, :expected => @expected, :block => block}
+        end
+      ensure
+        @throw_error = old_throw_error
+      end
+
+      def rethrow(err)
+        if @throw_err
+          throw :_sass_parser_error, err
+        else
+          @scanner = StringScanner.new(@scanner.string)
+          @scanner.pos = err[:pos]
+          @line = err[:line]
+          @expected = err[:expected]
+          err[:block].call
+        end
+      end
+
       # @private
       def self.expected(scanner, expected, line)
         pos = scanner.pos

data/vendor/sass/lib/sass/scss/rx.rb

@@ -68,6 +68,7 @@ module Sass
       URLCHAR  = /[#%&*-~]|#{NONASCII}|#{ESCAPE}/
       URL      = /(#{URLCHAR}*)/
       W        = /[ \t\r\n\f]*/
+      VARIABLE = /(\$)(#{Sass::SCSS::RX::IDENT})/
 
       # This is more liberal than the spec's definition,
       # but that definition didn't work well with the greediness rules
@@ -118,7 +119,7 @@ module Sass
       # We could use it for 1.9 only, but I don't want to introduce a cross-version
       # behavior difference.
       # In any case, almost all CSS idents will be matched by this.
-      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important)+(?=[;}])/i
+      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|\s(?!%)|#[a-f0-9]|[,%]|#{NUM})+(?=[;}])/i
 
       STATIC_SELECTOR = /(#{NMCHAR}|\s|[,>+*]|[:#.]#{NMSTART})+(?=[{])/i
     end

data/vendor/sass/lib/sass/scss/script_lexer.rb

@@ -8,7 +8,7 @@ module Sass
 
       def variable
         return [:raw, "!important"] if scan(Sass::SCSS::RX::IMPORTANT)
-        _variable(/(\$)(#{Sass::SCSS::RX::IDENT})/)
+        _variable(Sass::SCSS::RX::VARIABLE)
       end
     end
   end

data/vendor/sass/lib/sass/selector/comma_sequence.rb

@@ -38,9 +38,8 @@ module Sass
           end.flatten)
       end
 
-      # Non-destrucively extends this selector
-      # with the extensions specified in a hash
-      # (which should be populated via {Sass::Tree::Node#cssize}).
+      # Non-destrucively extends this selector with the extensions specified in a hash
+      # (which should come from {Sass::Tree::Visitors::Cssize}).
       #
       # @todo Link this to the reference documentation on `@extend`
       #   when such a thing exists.

data/vendor/sass/lib/sass/selector/sequence.rb

@@ -65,9 +65,8 @@ module Sass
           end.flatten)
       end
 
-      # Non-destructively extends this selector
-      # with the extensions specified in a hash
-      # (which should be populated via {Sass::Tree::Node#cssize}).
+      # Non-destructively extends this selector with the extensions specified in a hash
+      # (which should come from {Sass::Tree::Visitors::Cssize}).
       #
       # @overload def do_extend(extends)
       # @param extends [Sass::Util::SubsetMap{Selector::Simple => Selector::Sequence}]
@@ -104,9 +103,7 @@ module Sass
       # @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 = Sass::Util.intersperse(ary, " ")
-        ary = Sass::Util.substitute(ary, [" ", "\n", " "], ["\n"])
-        ary.flatten.compact
+        Sass::Util.intersperse(ary, " ").flatten.compact
       end
 
       # Returns a string representation of the sequence.

data/vendor/sass/lib/sass/selector/simple_sequence.rb

@@ -51,9 +51,8 @@ module Sass
           [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}).
+      # Non-destrucively extends this selector with the extensions specified in a hash
+      # (which should come from {Sass::Tree::Visitors::Cssize}).
       #
       # @overload def do_extend(extends)
       # @param extends [{Selector::Simple => Selector::Sequence}]

data/vendor/sass/lib/sass/tree/charset_node.rb

@@ -18,20 +18,5 @@ module Sass::Tree
     def invisible?
       !Sass::Util.ruby1_8?
     end
-
-    protected
-
-    # @see Node#to_src
-    def to_src(tabs, opts, fmt)
-      "#{'  ' * tabs}@charset \"#{name}\"#{semi fmt}\n"
-    end
-
-    # Computes the CSS for the directive.
-    #
-    # @param tabs [Fixnum] The level of indentation for the CSS
-    # @return [String] The resulting CSS
-    def _to_s(tabs)
-      "@charset \"#{name}\";"
-    end
   end
 end

data/vendor/sass/lib/sass/tree/comment_node.rb

@@ -10,6 +10,14 @@ module Sass::Tree
     # @return [String]
     attr_accessor :value
 
+    # Whether the comment is loud.
+    #
+    # Loud comments start with ! and force the comment to be generated
+    # irrespective of compilation settings or the comment syntax used.
+    #
+    # @return [Boolean]
+    attr_accessor :loud
+
     # Whether or not the comment is silent (that is, doesn't output to CSS).
     #
     # @return [Boolean]
@@ -19,8 +27,10 @@ module Sass::Tree
     # @param silent [Boolean] See \{#silent}
     def initialize(value, silent)
       @lines = []
-      @value = normalize_indentation value
       @silent = silent
+      @value = normalize_indentation value
+      @loud = @value =~ %r{^(/[\/\*])?!}
+      @value.sub!("#{$1}!", $1.to_s) if @loud
       super()
     end
 
@@ -36,81 +46,20 @@ module Sass::Tree
     # Returns `true` if this is a silent comment
     # or the current style doesn't render comments.
     #
+    # Comments starting with ! are never invisible (and the ! is removed from the output.)
+    #
     # @return [Boolean]
     def invisible?
-      style == :compressed || @silent
-    end
-
-    # @see Node#to_sass
-    def to_sass(tabs, opts = {})
-      content = value.gsub(/\*\/$/, '').rstrip
-      if content =~ /\A[ \t]/
-        # Re-indent SCSS comments like this:
-        #     /* foo
-        #   bar
-        #       baz */
-        content.gsub!(/^/, '   ')
-        content.sub!(/\A([ \t]*)\/\*/, '/*\1')
-      end
-
-      content =
-        unless content.include?("\n")
-          content
-        else
-          content.gsub!(/\n( \*|\/\/)/, "\n  ")
-          spaces = content.scan(/\n( *)/).map {|s| s.first.size}.min
-          sep = silent ? "\n//" : "\n *"
-          if spaces >= 2
-            content.gsub(/\n  /, sep)
-          else
-            content.gsub(/\n#{' ' * spaces}/, sep)
-          end
-        end
-
-      content.gsub!(/\A\/\*/, '//') if silent
-      content.gsub!(/^/, '  ' * tabs)
-      content.rstrip + "\n"
-    end
-
-    # @see Node#to_scss
-    def to_scss(tabs, opts = {})
-      spaces = ('  ' * [tabs - value[/^ */].size, 0].max)
-      if silent
-        value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
+      if @loud
+        return false
       else
-        value
-      end.gsub(/^/, spaces) + "\n"
-    end
-
-    protected
-
-    # Computes the CSS for the comment.
-    #
-    # Returns `nil` if this is a silent comment
-    # or the current style doesn't render comments.
-    #
-    # @overload to_s(tabs = 0)
-    # @param tabs [Fixnum] The level of indentation for the CSS
-    # @return [String, nil] The resulting CSS
-    # @see #invisible?
-    def _to_s(tabs = 0, _ = nil)
-      return if invisible?
-      spaces = ('  ' * [tabs - 1 - value[/^ */].size, 0].max)
-
-      content = value.gsub(/^/, spaces)
-      content.gsub!(/\n +(\* *(?!\/))?/, ' ') if style == :compact
-      content
+        @silent || (style == :compressed)
+      end
     end
 
-    # Removes this node from the tree if it's a silent comment.
-    #
-    # @param environment [Sass::Environment] The lexical environment containing
-    #   variable and mixin values
-    # @return [Tree::Node, Array<Tree::Node>] The resulting static nodes
-    # @see Sass::Tree
-    def _perform(environment)
-      return [] if @silent
-      self
+    # Returns whether this comment should be interpolated for dynamic comment generation.
+    def evaluated?
+      @loud
     end
 
     private