sass 3.4.0 → 3.4.25

data/lib/sass/script/functions.rb

@@ -123,7 +123,7 @@ module Sass::Script
   # : Inserts `$insert` into `$string` at `$index`.
   #
   # \{#str_index str-index($string, $substring)}
-  # : Returns the index of the first occurance of `$substring` in `$string`.
+  # : Returns the index of the first occurrence of `$substring` in `$string`.
   #
   # \{#str_slice str-slice($string, $start-at, [$end-at])}
   # : Extracts a substring from `$string`.
@@ -162,6 +162,9 @@ module Sass::Script
   #
   # ## List Functions {#list-functions}
   #
+  # Lists in Sass are immutable; all list functions return a new list rather
+  # than updating the existing list in-place.
+  #
   # All list functions work for maps as well, treating them as lists of pairs.
   #
   # \{#length length($list)}
@@ -170,6 +173,9 @@ module Sass::Script
   # \{#nth nth($list, $n)}
   # : Returns a specific item in a list.
   #
+  # \{#set-nth set-nth($list, $n, $value)}
+  # : Replaces the nth item in a list.
+  #
   # \{#join join($list1, $list2, \[$separator\])}
   # : Joins together two lists into one.
   #
@@ -182,11 +188,14 @@ module Sass::Script
   # \{#index index($list, $value)}
   # : Returns the position of a value within a list.
   #
-  # \{#list_separator list-separator(#list)}
+  # \{#list_separator list-separator($list)}
   # : Returns the separator of a list.
   #
   # ## Map Functions {#map-functions}
   #
+  # Maps in Sass are immutable; all map functions return a new map rather than
+  # updating the existing map in-place.
+  #
   # \{#map_get map-get($map, $key)}
   # : Returns the value in a map associated with a given key.
   #
@@ -214,7 +223,7 @@ module Sass::Script
   # for selector arguments. They can take a plain string, a list of
   # lists as returned by `&` or anything in between:
   #
-  # * A plain sring, such as `".foo .bar, .baz .bang"`.
+  # * A plain string, such as `".foo .bar, .baz .bang"`.
   # * A space-separated list of strings such as `(".foo" ".bar")`.
   # * A comma-separated list of strings such as `(".foo .bar", ".baz .bang")`.
   # * A comma-separated list of space-separated lists of strings such
@@ -347,6 +356,7 @@ module Sass::Script
   #
   # @comment
   #   rubocop:enable LineLength
+  #   rubocop:disable ModuleLength
   module Functions
     @signatures = {}
 
@@ -421,8 +431,8 @@ module Sass::Script
     # If no signatures match, the first signature is returned for error messaging.
     #
     # @param method_name [Symbol] The name of the Ruby function to be called.
-    # @param arg_arity [Fixnum] The number of unnamed arguments the function was passed.
-    # @param kwarg_arity [Fixnum] The number of keyword arguments the function was passed.
+    # @param arg_arity [Integer] The number of unnamed arguments the function was passed.
+    # @param kwarg_arity [Integer] The number of keyword arguments the function was passed.
     #
     # @return [{Symbol => Object}, nil]
     #   The signature options for the matching signature,
@@ -445,8 +455,8 @@ module Sass::Script
           t_arg_arity = sig_arity
         end
 
-        if   (t_arg_arity == sig_arity ||   t_arg_arity > sig_arity && signature.var_args) &&
-           (t_kwarg_arity == 0         || t_kwarg_arity > 0         && signature.var_kwargs)
+        if (t_arg_arity == sig_arity || t_arg_arity > sig_arity && signature.var_args) &&
+           (t_kwarg_arity == 0 || t_kwarg_arity > 0 && signature.var_kwargs)
           return signature
         end
       end
@@ -479,8 +489,7 @@ module Sass::Script
       include Value::Helpers
 
       # The human-readable names for [Sass::Script::Value::Base]. The default is
-      # just the downcased name of the type. The default is the downcased type
-      # name.
+      # just the downcased name of the type.
       TYPE_NAMES = {:ArgList => 'variable argument list'}
 
       # The environment for this function. This environment's
