radiant 0.9.1 → 1.0.0.rc1

data/vendor/plugins/haml/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.
@@ -23,7 +25,8 @@ module Sass
       @vars = {}
       @mixins = {}
       @parent = parent
-
+      @stack = [] unless parent
+      @mixins_in_use = Set.new unless parent
       set_var("important", Script::String.new("!important")) unless @parent
     end
 
@@ -35,6 +38,61 @@ module Sass
       @options || (parent && parent.options) || {}
     end
 
+    # Push a new stack frame onto the mixin/include stack.
+    #
+    # @param frame_info [{Symbol => Object}]
+    #   Frame information has the following keys:
+    #
+    #   `:filename`
+    #   : The name of the file in which the lexical scope changed.
+    #
+    #   `:mixin`
+    #   : The name of the mixin in which the lexical scope changed,
+    #     or `nil` if it wasn't within in a mixin.
+    #
+    #   `:line`
+    #   : The line of the file on which the lexical scope changed. Never nil.
+    def push_frame(frame_info)
+      if stack.last && stack.last[:prepared]
+        stack.last.delete(:prepared)
+        stack.last.merge!(frame_info)
+      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,
+    # it will be merged with this frame.
+    #
+    # @param frame_info [{Symbol => Object}] Same as for \{#push\_frame}.
+    def prepare_frame(frame_info)
+      push_frame(frame_info.merge(:prepared => true))
+    end
+
+    # Pop a stack frame from the mixin/include stack.
+    def pop_frame
+      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.
+    # The last element in the list is the most deeply-nested frame.
+    #
+    # @return [Array<{Symbol => Object}>] The stack frames,
+    #   of the form passed to \{#push\_frame}.
+    def stack
+      @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
 
@@ -43,10 +101,16 @@ module Sass
       def inherited_hash(name)
         class_eval <<RUBY, __FILE__, __LINE__ + 1
           def #{name}(name)
-            @#{name}s[name] || @parent && @parent.#{name}(name)
+            _#{name}(name.gsub('_', '-'))
+          end
+
+          def _#{name}(name)
+            @#{name}s[name] || @parent && @parent._#{name}(name)
           end
+          protected :_#{name}
 
           def set_#{name}(name, value)
+            name = name.gsub('_', '-')
             @#{name}s[name] = value unless try_set_#{name}(name, value)
           end
 
@@ -63,7 +127,7 @@ module Sass
           protected :try_set_#{name}
 
           def set_local_#{name}(name, value)
-            @#{name}s[name] = value
+            @#{name}s[name.gsub('_', '-')] = value
           end
 RUBY
       end

data/vendor/plugins/haml/lib/sass/environment.rbc

