diff --git a/lib/sass/constant.rb b/lib/sass/constant.rb index 80c10a64..0c39f1ad 100644 --- a/lib/sass/constant.rb +++ b/lib/sass/constant.rb @@ -121,7 +121,7 @@ module Sass else raise "Syntax error:\n#{original}" unless length >= 5 && length % 2 == 1 if SECOND_ORDER.include?(value[1]) && FIRST_ORDER.include?(value[3]) - operationalize([value[1], value[2], operationalize(value[3..5], original, constants), *value[6..-1]], original, constants) + operationalize([value[0], value[1], operationalize(value[2..4], original, constants), *value[5..-1]], original, constants) else operationalize([operationalize(value[0..2], original, constants), *value[3..-1]], original, constants) end diff --git a/test/sass/results/constants.css b/test/sass/results/constants.css index 2e489ccc..04797b80 100644 --- a/test/sass/results/constants.css +++ b/test/sass/results/constants.css @@ -1,5 +1,5 @@ #main { width: 30; background-color: #000; color: #ffffaf; } -#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10+12; many: 6; complex: #4c9db1hi4; } +#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10+12; many: 6; complex: #4c9db1hi16; } #plus { num-num: 7; num-num-neg: -3; num-str: 100px; num-col: #bcbcbc; str-str: hi there; str-num: times: 13; col-num: #ff8aaa; col-col: #5f80ff; } diff --git a/test/sass/templates/constants.sass b/test/sass/templates/constants.sass index 227fc476..a2a03fa3 100644 --- a/test/sass/templates/constants.sass +++ b/test/sass/templates/constants.sass @@ -20,7 +20,8 @@ :neg= !neg :esc= !esc :many= 1 + 2 + 3 - :complex= ((1 + 2) + 15)+#3a8b9f + (hi+(1 +1+ 2)) + :order= 1 + 2 * 3 + :complex= ((1 + 2) + 15)+#3a8b9f + (hi+(1 +1+ 2)* 4) #plus :num