haml 3.0.4 → 3.0.5

data/lib/sass/environment.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Sass
   # The lexical environment for SassScript.
   # This keeps track of variable and mixin definitions.
@@ -24,6 +26,7 @@ module Sass
       @mixins = {}
       @parent = parent
       @stack = [] unless parent
+      @mixins_in_use = Set.new unless parent
       set_var("important", Script::String.new("!important")) unless @parent
     end
 
@@ -56,6 +59,7 @@ module Sass
       else
         stack.push(frame_info)
       end
+      mixins_in_use << stack.last[:mixin] if stack.last[:mixin] && !stack.last[:prepared]
     end
 
     # Like \{#push\_frame}, but next time a stack frame is pushed,
@@ -68,8 +72,9 @@ module Sass
 
     # Pop a stack frame from the mixin/include stack.
     def pop_frame
-      stack.pop if stack.last[:prepared]
-      stack.pop
+      stack.pop if stack.last && stack.last[:prepared]
+      popped = stack.pop
+      mixins_in_use.delete(popped[:mixin]) if popped && popped[:mixin]
     end
 
     # A list of stack frames in the mixin/include stack.
@@ -81,6 +86,13 @@ module Sass
       @stack ||= @parent.stack
     end
 
+    # A set of names of mixins currently present in the stack.
+    #
+    # @return [Set<String>] The mixin names.
+    def mixins_in_use
+      @mixins_in_use ||= @parent.mixins_in_use
+    end
+
     class << self
       private
 

data/lib/sass/environment.rbc

