nex3 / haml fork watch download tarball
public
Description: HTML Abstraction Markup Language - A Markup Haiku
Homepage: http://haml.hamptoncatlin.com
Clone URL: git://github.com/nex3/haml.git 
Sassy auto-concatenation with strings works.


git-svn-id: svn://hamptoncatlin.com/haml/trunk@389 
7063305b-7217-0410-af8c-cdc13e5119b9
nex3 (author)
Sun Mar 04 12:49:27 -0800 2007
commit  53f3f61c87d119336691382dc2fdbc5434531f0e
tree    3390536271153b939e4e1f0e440f4d7db170100e
parent  e3abb5d18751d611e78af0c54659bd6ae281266b
0
lib/sass/constant.rb 
...
74
75
76
 
 
77
78
79
 
 
 
 
 
 
80
81
82
...
87
88
89
90
91
92
93
 
...
74
75
76
77
78
79
 
80
81
82
83
84
85
86
87
88
89
...
94
95
96
 
97
98
99
 
0
@@ -74,9 +74,16 @@ module Sass
0
               next
0
             end
0
 
0
+            last = to_return[-1]
0
+
0
             if byte == STRING_CHAR
0
-              str = reset_str.call
0
               is_string = !is_string
0
+
0
+              if is_string && last && (!last.is_a?(Symbol) || last == :close)
0
+                to_return << :concat
0
+              end
0
+
0
+              str = reset_str.call
0
               next
0
             end
0
 
0
@@ -87,7 +94,6 @@ module Sass
0
                 next
0
               end
0
             
0
-              last = to_return[-1]
0
               symbol = SYMBOLS[byte]
0
 
0
               if (symbol.nil? || symbol == :open) &&
0
test/sass/engine_test.rb 
...
8
9
10
11
12
13
14
 
...
8
9
10
 
11
12
13
 
0
@@ -8,7 +8,6 @@ class SassEngineTest < Test::Unit::TestCase
0
   EXCEPTION_MAP = {
0
     "!a = 1 + " => 'Constant arithmetic error: "1 +"',
0
     "!a = 1 + 2 +" => 'Constant arithmetic error: "1 + 2 +"',
0
-    "!a = hello \"world\"" => 'Constant arithmetic error: "hello \\"world\\""',
0
     "!a = \"b" => 'Unterminated string: "\\"b"',
0
     "!a = #aaa - a" => 'Undefined operation: "#afafaf minus a"',
0
     "!a = #aaa / a" => 'Undefined operation: "#afafaf div a"',
0
test/sass/results/constants.css 
...
1
 
2
3
4
 
...
 
1
2
3
4
 
0
@@ -1,4 +1,4 @@
0
-#main { content: Hello!; qstr: Quo"ted"!; hstr: Hyph-en!; width: 30em; background-color: #000; color: #ffffaf; con: foo bar 9 hi there boom; }
0
+#main { content: Hello!; qstr: Quo"ted"!; hstr: Hyph-en!; width: 30em; background-color: #000; color: #ffffaf; con: foo bar 9 hi there boom; con2: noquo quo; }
0
 #main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10+12; many: 6; order: 7; complex: #4c9db1hi16; }
0
 
0
 #plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #bcbcbc; str-str: hi there; str-str2: hi there; str-col: 14em solid #1f2f3f; str-num: times: 13; col-num: #ff8aaa; col-col: #5f80ff; }
0
test/sass/templates/constants.sass 
...
19
20
21
 
22
23
24
 
...
19
20
21
22
23
24
25
 
0
@@ -19,6 +19,7 @@
0
   :background-color #000
0
   :color= !main_text
0
   :con= foo bar (!concat boom)
0
+  :con2= noquo "quo"
0
   #sidebar
0
     :background-color= !color
0
     :num

Comments

    No one has commented yet.