@@ -518,10 +527,14 @@ module Sass::Script
       # @raise [ArgumentError] if value is not of the correct type.
       def assert_type(value, type, name = nil)
         klass = Sass::Script::Value.const_get(type)
-        return if value.is_a?(klass)
+        if value.is_a?(klass)
+          value.check_deprecated_interp if type == :String
+          return
+        end
+
         return if value.is_a?(Sass::Script::Value::List) && type == :Map && value.value.empty?
         err = "#{value.inspect} is not a #{TYPE_NAMES[type] || type.to_s.downcase}"
-        err = "$#{name.to_s.gsub('_', '-')}: " + err if name
+        err = "$#{name.to_s.tr('_', '-')}: " + err if name
         raise ArgumentError.new(err)
       end
 
@@ -622,11 +635,14 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if any parameter is the wrong type or out of bounds
     def rgb(red, green, blue)
+      if calc?(red) || calc?(green) || calc?(blue)
+        return unquoted_string("rgb(#{red}, #{green}, #{blue})")
+      end
       assert_type red, :Number, :red
       assert_type green, :Number, :green
       assert_type blue, :Number, :blue
 
-      color_attrs = [[red, :red], [green, :green], [blue, :blue]].map do |(c, name)|
+      color_attrs = [red, green, blue].map do |c|
         if c.is_unit?("%")
           c.value * 255 / 100.0
         elsif c.unitless?
@@ -649,11 +665,11 @@ module Sass::Script
     #
     # @overload rgba($red, $green, $blue, $alpha)
     #   @param $red [Sass::Script::Value::Number] The amount of red in the
-    #     color. Must be between 0 and 255 inclusive
+    #     color. Must be between 0 and 255 inclusive or 0% and 100% inclusive
     #   @param $green [Sass::Script::Value::Number] The amount of green in the
-    #     color. Must be between 0 and 255 inclusive
+    #     color. Must be between 0 and 255 inclusive or 0% and 100% inclusive
     #   @param $blue [Sass::Script::Value::Number] The amount of blue in the
-    #     color. Must be between 0 and 255 inclusive
+    #     color. Must be between 0 and 255 inclusive or 0% and 100% inclusive
     #   @param $alpha [Sass::Script::Value::Number] The opacity of the color.
     #     Must be between 0 and 1 inclusive
     #   @return [Sass::Script::Value::Color]
@@ -680,12 +696,20 @@ module Sass::Script
         color, alpha = args
 
         assert_type color, :Color, :color
-        assert_type alpha, :Number, :alpha
-
-        color.with(:alpha => alpha.value)
+        if calc?(alpha)
+          unquoted_string("rgba(#{color.red}, #{color.green}, #{color.blue}, #{alpha})")
+        else
+          assert_type alpha, :Number, :alpha
+          check_alpha_unit alpha, 'rgba'
+          color.with(:alpha => alpha.value)
+        end
       when 4
         red, green, blue, alpha = args
-        rgba(rgb(red, green, blue), alpha)
+        if calc?(red) || calc?(green) || calc?(blue) || calc?(alpha)
+          unquoted_string("rgba(#{red}, #{green}, #{blue}, #{alpha})")
+        else
+          rgba(rgb(red, green, blue), alpha)
+        end
       else
         raise ArgumentError.new("wrong number of arguments (#{args.size} for 4)")
       end
@@ -710,7 +734,11 @@ module Sass::Script
     # @raise [ArgumentError] if `$saturation` or `$lightness` are out of bounds
     #   or any parameter is the wrong type
     def hsl(hue, saturation, lightness)
-      hsla(hue, saturation, lightness, number(1))
+      if calc?(hue) || calc?(saturation) || calc?(lightness)
+        unquoted_string("hsl(#{hue}, #{saturation}, #{lightness})")
+      else
+        hsla(hue, saturation, lightness, number(1))
+      end
     end
     declare :hsl, [:hue, :saturation, :lightness]
 
