sass 3.2.19 → 3.4.25

Sign up to get free protection for your applications and to get access to all the features.
Files changed (246) hide show
  1. checksums.yaml +4 -4
  2. data/.yardopts +3 -1
  3. data/CODE_OF_CONDUCT.md +10 -0
  4. data/CONTRIBUTING.md +148 -0
  5. data/MIT-LICENSE +1 -1
  6. data/README.md +87 -61
  7. data/Rakefile +119 -15
  8. data/VERSION +1 -1
  9. data/VERSION_DATE +1 -1
  10. data/VERSION_NAME +1 -1
  11. data/bin/sass +1 -1
  12. data/bin/scss +1 -1
  13. data/extra/sass-spec-ref.sh +32 -0
  14. data/extra/update_watch.rb +1 -1
  15. data/lib/sass/cache_stores/base.rb +2 -2
  16. data/lib/sass/cache_stores/chain.rb +2 -1
  17. data/lib/sass/cache_stores/filesystem.rb +8 -12
  18. data/lib/sass/cache_stores/memory.rb +5 -6
  19. data/lib/sass/cache_stores/null.rb +2 -2
  20. data/lib/sass/callbacks.rb +3 -2
  21. data/lib/sass/css.rb +22 -23
  22. data/lib/sass/deprecation.rb +55 -0
  23. data/lib/sass/engine.rb +487 -191
  24. data/lib/sass/environment.rb +172 -58
  25. data/lib/sass/error.rb +21 -24
  26. data/lib/sass/exec/base.rb +199 -0
  27. data/lib/sass/exec/sass_convert.rb +283 -0
  28. data/lib/sass/exec/sass_scss.rb +440 -0
  29. data/lib/sass/exec.rb +5 -703
  30. data/lib/sass/features.rb +47 -0
  31. data/lib/sass/importers/base.rb +50 -7
  32. data/lib/sass/importers/deprecated_path.rb +51 -0
  33. data/lib/sass/importers/filesystem.rb +54 -21
  34. data/lib/sass/importers.rb +1 -0
  35. data/lib/sass/logger/base.rb +9 -5
  36. data/lib/sass/logger/delayed.rb +50 -0
  37. data/lib/sass/logger/log_level.rb +3 -7
  38. data/lib/sass/logger.rb +9 -7
  39. data/lib/sass/media.rb +20 -23
  40. data/lib/sass/plugin/compiler.rb +321 -145
  41. data/lib/sass/plugin/configuration.rb +45 -34
  42. data/lib/sass/plugin/merb.rb +3 -3
  43. data/lib/sass/plugin/rack.rb +3 -3
  44. data/lib/sass/plugin/rails.rb +1 -1
  45. data/lib/sass/plugin/staleness_checker.rb +6 -6
  46. data/lib/sass/plugin.rb +9 -8
  47. data/lib/sass/repl.rb +3 -3
  48. data/lib/sass/script/css_lexer.rb +8 -4
  49. data/lib/sass/script/css_parser.rb +4 -2
  50. data/lib/sass/script/css_variable_warning.rb +52 -0
  51. data/lib/sass/script/functions.rb +1583 -433
  52. data/lib/sass/script/lexer.rb +198 -79
  53. data/lib/sass/script/parser.rb +463 -133
  54. data/lib/sass/script/tree/funcall.rb +313 -0
  55. data/lib/sass/script/tree/interpolation.rb +223 -0
  56. data/lib/sass/script/tree/list_literal.rb +104 -0
  57. data/lib/sass/script/tree/literal.rb +49 -0
  58. data/lib/sass/script/tree/map_literal.rb +64 -0
  59. data/lib/sass/script/{node.rb → tree/node.rb} +42 -14
  60. data/lib/sass/script/tree/operation.rb +156 -0
  61. data/lib/sass/script/tree/selector.rb +26 -0
  62. data/lib/sass/script/tree/string_interpolation.rb +125 -0
  63. data/lib/sass/script/{unary_operation.rb → tree/unary_operation.rb} +6 -6
  64. data/lib/sass/script/tree/variable.rb +57 -0
  65. data/lib/sass/script/tree.rb +16 -0
  66. data/lib/sass/script/{arg_list.rb → value/arg_list.rb} +9 -25
  67. data/lib/sass/script/value/base.rb +241 -0
  68. data/lib/sass/script/value/bool.rb +35 -0
  69. data/lib/sass/script/value/color.rb +698 -0
  70. data/lib/sass/script/value/helpers.rb +272 -0
  71. data/lib/sass/script/value/list.rb +113 -0
  72. data/lib/sass/script/value/map.rb +70 -0
  73. data/lib/sass/script/{null.rb → value/null.rb} +14 -7
  74. data/lib/sass/script/{number.rb → value/number.rb} +196 -86
  75. data/lib/sass/script/value/string.rb +138 -0
  76. data/lib/sass/script/value.rb +11 -0
  77. data/lib/sass/script.rb +38 -11
  78. data/lib/sass/scss/css_parser.rb +25 -5
  79. data/lib/sass/scss/parser.rb +532 -458
  80. data/lib/sass/scss/rx.rb +21 -14
  81. data/lib/sass/scss/static_parser.rb +328 -9
  82. data/lib/sass/scss.rb +0 -2
  83. data/lib/sass/selector/abstract_sequence.rb +36 -19
  84. data/lib/sass/selector/comma_sequence.rb +125 -26
  85. data/lib/sass/selector/pseudo.rb +266 -0
  86. data/lib/sass/selector/sequence.rb +200 -71
  87. data/lib/sass/selector/simple.rb +30 -32
  88. data/lib/sass/selector/simple_sequence.rb +193 -64
  89. data/lib/sass/selector.rb +65 -194
  90. data/lib/sass/shared.rb +2 -2
  91. data/lib/sass/source/map.rb +213 -0
  92. data/lib/sass/source/position.rb +39 -0
  93. data/lib/sass/source/range.rb +41 -0
  94. data/lib/sass/stack.rb +120 -0
  95. data/lib/sass/supports.rb +19 -23
  96. data/lib/sass/tree/at_root_node.rb +83 -0
  97. data/lib/sass/tree/charset_node.rb +1 -1
  98. data/lib/sass/tree/comment_node.rb +4 -4
  99. data/lib/sass/tree/css_import_node.rb +19 -11
  100. data/lib/sass/tree/debug_node.rb +2 -2
  101. data/lib/sass/tree/directive_node.rb +21 -4
  102. data/lib/sass/tree/each_node.rb +8 -8
  103. data/lib/sass/tree/error_node.rb +18 -0
  104. data/lib/sass/tree/extend_node.rb +14 -7
  105. data/lib/sass/tree/for_node.rb +4 -4
  106. data/lib/sass/tree/function_node.rb +14 -4
  107. data/lib/sass/tree/if_node.rb +1 -1
  108. data/lib/sass/tree/import_node.rb +10 -10
  109. data/lib/sass/tree/keyframe_rule_node.rb +15 -0
  110. data/lib/sass/tree/media_node.rb +4 -14
  111. data/lib/sass/tree/mixin_def_node.rb +4 -4
  112. data/lib/sass/tree/mixin_node.rb +21 -8
  113. data/lib/sass/tree/node.rb +59 -15
  114. data/lib/sass/tree/prop_node.rb +42 -24
  115. data/lib/sass/tree/return_node.rb +3 -2
  116. data/lib/sass/tree/root_node.rb +19 -3
  117. data/lib/sass/tree/rule_node.rb +49 -26
  118. data/lib/sass/tree/supports_node.rb +0 -13
  119. data/lib/sass/tree/trace_node.rb +2 -1
  120. data/lib/sass/tree/variable_node.rb +9 -3
  121. data/lib/sass/tree/visitors/base.rb +5 -8
  122. data/lib/sass/tree/visitors/check_nesting.rb +62 -36
  123. data/lib/sass/tree/visitors/convert.rb +111 -76
  124. data/lib/sass/tree/visitors/cssize.rb +206 -74
  125. data/lib/sass/tree/visitors/deep_copy.rb +11 -6
  126. data/lib/sass/tree/visitors/extend.rb +19 -17
  127. data/lib/sass/tree/visitors/perform.rb +308 -190
  128. data/lib/sass/tree/visitors/set_options.rb +21 -7
  129. data/lib/sass/tree/visitors/to_css.rb +273 -92
  130. data/lib/sass/tree/warn_node.rb +2 -2
  131. data/lib/sass/tree/while_node.rb +2 -2
  132. data/lib/sass/util/cross_platform_random.rb +19 -0
  133. data/lib/sass/util/normalized_map.rb +129 -0
  134. data/lib/sass/util/ordered_hash.rb +192 -0
  135. data/lib/sass/util/subset_map.rb +5 -5
  136. data/lib/sass/util/test.rb +0 -1
  137. data/lib/sass/util.rb +620 -193
  138. data/lib/sass/version.rb +22 -24
  139. data/lib/sass.rb +27 -13
  140. data/test/sass/cache_test.rb +62 -20
  141. data/test/sass/callbacks_test.rb +1 -1
  142. data/test/sass/compiler_test.rb +236 -0
  143. data/test/sass/conversion_test.rb +472 -44
  144. data/test/sass/css2sass_test.rb +73 -5
  145. data/test/sass/css_variable_test.rb +132 -0
  146. data/test/sass/encoding_test.rb +219 -0
  147. data/test/sass/engine_test.rb +618 -415
  148. data/test/sass/exec_test.rb +12 -2
  149. data/test/sass/extend_test.rb +419 -168
  150. data/test/sass/functions_test.rb +931 -93
  151. data/test/sass/importer_test.rb +250 -21
  152. data/test/sass/logger_test.rb +1 -1
  153. data/test/sass/more_results/more_import.css +1 -1
  154. data/test/sass/more_templates/more1.sass +10 -10
  155. data/test/sass/more_templates/more_import.sass +2 -2
  156. data/test/sass/plugin_test.rb +26 -34
  157. data/test/sass/results/compact.css +1 -1
  158. data/test/sass/results/complex.css +4 -4
  159. data/test/sass/results/expanded.css +1 -1
  160. data/test/sass/results/import.css +1 -1
  161. data/test/sass/results/import_charset_ibm866.css +2 -2
  162. data/test/sass/results/mixins.css +17 -17
  163. data/test/sass/results/nested.css +1 -1
  164. data/test/sass/results/parent_ref.css +2 -2
  165. data/test/sass/results/script.css +5 -5
  166. data/test/sass/results/scss_import.css +1 -1
  167. data/test/sass/script_conversion_test.rb +97 -39
  168. data/test/sass/script_test.rb +911 -102
  169. data/test/sass/scss/css_test.rb +215 -34
  170. data/test/sass/scss/rx_test.rb +8 -4
  171. data/test/sass/scss/scss_test.rb +2424 -325
  172. data/test/sass/source_map_test.rb +1055 -0
  173. data/test/sass/superselector_test.rb +210 -0
  174. data/test/sass/templates/_partial.sass +1 -1
  175. data/test/sass/templates/basic.sass +10 -10
  176. data/test/sass/templates/bork1.sass +1 -1
  177. data/test/sass/templates/bork5.sass +1 -1
  178. data/test/sass/templates/compact.sass +10 -10
  179. data/test/sass/templates/complex.sass +187 -187
  180. data/test/sass/templates/compressed.sass +10 -10
  181. data/test/sass/templates/expanded.sass +10 -10
  182. data/test/sass/templates/import.sass +2 -2
  183. data/test/sass/templates/importee.sass +3 -3
  184. data/test/sass/templates/mixins.sass +22 -22
  185. data/test/sass/templates/multiline.sass +4 -4
  186. data/test/sass/templates/nested.sass +13 -13
  187. data/test/sass/templates/parent_ref.sass +12 -12
  188. data/test/sass/templates/script.sass +70 -70
  189. data/test/sass/templates/scss_import.scss +2 -1
  190. data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +1 -1
  191. data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +2 -2
  192. data/test/sass/templates/subdir/subdir.sass +3 -3
  193. data/test/sass/templates/units.sass +10 -10
  194. data/test/sass/test_helper.rb +1 -1
  195. data/test/sass/util/multibyte_string_scanner_test.rb +11 -3
  196. data/test/sass/util/normalized_map_test.rb +51 -0
  197. data/test/sass/util/subset_map_test.rb +2 -2
  198. data/test/sass/util_test.rb +99 -43
  199. data/test/sass/value_helpers_test.rb +179 -0
  200. data/test/sass-spec.yml +3 -0
  201. data/test/test_helper.rb +42 -12
  202. data/vendor/listen/CHANGELOG.md +1 -228
  203. data/vendor/listen/Gemfile +5 -15
  204. data/vendor/listen/README.md +111 -77
  205. data/vendor/listen/Rakefile +0 -42
  206. data/vendor/listen/lib/listen/adapter.rb +195 -82
  207. data/vendor/listen/lib/listen/adapters/bsd.rb +27 -64
  208. data/vendor/listen/lib/listen/adapters/darwin.rb +21 -58
  209. data/vendor/listen/lib/listen/adapters/linux.rb +23 -55
  210. data/vendor/listen/lib/listen/adapters/polling.rb +25 -34
  211. data/vendor/listen/lib/listen/adapters/windows.rb +50 -46
  212. data/vendor/listen/lib/listen/directory_record.rb +96 -61
  213. data/vendor/listen/lib/listen/listener.rb +135 -37
  214. data/vendor/listen/lib/listen/turnstile.rb +9 -5
  215. data/vendor/listen/lib/listen/version.rb +1 -1
  216. data/vendor/listen/lib/listen.rb +33 -19
  217. data/vendor/listen/listen.gemspec +6 -0
  218. data/vendor/listen/spec/listen/adapter_spec.rb +43 -77
  219. data/vendor/listen/spec/listen/adapters/polling_spec.rb +8 -8
  220. data/vendor/listen/spec/listen/directory_record_spec.rb +81 -56
  221. data/vendor/listen/spec/listen/listener_spec.rb +128 -39
  222. data/vendor/listen/spec/listen_spec.rb +15 -21
  223. data/vendor/listen/spec/spec_helper.rb +4 -0
  224. data/vendor/listen/spec/support/adapter_helper.rb +52 -15
  225. data/vendor/listen/spec/support/directory_record_helper.rb +7 -5
  226. data/vendor/listen/spec/support/listeners_helper.rb +30 -7
  227. metadata +161 -111
  228. data/CONTRIBUTING +0 -3
  229. data/lib/sass/script/bool.rb +0 -18
  230. data/lib/sass/script/color.rb +0 -606
  231. data/lib/sass/script/funcall.rb +0 -245
  232. data/lib/sass/script/interpolation.rb +0 -79
  233. data/lib/sass/script/list.rb +0 -85
  234. data/lib/sass/script/literal.rb +0 -221
  235. data/lib/sass/script/operation.rb +0 -110
  236. data/lib/sass/script/string.rb +0 -51
  237. data/lib/sass/script/string_interpolation.rb +0 -103
  238. data/lib/sass/script/variable.rb +0 -58
  239. data/lib/sass/scss/script_lexer.rb +0 -15
  240. data/lib/sass/scss/script_parser.rb +0 -25
  241. data/test/Gemfile +0 -3
  242. data/test/Gemfile.lock +0 -10
  243. data/vendor/listen/lib/listen/dependency_manager.rb +0 -126
  244. data/vendor/listen/lib/listen/multi_listener.rb +0 -143
  245. data/vendor/listen/spec/listen/dependency_manager_spec.rb +0 -107
  246. data/vendor/listen/spec/listen/multi_listener_spec.rb +0 -174