@@ -0,0 +1,1751 @@
+!RBIX
+17831730954501249321
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+37
+5
+7
+0
+64
+47
+49
+1
+1
+15
+99
+7
+2
+65
+49
+3
+2
+13
+99
+12
+7
+4
+12
+7
+5
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+7
+s
+3
+set
+x
+7
+require
+x
+4
+Sass
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+4
+Sass
+i
+29
+5
+66
+99
+7
+0
+1
+65
+49
+1
+3
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+11
+Environment
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+11
+Environment
+i
+160
+5
+66
+5
+7
+0
+47
+49
+1
+1
+15
+5
+7
+2
+47
+49
+3
+1
+15
+99
+7
+4
+7
+5
+65
+67
+49
+6
+0
+49
+7
+4
+15
+99
+7
+2
+7
+8
+65
+67
+49
+6
+0
+49
+7
+4
+15
+99
+7
+9
+7
+10
+65
+67
+49
+6
+0
+49
+7
+4
+15
+99
+7
+11
+7
+12
+65
+67
+49
+6
+0
+49
+7
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+6
+0
+49
+7
+4
+15
+99
+7
+15
+7
+16
+65
+67
+49
+6
+0
+49
+7
+4
+15
+99
+7
+17
+7
+18
+65
+67
+49
+6
+0
+49
+7
+4
+15
+5
+99
+43
+19
+12
+49
+20
+1
+13
+99
+12
+7
+21
+12
+7
+22
+12
+65
+12
+49
+23
+4
+15
+54
+50
+21
+0
+15
+5
+7
+24
+47
+49
+25
+1
+15
+5
+7
+26
+47
+49
+25
+1
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+27
+x
+6
+parent
+x
+11
+attr_reader
+x
+7
+options
+x
+11
+attr_writer
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+127
+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
+20
+0
+9
+52
+1
+8
+78
+45
+6
+7
+13
+71
+8
+47
+9
+73
+47
+49
+9
+0
+13
+47
+49
+10
+0
+15
+8
+76
+49
+8
+0
+38
+11
+15
+39
+4
+9
+86
+1
+8
+126
+5
+7
+12
+64
+45
+13
+14
+43
+15
+13
+71
+8
+47
+9
+116
+47
+49
+9
+0
+13
+7
+16
+64
+47
+49
+10
+1
+15
+8
+122
+7
+16
+64
+49
+8
+1
+47
+49
+17
+2
+11
+I
+6
+I
+1
+I
+0
+I
+1
+n
+p
+18
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+@vars
+x
+7
+@mixins
+x
+7
+@parent
+x
+6
+@stack
+x
+3
+Set
+n
+x
+3
+new
+x
+8
+allocate
+x
+10
+initialize
+x
+14
+@mixins_in_use
+s
+9
+important
+x
+6
+Script
+n
+x
+6
+String
+s
+10
+!important
+x
+7
+set_var
+p
+21
+I
+-1
+I
+18
+I
+8
+I
+19
+I
+12
+I
+1a
+I
+1c
+I
+1b
+I
+21
+I
+1c
+I
+2c
+I
+0
+I
+2d
+I
+1d
+I
+4e
+I
+0
+I
+4f
+I
+1e
+I
+7e
+I
+0
+I
+7f
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+1
+x
+6
+parent
+x
+17
+method_visibility
+x
+15
+add_defn_method
+M
+1
+n
+n
+x
+7
+options
+i
+31
+39
+0
+13
+10
+30
+15
+5
+48
+1
+13
+9
+19
+15
+5
+48
+1
+49
+2
+0
+13
+10
+30
+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
+-1
+I
+25
+I
+0
+I
+26
+I
+1f
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+0
+x
+10
+push_frame
+M
+1
+n
+n
+x
+10
+push_frame
+i
+112
+5
+48
+0
+49
+1
+0
+13
+9
+21
+15
+5
+48
+0
+49
+1
+0
+7
+2
+49
+3
+1
+9
+48
+5
+48
+0
+49
+1
+0
+7
+2
+49
+4
+1
+15
+5
+48
+0
+49
+1
+0
+20
+0
+49
+5
+1
+8
+56
+5
+48
+0
+20
+0
+49
+6
+1
+15
+5
+48
+0
+49
+1
+0
+7
+7
+49
+3
+1
+13
+9
+89
+15
+5
+48
+0
+49
+1
+0
+7
+2
+49
+3
+1
+10
+88
+2
+8
+89
+3
+9
+110
+5
+48
+8
+5
+48
+0
+49
+1
+0
+7
+7
+49
+3
+1
+49
+9
+1
+8
+111
+1
+11
+I
+4
+I
+1
+I
+1
+I
+1
+n
+p
+10
+x
+5
+stack
+x
+4
+last
+x
+8
+prepared
+x
+2
+[]
+x
+6
+delete
+x
+6
+merge!
+x
+4
+push
+x
+5
+mixin
+x
+13
+mixins_in_use
+x
+2
+<<
+p
+17
+I
+-1
+I
+37
+I
+0
+I
+38
+I
+17
+I
+39
+I
+23
+I
+3a
+I
+30
+I
+3c
+I
+38
+I
+0
+I
+39
+I
+3e
+I
+6f
+I
+0
+I
+70
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+1
+x
+10
+frame_info
+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
+-1
+I
+45
+I
+0
+I
+46
+I
+1a
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+1
+x
+10
+frame_info
+x
+9
+pop_frame
+M
+1
+n
+n
+x
+9
+pop_frame
+i
+74
+5
+48
+0
+49
+1
+0
+13
+9
+21
+15
+5
+48
+0
+49
+1
+0
+7
+2
+49
+3
+1
+9
+31
+5
+48
+0
+49
+4
+0
+8
+32
+1
+15
+5
+48
+0
+49
+4
+0
+19
+0
+15
+20
+0
+13
+9
+55
+15
+20
+0
+7
+5
+49
+3
+1
+9
+72
+5
+48
+6
+20
+0
+7
+5
+49
+3
+1
+49
+7
+1
+8
+73
+1
+11
+I
+4
+I
+1
+I
+0
+I
+0
+n
+p
+8
+x
+5
+stack
+x
+4
+last
+x
+8
+prepared
+x
+2
+[]
+x
+3
+pop
+x
+5
+mixin
+x
+13
+mixins_in_use
+x
+6
+delete
+p
+13
+I
+-1
+I
+4a
+I
+0
+I
+4b
+I
+20
+I
+0
+I
+21
+I
+4c
+I
+2a
+I
+4d
+I
+49
+I
+0
+I
+4a
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+1
+x
+6
+popped
+x
+5
+stack
+M
+1
+n
+n
+x
+5
+stack
+i
+14
+39
+0
+13
+10
+13
+15
+39
+1
+49
+2
+0
+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
+-1
+I
+55
+I
+0
+I
+56
+I
+e
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+0
+x
+13
+mixins_in_use
+M
+1
+n
+n
+x
+13
+mixins_in_use
+i
+14
+39
+0
+13
+10
+13
+15
+39
+1
+49
+2
+0
+38
+0
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+14
+@mixins_in_use
+x
+7
+@parent
+x
+13
+mixins_in_use
+p
+5
+I
+-1
+I
+5c
+I
+0
+I
+5d
+I
+e
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+0
+x
+4
+Type
+x
+22
+object_singleton_class
+x
+18
+__metaclass_init__
+M
+1
+n
+n
+x
+18
+__metaclass_init__
+i
+20
+5
+66
+5
+48
+0
+15
+99
+7
+1
+7
+2
+65
+67
+49
+3
+0
+49
+4
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+7
+private
+x
+14
+inherited_hash
+M
+1
+n
+n
+x
+14
+inherited_hash
+i
+131
+5
+7
+0
+20
+0
+47
+101
+1
+7
+2
+20
+0
+47
+101
+1
+7
+3
+20
+0
+47
+101
+1
+7
+4
+20
+0
+47
+101
+1
+7
+5
+20
+0
+47
+101
+1
+7
+6
+20
+0
+47
+101
+1
+7
+7
+20
+0
+47
+101
+1
+7
+8
+20
+0
+47
+101
+1
+7
+9
+20
+0
+47
+101
+1
+7
+10
+20
+0
+47
+101
+1
+7
+11
+20
+0
+47
+101
+1
+7
+12
+20
+0
+47
+101
+1
+7
+13
+20
+0
+47
+101
+1
+7
+14
+20
+0
+47
+101
+1
+7
+15
+20
+0
+47
+101
+1
+7
+16
+20
+0
+47
+101
+1
+7
+17
+63
+33
+65
+49
+18
+0
+4
+102
+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
+-1
+I
+65
+I
+0
+I
+66
+I
+1
+I
+67
+I
+a
+I
+68
+I
+11
+I
+6b
+I
+18
+I
+6c
+I
+26
+I
+6e
+I
+2d
+I
+70
+I
+34
+I
+72
+I
+42
+I
+75
+I
+49
+I
+76
+I
+50
+I
+77
+I
+57
+I
+7a
+I
+5e
+I
+7f
+I
+65
+I
+81
+I
+6c
+I
+82
+I
+75
+I
+66
+I
+83
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+1
+x
+4
+name
+x
+17
+method_visibility
+x
+15
+add_defn_method
+p
+5
+I
+2
+I
+61
+I
+6
+I
+65
+I
+14
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+0
+x
+13
+attach_method
+x
+3
+var
+x
+14
+inherited_hash
+x
+5
+mixin
+p
+25
+I
+2
+I
+14
+I
+a
+I
+15
+I
+12
+I
+18
+I
+20
+I
+25
+I
+2e
+I
+37
+I
+3c
+I
+45
+I
+4a
+I
+4a
+I
+58
+I
+55
+I
+66
+I
+5c
+I
+74
+I
+60
+I
+90
+I
+8a
+I
+98
+I
+8d
+I
+a0
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+f
+I
+1d
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+0
+x
+13
+attach_method
+p
+5
+I
+0
+I
+1
+I
+9
+I
+3
+I
+25
+x
+71
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/environment.rb
+p
+0