@@ -734,10 +762,14 @@ module Sass::Script
     # @raise [ArgumentError] if `$saturation`, `$lightness`, or `$alpha` are out
     #   of bounds or any parameter is the wrong type
     def hsla(hue, saturation, lightness, alpha)
+      if calc?(hue) || calc?(saturation) || calc?(lightness) || calc?(alpha)
+        return unquoted_string("hsla(#{hue}, #{saturation}, #{lightness}, #{alpha})")
+      end
       assert_type hue, :Number, :hue
       assert_type saturation, :Number, :saturation
       assert_type lightness, :Number, :lightness
       assert_type alpha, :Number, :alpha
+      check_alpha_unit alpha, 'hsla'
 
       h = hue.value
       s = saturation.value
@@ -869,7 +901,7 @@ module Sass::Script
              a.value =~ /^[a-zA-Z]+\s*=/
          end
         # Support the proprietary MS alpha() function
-        return identifier("alpha(#{args.map {|a| a.to_s}.join(", ")})")
+        return identifier("alpha(#{args.map {|a| a.to_s}.join(', ')})")
       end
 
       raise ArgumentError.new("wrong number of arguments (#{args.size} for 1)") if args.size != 1
@@ -1053,7 +1085,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$color` isn't a color
     def ie_hex_str(color)
       assert_type color, :Color, :color
-      alpha = (color.alpha * 255).round.to_s(16).rjust(2, '0')
+      alpha = Sass::Util.round(color.alpha * 255).to_s(16).rjust(2, '0')
       identifier("##{alpha}#{color.send(:hex_str)[1..-1]}".upcase)
     end
     declare :ie_hex_str, [:color]
@@ -1071,11 +1103,7 @@ module Sass::Script
     #   adjust-color(#102030, $blue: 5) => #102035
     #   adjust-color(#102030, $red: -5, $blue: 5) => #0b2035
     #   adjust-color(hsl(25, 100%, 80%), $lightness: -30%, $alpha: -0.4) => hsla(25, 100%, 50%, 0.6)
-    # @comment
-    #   rubocop:disable LineLength
     # @overload adjust_color($color, [$red], [$green], [$blue], [$hue], [$saturation], [$lightness], [$alpha])
-    #   @comment
-    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number] The adjustment to make on the
     #     red component, between -255 and 255 inclusive
@@ -1098,15 +1126,14 @@ module Sass::Script
     def adjust_color(color, kwargs)
       assert_type color, :Color, :color
       with = Sass::Util.map_hash(
-          "red" => [-255..255, ""],
-          "green" => [-255..255, ""],
-          "blue" => [-255..255, ""],
-          "hue" => nil,
-          "saturation" => [-100..100, "%"],
-          "lightness" => [-100..100, "%"],
-          "alpha" => [-1..1, ""]
-        ) do |name, (range, units)|
-
+        "red" => [-255..255, ""],
+        "green" => [-255..255, ""],
+        "blue" => [-255..255, ""],
+        "hue" => nil,
+        "saturation" => [-100..100, "%"],
+        "lightness" => [-100..100, "%"],
+        "alpha" => [-1..1, ""]
+      ) do |name, (range, units)|
         val = kwargs.delete(name)
         next unless val
         assert_type val, :Number, name
@@ -1152,11 +1179,7 @@ module Sass::Script
     #   scale-color(hsl(120, 70%, 80%), $lightness: 50%) => hsl(120, 70%, 90%)
     #   scale-color(rgb(200, 150%, 170%), $green: -40%, $blue: 70%) => rgb(200, 90, 229)
     #   scale-color(hsl(200, 70%, 80%), $saturation: -90%, $alpha: -30%) => hsla(200, 7%, 80%, 0.7)
-    # @comment
-    #   rubocop:disable LineLength
     # @overload scale_color($color, [$red], [$green], [$blue], [$saturation], [$lightness], [$alpha])
-    #   @comment
-    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number]
     #   @param $green [Sass::Script::Value::Number]
@@ -1171,14 +1194,13 @@ module Sass::Script
     def scale_color(color, kwargs)
       assert_type color, :Color, :color
       with = Sass::Util.map_hash(
-          "red" => 255,
-          "green" => 255,
-          "blue" => 255,
-          "saturation" => 100,
-          "lightness" => 100,
-          "alpha" => 1
-        ) do |name, max|
-
+        "red" => 255,
+        "green" => 255,
+        "blue" => 255,
+        "saturation" => 100,
+        "lightness" => 100,
+        "alpha" => 1
+      ) do |name, max|
         val = kwargs.delete(name)
         next unless val
         assert_type val, :Number, name
@@ -1213,11 +1235,7 @@ module Sass::Script
     #   change-color(#102030, $blue: 5) => #102005
     #   change-color(#102030, $red: 120, $blue: 5) => #782005
     #   change-color(hsl(25, 100%, 80%), $lightness: 40%, $alpha: 0.8) => hsla(25, 100%, 40%, 0.8)
-    # @comment
-    #   rubocop:disable LineLength
     # @overload change_color($color, [$red], [$green], [$blue], [$hue], [$saturation], [$lightness], [$alpha])
-    #   @comment
-    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number] The new red component for the
     #     color, within 0 and 255 inclusive
@@ -1287,7 +1305,7 @@ module Sass::Script
     #   @param $color1 [Sass::Script::Value::Color]
     #   @param $color2 [Sass::Script::Value::Color]
     #   @param $weight [Sass::Script::Value::Number] The relative weight of each
-    #     color. Closer to `0%` gives more weight to `$color`, closer to `100%`
+    #     color. Closer to `100%` gives more weight to `$color1`, closer to `0%`
     #     gives more weight to `$color2`
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$weight` is out of bounds or any parameter is
@@ -1393,11 +1411,27 @@ module Sass::Script
     # @return [Sass::Script::Value::String]
     # @raise [ArgumentError] if `$string` isn't a string
     def unquote(string)
