kotovalexarian-likes-github/haml--haml
1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00
Code Releases Activity

Deal more flexibly with order of operations for Sass constants.

Browse source
This commit is contained in:
Nathan Weizenbaum 2008-06-01 15:14:57 -07:00
parent b519b5d72d
commit 1f3143205f
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/sass/constant.rb
View file

@ -34,6 +34,15 @@ module Sass
# The regular expression used to parse constants # The regular expression used to parse constants
MATCH = /^#{Regexp.escape(CONSTANT_CHAR.chr)}([^\s#{(SYMBOLS.keys + [ ?= ]).map {|c| Regexp.escape("#{c.chr}") }.join}]+)\s*((?:\|\|)?=)\s*(.+)/ MATCH = /^#{Regexp.escape(CONSTANT_CHAR.chr)}([^\s#{(SYMBOLS.keys + [ ?= ]).map {|c| Regexp.escape("#{c.chr}") }.join}]+)\s*((?:\|\|)?=)\s*(.+)/
# Order of operations hash
ORDER = {
:times => 1,
:div => 1,
:mod => 1,
:plus => 2,
:minus => 2,
:comma => 3,
}
# First-order operations # First-order operations
FIRST_ORDER = [:times, :div, :mod] FIRST_ORDER = [:times, :div, :mod]
@ -228,7 +237,7 @@ module Sass
elsif value.length == 3 elsif value.length == 3
Operation.new(operationalize(value[0], constants), operationalize(value[2], constants), value[1]) Operation.new(operationalize(value[0], constants), operationalize(value[2], constants), value[1])
else else
if SECOND_ORDER.include?(value[1]) && FIRST_ORDER.include?(value[3]) if ORDER[value[1]] && ORDER[value[3]] && ORDER[value[1]] > ORDER[value[3]]
operationalize([value[0], value[1], operationalize(value[2..4], constants), *value[5..-1]], constants) operationalize([value[0], value[1], operationalize(value[2..4], constants), *value[5..-1]], constants)
else else
operationalize([operationalize(value[0..2], constants), *value[3..-1]], constants) operationalize([operationalize(value[0..2], constants), *value[3..-1]], constants)