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

Merge branch 'stable'

Browse source
This commit is contained in:
Nathan Weizenbaum 2008-06-05 14:32:10 -07:00
commit 8bbea4fe72
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/sass/constant.rb
View file

@ -217,7 +217,10 @@ module Sass
#++ #++
def operationalize(value, constants) def operationalize(value, constants)
value = [value] unless value.is_a?(Array) value = [value] unless value.is_a?(Array)
if value.length == 1 case value.length
when 0
Sass::Constant::Nil.new
when 1
value = value[0] value = value[0]
if value.is_a? Array if value.is_a? Array
operationalize(value, constants) operationalize(value, constants)
@ -226,7 +229,7 @@ module Sass
else else
Literal.parse(value) Literal.parse(value)
end end
elsif value.length == 2 when 2
if value[0] == :neg if value[0] == :neg
Operation.new(Sass::Constant::Number.new('0'), operationalize(value[1], constants), :minus) Operation.new(Sass::Constant::Number.new('0'), operationalize(value[1], constants), :minus)
elsif value[0] == :const elsif value[0] == :const
@ -234,7 +237,7 @@ module Sass
else else
raise SyntaxError.new("Constant arithmetic error") raise SyntaxError.new("Constant arithmetic error")
end end
elsif value.length == 3 when 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 ORDER[value[1]] && ORDER[value[3]] && ORDER[value[1]] > ORDER[value[3]] if ORDER[value[1]] && ORDER[value[3]] && ORDER[value[1]] > ORDER[value[3]]

1
lib/sass/constant/literal.rb
View file

@ -4,6 +4,7 @@ module Sass::Constant; class Literal; end; end; # :nodoc:
require 'sass/constant/string' require 'sass/constant/string'
require 'sass/constant/number' require 'sass/constant/number'
require 'sass/constant/color' require 'sass/constant/color'
require 'sass/constant/nil'
class Sass::Constant::Literal # :nodoc: class Sass::Constant::Literal # :nodoc:
# The regular expression matching numbers. # The regular expression matching numbers.

9
lib/sass/constant/nil.rb Normal file
View file

@ -0,0 +1,9 @@
require 'sass/constant/literal'
module Sass::Constant # :nodoc:
class Nil < Literal # :nodoc:
def to_s
''
end
end
end

4
test/sass/engine_test.rb
View file

@ -141,8 +141,8 @@ class SassEngineTest < Test::Unit::TestCase
end end
def test_default_function def test_default_function
assert_equal("foo {\n bar: url(foo.png); }\n", assert_equal("foo {\n bar: url(foo.png); }\n", render("foo\n bar = url(foo.png)\n"));
render("foo\n bar = url(foo.png)\n")); assert_equal("foo {\n bar: url(); }\n", render("foo\n bar = url()\n"));
end end
def test_basic_multiline_selector def test_basic_multiline_selector