-      if string.is_a?(Sass::Script::Value::String) && string.type != :identifier
-        identifier(string.value)
-      else
-        string
+      unless string.is_a?(Sass::Script::Value::String)
+        # Don't warn multiple times for the same source line.
+        # rubocop:disable GlobalVars
+        $_sass_warned_for_unquote ||= Set.new
+        frame = environment.stack.frames.last
+        key = [frame.filename, frame.line] if frame
+        return string if frame && $_sass_warned_for_unquote.include?(key)
+        $_sass_warned_for_unquote << key if frame
+        # rubocop:enable GlobalVars
+
+        Sass::Util.sass_warn(<<MESSAGE.strip)
+DEPRECATION WARNING: Passing #{string.to_sass}, a non-string value, to unquote()
+will be an error in future versions of Sass.
+#{environment.stack.to_s.gsub(/^/, ' ' * 8)}
+MESSAGE
+        return string
       end
+
+      string.check_deprecated_interp
+      return string if string.type == :identifier
+      identifier(string.value)
     end
     declare :unquote, [:string]
 
@@ -1461,10 +1495,10 @@ module Sass::Script
       assert_type insert, :String, :insert
       assert_integer index, :index
       assert_unit index, nil, :index
-      insertion_point = if index.value > 0
-                          [index.value - 1, original.value.size].min
+      insertion_point = if index.to_i > 0
+                          [index.to_i - 1, original.value.size].min
                         else
-                          [index.value, -original.value.size - 1].max
+                          [index.to_i, -original.value.size - 1].max
                         end
       result = original.value.dup.insert(insertion_point, insert.value)
       Sass::Script::Value::String.new(result, original.type)
@@ -1512,7 +1546,7 @@ module Sass::Script
     #   @param $start-at [Sass::Script::Value::Number] The index of the first
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`
-    #   @param $end-before [Sass::Script::Value::Number] The index of the last
+    #   @param $end-at [Sass::Script::Value::Number] The index of the last
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`. Defaults to -1
     #   @return [Sass::Script::Value::String] The substring. This will be quoted
@@ -1531,7 +1565,7 @@ module Sass::Script
       s = string.value.length + s if s < 0
       s = 0 if s < 0
       e = string.value.length + e if e < 0