@@ -0,0 +1,1485 @@
+!RBIX
+0
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+31
+45
+0
+1
+7
+2
+65
+49
+3
+2
+13
+45
+0
+4
+12
+7
+5
+12
+7
+6
+12
+65
+12
+49
+7
+4
+15
+48
+5
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+8
+x
+8
+Rubinius
+n
+x
+4
+Sass
+x
+11
+open_module
+n
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+4
+Sass
+i
+32
+5
+66
+45
+0
+1
+7
+2
+1
+65
+49
+3
+3
+13
+45
+0
+4
+12
+7
+5
+12
+7
+6
+12
+65
+12
+49
+7
+4
+15
+48
+5
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+8
+x
+8
+Rubinius
+n
+x
+11
+Environment
+x
+10
+open_class
+n
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+11
+Environment
+i
+152
+5
+66
+5
+7
+0
+47
+49
+1
+1
+15
+5
+7
+2
+47
+49
+3
+1
+15
+45
+4
+5
+7
+6
+7
+7
+65
+67
+48
+8
+49
+9
+4
+15
+45
+4
+10
+7
+2
+7
+11
+65
+67
+48
+8
+49
+9
+4
+15
+45
+4
+12
+7
+13
+7
+14
+65
+67
+48
+8
+49
+9
+4
+15
+45
+4
+15
+7
+16
+7
+17
+65
+67
+48
+8
+49
+9
+4
+15
+45
+4
+18
+7
+19
+7
+20
+65
+67
+48
+8
+49
+9
+4
+15
+45
+4
+21
+7
+22
+7
+23
+65
+67
+48
+8
+49
+9
+4
+15
+5
+45
+4
+24
+12
+49
+25
+1
+13
+45
+4
+26
+12
+7
+27
+12
+7
+28
+12
+65
+12
+49
+29
+4
+15
+48
+27
+15
+5
+7
+30
+47
+49
+31
+1
+15
+5
+7
+32
+47
+49
+31
+1
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+33
+x
+6
+parent
+x
+11
+attr_reader
+x
+7
+options
+x
+11
+attr_writer
+x
+8
+Rubinius
+n
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+92
+23
+0
+10
+8
+1
+19
+0
+15
+44
+43
+0
+78
+49
+1
+1
+38
+2
+15
+44
+43
+0
+78
+49
+1
+1
+38
+3
+15
+20
+0
+38
+4
+15
+20
+0
+9
+40
+1
+8
+44
+35
+0
+38
+5
+15
+39
+4
+9
+52
+1
+8
+91
+5
+7
+6
+64
+45
+7
+8
+43
+9
+13
+71
+10
+47
+9
+81
+47
+48
+11
+13
+7
+12
+64
+47
+49
+13
+1
+15
+8
+87
+7
+12
+64
+49
+10
+1
+47
+49
+14
+2
+11
+I
+6
+I
+1
+I
+0
+I
+1
+n
+p
+15
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+@vars
+x
+7
+@mixins
+x
+7
+@parent
+x
+6
+@stack
+s
+9
+important
+x
+6
+Script
+n
+x
+6
+String
+x
+3
+new
+x
+8
+allocate
+s
+10
+!important
+x
+10
+initialize
+x
+7
+set_var
+p
+13
+I
+0
+I
+16
+I
+8
+I
+17
+I
+12
+I
+18
+I
+1c
+I
+19
+I
+21
+I
+1a
+I
+2d
+I
+1b
+I
+5c
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+1
+x
+6
+parent
+x
+17
+method_visibility
+x
+15
+add_defn_method
+n
+M
+1
+n
+n
+x
+7
+options
+i
+32
+39
+0
+13
+10
+31
+15
+5
+47
+48
+1
+13
+9
+20
+15
+5
+47
+48
+1
+48
+2
+13
+10
+31
+15
+44
+43
+3
+78
+49
+4
+1
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+8
+@options
+x
+6
+parent
+x
+7
+options
+x
+4
+Hash
+x
+16
+new_from_literal
+p
+5
+I
+0
+I
+22
+I
+0
+I
+23
+I
+20
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+0
+n
+x
+10
+push_frame
+M
+1
+n
+n
+x
+10
+push_frame
+i
+58
+5
+47
+48
+0
+48
+1
+13
+9
+21
+15
+5
+47
+48
+0
+48
+1
+7
+2
+49
+3
+1
+9
+48
+5
+47
+48
+0
+48
+1
+7
+2
+49
+4
+1
+15
+5
+47
+48
+0
+48
+1
+20
+0
+49
+5
+1
+8
+57
+5
+47
+48
+0
+20
+0
+49
+6
+1
+11
+I
+3
+I
+1
+I
+1
+I
+1
+n
+p
+7
+x
+5
+stack
+x
+4
+last
+x
+8
+prepared
+x
+2
+[]
+x
+6
+delete
+x
+6
+merge!
+x
+4
+push
+p
+11
+I
+0
+I
+34
+I
+0
+I
+35
+I
+17
+I
+36
+I
+23
+I
+37
+I
+30
+I
+39
+I
+3a
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+1
+x
+10
+frame_info
+n
+x
+13
+prepare_frame
+M
+1
+n
+n
+x
+13
+prepare_frame
+i
+26
+5
+20
+0
+44
+43
+0
+79
+49
+1
+1
+13
+7
+2
+2
+49
+3
+2
+15
+49
+4
+1
+47
+49
+5
+1
+11
+I
+7
+I
+1
+I
+1
+I
+1
+n
+p
+6
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+8
+prepared
+x
+3
+[]=
+x
+5
+merge
+x
+10
+push_frame
+p
+5
+I
+0
+I
+41
+I
+0
+I
+42
+I
+1a
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+1
+x
+10
+frame_info
+n
+x
+9
+pop_frame
+M
+1
+n
+n
+x
+9
+pop_frame
+i
+30
+5
+47
+48
+0
+48
+1
+7
+2
+49
+3
+1
+9
+21
+5
+47
+48
+0
+48
+4
+8
+22
+1
+15
+5
+47
+48
+0
+48
+4
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+5
+stack
+x
+4
+last
+x
+8
+prepared
+x
+2
+[]
+x
+3
+pop
+p
+7
+I
+0
+I
+46
+I
+0
+I
+47
+I
+17
+I
+48
+I
+1e
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+0
+n
+x
+5
+stack
+M
+1
+n
+n
+x
+5
+stack
+i
+13
+39
+0
+13
+10
+12
+15
+39
+1
+48
+2
+38
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+6
+@stack
+x
+7
+@parent
+x
+5
+stack
+p
+5
+I
+0
+I
+50
+I
+0
+I
+51
+I
+d
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+0
+n
+x
+16
+object_metaclass
+n
+x
+18
+__metaclass_init__
+M
+1
+n
+n
+x
+18
+__metaclass_init__
+i
+22
+5
+66
+5
+47
+48
+0
+15
+45
+1
+2
+7
+3
+7
+4
+65
+67
+48
+5
+49
+6
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+7
+x
+7
+private
+x
+8
+Rubinius
+n
+x
+14
+inherited_hash
+M
+1
+n
+n
+x
+14
+inherited_hash
+i
+130
+5
+7
+0
+20
+0
+47
+48
+1
+7
+2
+20
+0
+47
+48
+1
+7
+3
+20
+0
+47
+48
+1
+7
+4
+20
+0
+47
+48
+1
+7
+5
+20
+0
+47
+48
+1
+7
+6
+20
+0
+47
+48
+1
+7
+7
+20
+0
+47
+48
+1
+7
+8
+20
+0
+47
+48
+1
+7
+9
+20
+0
+47
+48
+1
+7
+10
+20
+0
+47
+48
+1
+7
+11
+20
+0
+47
+48
+1
+7
+12
+20
+0
+47
+48
+1
+7
+13
+20
+0
+47
+48
+1
+7
+14
+20
+0
+47
+48
+1
+7
+15
+20
+0
+47
+48
+1
+7
+16
+20
+0
+47
+48
+1
+7
+17
+63
+33
+65
+48
+18
+4
+90
+79
+81
+19
+47
+49
+20
+3
+11
+I
+23
+I
+1
+I
+1
+I
+1
+n
+p
+21
+s
+14
+          def 
+x
+4
+to_s
+s
+20
+(name)
+            _
+s
+52
+(name.gsub('_', '-'))
+          end
+
+          def _
+s
+20
+(name)
+            @
+s
+31
+s[name] || @parent && @parent._
+s
+43
+(name)
+          end
+          protected :_
+s
+20
+
+
+          def set_
+s
+66
+(name, value)
+            name = name.gsub('_', '-')
+            @
+s
+31
+s[name] = value unless try_set_
+s
+51
+(name, value)
+          end
+
+          def try_set_
+s
+30
+(name, value)
+            if @
+s
+32
+s.include?(name)
+              @
+s
+91
+s[name] = value
+              true
+            elsif @parent
+              @parent.try_set_
+s
+110
+(name, value)
+            else
+              false
+            end
+          end
+          protected :try_set_
+s
+26
+
+
+          def set_local_
+s
+27
+(name, value)
+            @
+s
+45
+s[name.gsub('_', '-')] = value
+          end
+
+x
+11
+active_path
+x
+1
++
+x
+10
+class_eval
+p
+35
+I
+0
+I
+59
+I
+0
+I
+5a
+I
+1
+I
+5b
+I
+a
+I
+5c
+I
+11
+I
+5f
+I
+18
+I
+60
+I
+26
+I
+62
+I
+2d
+I
+64
+I
+34
+I
+66
+I
+42
+I
+69
+I
+49
+I
+6a
+I
+50
+I
+6b
+I
+57
+I
+6e
+I
+5e
+I
+73
+I
+65
+I
+75
+I
+6c
+I
+76
+I
+75
+I
+5a
+I
+82
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+1
+x
+4
+name
+x
+17
+method_visibility
+x
+15
+add_defn_method
+p
+5
+I
+2
+I
+55
+I
+7
+I
+59
+I
+16
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+0
+x
+13
+attach_method
+x
+3
+var
+x
+14
+inherited_hash
+x
+5
+mixin
+p
+23
+I
+2
+I
+12
+I
+a
+I
+13
+I
+12
+I
+16
+I
+21
+I
+22
+I
+30
+I
+34
+I
+3f
+I
+41
+I
+4e
+I
+46
+I
+5d
+I
+50
+I
+6c
+I
+54
+I
+88
+I
+7e
+I
+90
+I
+81
+I
+98
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+d
+I
+20
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1f
+x
+44
+/home/nex3/code/haml/lib/sass/environment.rb
+p
+0