@@ -16,26 +16,29 @@ module Sass
16
16
  # `value`: \[`Object`\]
17
17
  # : The Ruby object corresponding to the value of the token.
18
18
  #
19
- # `line`: \[`Fixnum`\]
20
- # : The line of the source file on which the token appears.
19
+ # `source_range`: \[`Sass::Source::Range`\]
20
+ # : The range in the source file in which the token appeared.
21
21
  #
22
- # `offset`: \[`Fixnum`\]
23
- # : The number of bytes into the line the SassScript token appeared.
24
- #
25
- # `pos`: \[`Fixnum`\]
22
+ # `pos`: \[`Integer`\]
26
23
  # : The scanner position at which the SassScript token appeared.
27
- Token = Struct.new(:type, :value, :line, :offset, :pos)
24
+ Token = Struct.new(:type, :value, :source_range, :pos)
28
25
 
29
26
  # The line number of the lexer's current position.
30
27
  #
31
- # @return [Fixnum]
32
- attr_reader :line
28
+ # @return [Integer]
29
+ def line
30
+ return @line unless @tok
31
+ @tok.source_range.start_pos.line
32
+ end
33
33
 
34
34
  # The number of bytes into the current line
35
- # of the lexer's current position.
35
+ # of the lexer's current position (1-based).
36
36
  #