-      e = 0 if s < 0
+      return Sass::Script::Value::String.new("", string.type) if e < 0
       extracted = string.value.slice(s..e)
       Sass::Script::Value::String.new(extracted || "", string.type)
     end
@@ -1549,7 +1583,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$string` isn't a string
     def to_upper_case(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value.upcase, string.type)
+      Sass::Script::Value::String.new(Sass::Util.upcase(string.value), string.type)
     end
     declare :to_upper_case, [:string]
 
@@ -1564,7 +1598,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$string` isn't a string
     def to_lower_case(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value.downcase, string.type)
+      Sass::Script::Value::String.new(Sass::Util.downcase(string.value), string.type)
     end
     declare :to_lower_case, [:string]
 
@@ -1577,11 +1611,13 @@ module Sass::Script
     #   type-of(true)   => bool
     #   type-of(#fff)   => color
     #   type-of(blue)   => color
+    #   type-of(null)   => null
     # @overload type_of($value)
     #   @param $value [Sass::Script::Value::Base] The value to inspect
     # @return [Sass::Script::Value::String] The unquoted string name of the
     #   value's type
     def type_of(value)
+      value.check_deprecated_interp if value.is_a?(Sass::Script::Value::String)
       identifier(value.class.name.gsub(/Sass::Script::Value::/, '').downcase)
     end
     declare :type_of, [:value]
@@ -1697,7 +1733,7 @@ module Sass::Script
     # @return [Sass::Script::Value::Number]
     # @raise [ArgumentError] if `$number` isn't a number
     def round(number)
-      numeric_transformation(number) {|n| n.round}
+      numeric_transformation(number) {|n| Sass::Util.round(n)}
     end
     declare :round, [:number]
 
@@ -1860,6 +1896,9 @@ module Sass::Script
     # list. If both lists have fewer than two items, spaces are used for the
     # resulting list.
     #
+    # Like all list functions, `join()` returns a new list rather than modifying
+    # its arguments in place.
+    #
     # @example
     #   join(10px 20px, 30px 40px) => 10px 20px 30px 40px
     #   join((blue, red), (#abc, #def)) => blue, red, #abc, #def
@@ -1875,7 +1914,7 @@ module Sass::Script
     # @return [Sass::Script::Value::List]
     def join(list1, list2, separator = identifier("auto"))
       assert_type separator, :String, :separator
-      unless %w[auto space comma].include?(separator.value)
+      unless %w(auto space comma).include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
       sep = if separator.value == 'auto'
@@ -1893,6 +1932,9 @@ module Sass::Script
     # Unless the `$separator` argument is passed, if the list had only one item,
     # the resulting list will be space-separated.
     #
+    # Like all list functions, `append()` returns a new list rather than
+    # modifying its argument in place.
+    #
     # @example
     #   append(10px 20px, 30px) => 10px 20px 30px
     #   append((blue, red), green) => blue, red, green
@@ -1908,7 +1950,7 @@ module Sass::Script
     # @return [Sass::Script::Value::List]
     def append(list, val, separator = identifier("auto"))
       assert_type separator, :String, :separator
-      unless %w[auto space comma].include?(separator.value)
+      unless %w(auto space comma).include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
       sep = if separator.value == 'auto'
@@ -2016,6 +2058,9 @@ module Sass::Script
     # same order as in `$map1`. New keys from `$map2` will be placed at the end
     # of the map.
     #
+    # Like all map functions, `map-merge()` returns a new map rather than
+    # modifying its arguments in place.
+    #
     # @example
     #   map-merge(("foo": 1), ("bar": 2)) => ("foo": 1, "bar": 2)
     #   map-merge(("foo": 1, "bar": 2), ("bar": 3)) => ("foo": 1, "bar": 3)
@@ -2033,6 +2078,9 @@ module Sass::Script
 
     # Returns a new map with keys removed.
     #
+    # Like all map functions, `map-merge()` returns a new map rather than
+    # modifying its arguments in place.
+    #
     # @example
     #   map-remove(("foo": 1, "bar": 2), "bar") => ("foo": 1)
     #   map-remove(("foo": 1, "bar": 2, "baz": 3), "bar", "baz") => ("foo": 1)
@@ -2216,6 +2264,7 @@ module Sass::Script
     # @example
     #   $a-false-value: false;
     #   variable-exists(a-false-value) => true
+    #   variable-exists(a-null-value) => true
     #
     #   variable-exists(nonexistent) => false
     #
@@ -2236,6 +2285,7 @@ module Sass::Script
     # @example
     #   $a-false-value: false;
     #   global-variable-exists(a-false-value) => true
+    #   global-variable-exists(a-null-value) => true
     #
     #   .foo {
     #     $some-var: false;
@@ -2298,6 +2348,7 @@ module Sass::Script
     # @return [Sass::Script::Value::String] A representation of the value as
     #   it would be written in Sass.
     def inspect(value)
+      value.check_deprecated_interp if value.is_a?(Sass::Script::Value::String)
       unquoted_string(value.to_sass)
     end
     declare :inspect, [:value]
@@ -2306,7 +2357,7 @@ module Sass::Script
     #   Return a decimal between 0 and 1, inclusive of 0 but not 1.
     #   @return [Sass::Script::Value::Number] A decimal value.
     # @overload random($limit)
-    #   Return an integer between 1 and `$limit`, inclusive of 1 but not `$limit`.
+    #   Return an integer between 1 and `$limit`, inclusive of both 1 and `$limit`.
     #   @param $limit [Sass::Script::Value::Number] The maximum of the random integer to be
     #     returned, a positive integer.
     #   @return [Sass::Script::Value::Number] An integer.
@@ -2315,10 +2366,10 @@ module Sass::Script
       generator = Sass::Script::Functions.random_number_generator
       if limit
         assert_integer limit, "limit"
-        if limit.value < 1
+        if limit.to_i < 1
           raise ArgumentError.new("$limit #{limit} must be greater than or equal to 1")
         end
-        number(1 + generator.rand(limit.value))
+        number(1 + generator.rand(limit.to_i))
       else
         number(generator.rand)
       end
@@ -2371,7 +2422,7 @@ module Sass::Script
       end
 
       parsed = [parse_selector(selectors.first, :selectors)]
-      parsed += selectors[1..-1].map {|sel| parse_selector(sel, :selectors, !!:parse_parent_ref)}
+      parsed += selectors[1..-1].map {|sel| parse_selector(sel, :selectors, true)}
       parsed.inject {|result, child| child.resolve_parent_refs(result)}.to_sass_script
     end
     declare :selector_nest, [], :var_args => true
@@ -2459,7 +2510,7 @@ module Sass::Script
 
       extends = Sass::Util::SubsetMap.new
       begin
-        extender.populate_extends(extends, extendee)
+        extender.populate_extends(extends, extendee, nil, [], true)
         selector.do_extend(extends).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)
@@ -2502,8 +2553,8 @@ module Sass::Script
 
       extends = Sass::Util::SubsetMap.new
       begin
-        replacement.populate_extends(extends, original)
-        selector.do_extend(extends, [], !!:replace).to_sass_script
+        replacement.populate_extends(extends, original, nil, [], true)
+        selector.do_extend(extends, [], true).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)
       end
@@ -2622,5 +2673,21 @@ module Sass::Script
 
       color.with(attr => color.send(attr).send(op, amount.value))
     end
+
+    def check_alpha_unit(alpha, function)
+      return if alpha.unitless?
+
+      if alpha.is_unit?("%")
+        Sass::Util.sass_warn(<<WARNING)
+DEPRECATION WARNING: Passing a percentage as the alpha value to #{function}() will be
+interpreted differently in future versions of Sass. For now, use #{alpha.value} instead.
+WARNING
+      else
+        Sass::Util.sass_warn(<<WARNING)
+DEPRECATION WARNING: Passing a number with units as the alpha value to #{function}() is
+deprecated and will be an error in future versions of Sass. Use #{alpha.value} instead.
+WARNING
+      end
+    end
   end
 end