37
- # @return [Fixnum]
38
- attr_reader :offset
37
+ # @return [Integer]
38
+ def offset
39
+ return @offset unless @tok
40
+ @tok.source_range.start_pos.offset
41
+ end
39
42
 
40
43
  # A hash from operator strings to the corresponding token types.
41
44
  OPERATORS = {
@@ -67,10 +70,9 @@ module Sass
67
70
 
68
71
  OPERATORS_REVERSE = Sass::Util.map_hash(OPERATORS) {|k, v| [v, k]}
69
72
 
70
- TOKEN_NAMES = Sass::Util.map_hash(OPERATORS_REVERSE) {|k, v| [k, v.inspect]}.merge({
71
- :const => "variable (e.g. $foo)",
72
- :ident => "identifier (e.g. middle)"
73
- })
73
+ TOKEN_NAMES = Sass::Util.map_hash(OPERATORS_REVERSE) {|k, v| [k, v.inspect]}.merge(
74
+ :const => "variable (e.g. $foo)",
75
+ :ident => "identifier (e.g. middle)")
74
76
 
75
77
  # A list of operator strings ordered with longer names first
76
78
  # so that `>` and `<` don't clobber `>=` and `<=`.
@@ -78,7 +80,9 @@ module Sass
78
80
 
79
81
  # A sub-list of {OP_NAMES} that only includes operators
80
82
  # with identifier names.
81
- IDENT_OP_NAMES = OP_NAMES.select {|k, v| k =~ /^\w+/}
83
+ IDENT_OP_NAMES = OP_NAMES.select {|k, _v| k =~ /^\w+/}
84
+
85
+ PARSEABLE_NUMBER = /(?:(\d*\.\d+)|(\d+))(?:[eE]([+-]?\d+))?(#{UNIT})?/
82
86
 
83
87
  # A hash of regular expressions that are used for tokenizing.
84
88
  REGULAR_EXPRESSIONS = {
@@ -87,16 +91,22 @@ module Sass
87
91
  :single_line_comment => SINGLE_LINE_COMMENT,
88
92
  :variable => /(\$)(#{IDENT})/,
89
93
  :ident => /(#{IDENT})(\()?/,
90
- :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
94
+ :number => PARSEABLE_NUMBER,
95
+ :unary_minus_number => /-#{PARSEABLE_NUMBER}/,
91
96
  :color => HEXCOLOR,
92
- :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|\Z)")})})},
93
- :op => %r{(#{Regexp.union(*OP_NAMES)})},
97
+ :id => /##{IDENT}/,
98
+ :selector => /&/,
99
+ :ident_op => /(#{Regexp.union(*IDENT_OP_NAMES.map do |s|
100
+ Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|\Z)")
101
+ end)})/,
102
+ :op => /(#{Regexp.union(*OP_NAMES)})/,
94
103
  }
95
104
 
96
105
  class << self
97
106
  private
107
+
98
108
  def string_re(open, close)
99
- /#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|#\{)/
109
+ /#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|#\{)/m
100
110
  end
101
111
  end
102
112
 
@@ -132,12 +142,12 @@ module Sass
132
142
  }
133
143
 
134
144
  # @param str [String, StringScanner] The source text to lex
135
- # @param line [Fixnum] The line on which the SassScript appears.
136
- # Used for error reporting
137
- # @param offset [Fixnum] The number of characters in on which the SassScript appears.
138
- # Used for error reporting
145
+ # @param line [Integer] The 1-based line on which the SassScript appears.
146
+ # Used for error reporting and sourcemap building
147
+ # @param offset [Integer] The 1-based character (not byte) offset in the line in the source.
148
+ # Used for error reporting and sourcemap building
139
149
  # @param options [{Symbol => Object}] An options hash;
140
- # see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
150
+ # see {file:SASS_REFERENCE.md#Options the Sass options documentation}
141
151
  def initialize(str, line, offset, options)
142
152
  @scanner = str.is_a?(StringScanner) ? str : Sass::Util::MultibyteStringScanner.new(str)
143
153
  @line = line
@@ -145,6 +155,8 @@ module Sass
145
155
  @options = options
146
156
  @interpolation_stack = []
147
157
  @prev = nil
158
+ @tok = nil
159
+ @next_tok = nil
148
160
  end
149
161
 
150
162
  # Moves the lexer forward one token.
@@ -154,7 +166,7 @@ module Sass
154
166
  @tok ||= read_token
155
167
  @tok, tok = nil, @tok
156
168
  @prev = tok
157
- return tok
169
+ tok
158
170
  end
159
171
 
160
172
  # Returns whether or not there's whitespace before the next token.
@@ -169,6 +181,13 @@ module Sass
169
181
  end
170
182
  end
171
183
 
184
+ # Returns the given character.
185
+ #
186
+ # @return [String]
187
+ def char(pos = @scanner.pos)
188
+ @scanner.string[pos, 1]
189
+ end
190
+
172
191
  # Returns the next token without moving the lexer forward.
173
192
  #
174
193
  # @return [Token] The next token
@@ -179,12 +198,16 @@ module Sass
179
198
  # Rewinds the underlying StringScanner
180
199
  # to before the token returned by \{#peek}.
181
200
  def unpeek!
182
- @scanner.pos = @tok.pos if @tok
201
+ return unless @tok
202
+ @scanner.pos = @tok.pos
203
+ @line = @tok.source_range.start_pos.line
204
+ @offset = @tok.source_range.start_pos.offset
183
205
  end
184
206
 
185
207
  # @return [Boolean] Whether or not there's more source text to lex.
186
208
  def done?
187
- whitespace unless after_interpolation? && @interpolation_stack.last
209
+ return if @next_tok
210
+ whitespace unless after_interpolation? && !@interpolation_stack.empty?
188
211
  @scanner.eos? && @tok.nil?
189
212
  end
190
213
 
@@ -221,14 +244,17 @@ module Sass
221
244
  private
222
245
 
223
246
  def read_token
224
- return if done?
225
- return unless value = token
226
- type, val, size = value
227
- size ||= @scanner.matched_size
247
+ if (tok = @next_tok)
248
+ @next_tok = nil
249
+ return tok
250
+ end
228
251
 
229
- val.line = @line if val.is_a?(Script::Node)
230
- Token.new(type, val, @line,
231
- current_position - size, @scanner.pos - size)
252
+ return if done?
253
+ start_pos = source_position
254
+ value = token
255
+ return unless value
256
+ type, val = value
257
+ Token.new(type, val, range(start_pos), @scanner.pos - @scanner.matched_size)
232
258
  end
233
259
 
234
260
  def whitespace
@@ -238,13 +264,19 @@ module Sass
238
264
  end
239
265
 
240
266
  def token
241
- if after_interpolation? && (interp_type = @interpolation_stack.pop)
242
- return string(interp_type, true)
267
+ if after_interpolation? && (interp = @interpolation_stack.pop)
268
+ interp_type, interp_value = interp
269
+ if interp_type == :special_fun
270
+ return special_fun_body(interp_value)
271
+ else
272
+ raise "[BUG]: Unknown interp_type #{interp_type}" unless interp_type == :string
273
+ return string(interp_value, true)
274
+ end
243
275
  end
244
276
 
245
- variable || string(:double, false) || string(:single, false) || number || color ||
246
- string(:uri, false) || raw(UNICODERANGE) || special_fun || special_val || ident_op ||
247
- ident || op
277
+ variable || string(:double, false) || string(:single, false) || number || id || color ||
278
+ selector || string(:uri, false) || raw(UNICODERANGE) || special_fun || special_val ||
279
+ ident_op || ident || op
248
280
  end
249
281
 
250
282
  def variable
@@ -263,82 +295,169 @@ module Sass
263
295
  end
264
296
 
265
297
  def string(re, open)
298
+ line, offset = @line, @offset
266
299
  return unless scan(STRING_REGULAR_EXPRESSIONS[re][open])
267
- if @scanner[2] == '#{' #'
268
- @scanner.pos -= 2 # Don't actually consume the #{
269
- @interpolation_stack << re
300
+ if @scanner[0] =~ /([^\\]|^)\n/
301
+ filename = @options[:filename]
302
+ Sass::Util.sass_warn <<MESSAGE
303
+ DEPRECATION WARNING on line #{line}, column #{offset}#{" of #{filename}" if filename}:
304
+ Unescaped multiline strings are deprecated and will be removed in a future version of Sass.
305
+ To include a newline in a string, use "\\a" or "\\a " as in CSS.
306
+ MESSAGE
307
+ end
308
+
309
+ if @scanner[2] == '#{' # '
310
+ @interpolation_stack << [:string, re]
311
+ start_pos = Sass::Source::Position.new(@line, @offset - 2)
312
+ @next_tok = Token.new(:string_interpolation, range(start_pos), @scanner.pos - 2)
270
313
  end
271
314
  str =
272
315
  if re == :uri
273
- Script::String.new("#{'url(' unless open}#{@scanner[1]}#{')' unless @scanner[2] == '#{'}")
316
+ url = "#{'url(' unless open}#{@scanner[1]}#{')' unless @scanner[2] == '#{'}"
317
+ Script::Value::String.new(url)
274
318
  else
275
- Script::String.new(@scanner[1].gsub(/\\(['"]|\#\{)/, '\1'), :string)
319
+ Script::Value::String.new(Sass::Script::Value::String.value(@scanner[1]), :string)
276
320
  end
277
321
  [:string, str]
278
322
  end
279
323
 
280
324
  def number
281
- return unless scan(REGULAR_EXPRESSIONS[:number])
282
- value = @scanner[2] ? @scanner[2].to_f : @scanner[3].to_i
283
- value = -value if @scanner[1]
284
- [:number, Script::Number.new(value, Array(@scanner[4]))]
325
+ # Handling unary minus is complicated by the fact that whitespace is an
326
+ # operator in SassScript. We want "1-2" to be parsed as "1 - 2", but we
327
+ # want "1 -2" to be parsed as "1 (-2)". To accomplish this, we only
328
+ # parse a unary minus as part of a number literal if there's whitespace
329
+ # before and not after it. Cases like "(-2)" are handled by the unary
330
+ # minus logic in the parser instead.
331
+ if @scanner.peek(1) == '-'
332
+ return if @scanner.pos == 0
333
+ unary_minus_allowed =
334
+ case @scanner.string[@scanner.pos - 1, 1]
335
+ when /\s/; true
336
+ when '/'; @scanner.pos != 1 && @scanner.string[@scanner.pos - 2, 1] == '*'
337
+ else; false
338
+ end
339
+
340
+ return unless unary_minus_allowed
341
+ return unless scan(REGULAR_EXPRESSIONS[:unary_minus_number])
342
+ minus = true
343
+ else
344
+ return unless scan(REGULAR_EXPRESSIONS[:number])
345
+ minus = false
346
+ end
347
+
348
+ value = (@scanner[1] ? @scanner[1].to_f : @scanner[2].to_i) * (minus ? -1 : 1)
349
+ value *= 10**@scanner[3].to_i if @scanner[3]
350
+ script_number = Script::Value::Number.new(value, Array(@scanner[4]))
351
+ [:number, script_number]
352
+ end
353
+
354
+ def id
355
+ # Colors and ids are tough to tell apart, because they overlap but
356
+ # neither is a superset of the other. "#xyz" is an id but not a color,
357
+ # "#000" is a color but not an id, "#abc" is both, and "#0" is neither.
358
+ # We need to handle all these cases correctly.
359
+ #
360
+ # To do so, we first try to parse something as an id. If this works and
361
+ # the id is also a valid color, we return the color. Otherwise, we
362
+ # return the id. If it didn't parse as an id, we then try to parse it as
363
+ # a color. If *this* works, we return the color, and if it doesn't we
364
+ # give up and throw an error.
365
+ #
366
+ # IDs in properties are used in the Basic User Interface Module
367
+ # (http://www.w3.org/TR/css3-ui/).
368
+ return unless scan(REGULAR_EXPRESSIONS[:id])
369
+ if @scanner[0] =~ /^\#[0-9a-fA-F]+$/ && (@scanner[0].length == 4 || @scanner[0].length == 7)
370
+ return [:color, Script::Value::Color.from_hex(@scanner[0])]
371
+ end
372
+ [:ident, @scanner[0]]
285
373
  end
286
374
 
287
375
  def color
288
- return unless s = scan(REGULAR_EXPRESSIONS[:color])
289
- raise Sass::SyntaxError.new(<<MESSAGE.rstrip) unless s.size == 4 || s.size == 7
290
- Colors must have either three or six digits: '#{s}'
291
- MESSAGE
292
- value = s.scan(/^#(..?)(..?)(..?)$/).first.
293
- map {|num| num.ljust(2, num).to_i(16)}
294
- [:color, Script::Color.new(value)]
376
+ return unless @scanner.match?(REGULAR_EXPRESSIONS[:color])
377
+ return unless @scanner[0].length == 4 || @scanner[0].length == 7
378
+ script_color = Script::Value::Color.from_hex(scan(REGULAR_EXPRESSIONS[:color]))
379
+ [:color, script_color]
380
+ end
381
+
382
+ def selector
383
+ start_pos = source_position
384
+ return unless scan(REGULAR_EXPRESSIONS[:selector])
385
+ script_selector = Script::Tree::Selector.new
386
+ script_selector.source_range = range(start_pos)
387
+ [:selector, script_selector]
295
388
  end
296
389
 
297
390
  def special_fun
298
- return unless str1 = scan(/((-[\w-]+-)?(calc|element)|expression|progid:[a-z\.]*)\(/i)
299
- str2, _ = Sass::Shared.balance(@scanner, ?(, ?), 1)
300
- c = str2.count("\n")
301
- old_line = @line
302
- old_offset = @offset
303
- @line += c
304
- @offset = (c == 0 ? @offset + str2.size : str2[/\n(.*)/, 1].size)
305
- [:special_fun,
306
- Sass::Util.merge_adjacent_strings(
307
- [str1] + Sass::Engine.parse_interp(str2, old_line, old_offset, @options)),
308
- str1.size + str2.size]
391
+ prefix = scan(/((-[\w-]+-)?(calc|element)|expression|progid:[a-z\.]*)\(/i)
392
+ return unless prefix
393
+ special_fun_body(1, prefix)
394
+ end
395
+
396
+ def special_fun_body(parens, prefix = nil)
397
+ str = prefix || ''
398
+ while (scanned = scan(/.*?([()]|\#\{)/m))
399
+ str << scanned
400
+ if scanned[-1] == ?(
401
+ parens += 1
402
+ next
403
+ elsif scanned[-1] == ?)
404
+ parens -= 1
405
+ next unless parens == 0
406
+ else
407
+ raise "[BUG] Unreachable" unless @scanner[1] == '#{' # '
408
+ str.slice!(-2..-1)
409
+ @interpolation_stack << [:special_fun, parens]
410
+ start_pos = Sass::Source::Position.new(@line, @offset - 2)
411
+ @next_tok = Token.new(:string_interpolation, range(start_pos), @scanner.pos - 2)
412
+ end
413
+
414
+ return [:special_fun, Sass::Script::Value::String.new(str)]
415
+ end
416
+
417
+ scan(/.*/)
418
+ expected!('")"')
309
419
  end
310
420
 
311
421
  def special_val
312
- return unless scan(/!important/i)
313
- [:string, Script::String.new("!important")]
422
+ return unless scan(/!#{W}important/i)
423
+ [:string, Script::Value::String.new("!important")]
314
424
  end
315
425
 
316
426
  def ident_op
317
- return unless op = scan(REGULAR_EXPRESSIONS[:ident_op])
427
+ op = scan(REGULAR_EXPRESSIONS[:ident_op])
428
+ return unless op
318
429
  [OPERATORS[op]]
319
430
  end
320
431
 
321
432
  def op
322
- return unless op = scan(REGULAR_EXPRESSIONS[:op])
323
- @interpolation_stack << nil if op == :begin_interpolation
324
- [OPERATORS[op]]
433
+ op = scan(REGULAR_EXPRESSIONS[:op])
434
+ return unless op
435
+ name = OPERATORS[op]
436
+ @interpolation_stack << nil if name == :begin_interpolation
437
+ [name]
325
438
  end
326
439
 
327
440
  def raw(rx)
328
- return unless val = scan(rx)
441
+ val = scan(rx)
442
+ return unless val
329
443
  [:raw, val]
330
444
  end
331
445
 
332
446
  def scan(re)
333
- return unless str = @scanner.scan(re)
447
+ str = @scanner.scan(re)
448
+ return unless str
334
449
  c = str.count("\n")
335
450
  @line += c
336
- @offset = (c == 0 ? @offset + str.size : str[/\n(.*)/, 1].size)
451
+ @offset = (c == 0 ? @offset + str.size : str.size - str.rindex("\n"))
337
452
  str
338
453
  end
339
454
 
340
- def current_position
341
- @offset + 1
455
+ def range(start_pos, end_pos = source_position)
456
+ Sass::Source::Range.new(start_pos, end_pos, @options[:filename], @options[:importer])
457
+ end
458
+
459
+ def source_position
460
+ Sass::Source::Position.new(@line, @offset)
342
461
  end
343
462
  end
344
463
  end