From 0f96a295baa5373f2b9d44e9d5c051003fdb08e9 Mon Sep 17 00:00:00 2001
From: Garry Hill <garry@garry.local>
Date: Thu, 10 Apr 2008 16:19:52 +0100
Subject: [PATCH] changed mixin definition char from - to $

---
 lib/sass/engine.rb              |    2 +-
 test/sass/engine_test.rb        |    6 +++---
 test/sass/results/mixins.css    |    5 +++++
 test/sass/templates/mixins.sass |   12 +++++++-----
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index fd0c2b6..baae5ed 100755
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -44,7 +44,7 @@ module Sass
     ESCAPE_CHAR    = ?\\

     # Designates block as mixin definition rather than CSS rules to output
-    MIXIN_DEFINITION_CHAR = ?-
+    MIXIN_DEFINITION_CHAR = ?$

     # Includes named mixin declared using MIXIN_DEFINITION_CHAR
     MIXIN_INCLUDE_CHAR    = ?+
diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb
index 52ec96b..952d759 100755
--- a/test/sass/engine_test.rb
+++ b/test/sass/engine_test.rb
@@ -48,9 +48,9 @@ class SassEngineTest < Test::Unit::TestCase
     "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
     "!foo = bar baz !" => "Unterminated constant.",
     "!foo = !(foo)" => "Invalid constant.",
-    "-foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'",
-    ".bar\n  -foo\n    :color red\n" => "Mixins may only be defined at the root of a document.",
-    "-foo\n  :color red\n.bar\n  +foo\n    :color red" => "Illegal nesting: Nothing may be nested beneath mixin directives.",
+    "$foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'",
+    ".bar\n  $foo\n    :color red\n" => "Mixins may only be defined at the root of a document.",
+    "$foo\n  :color red\n.bar\n  +foo\n    :color red" => "Illegal nesting: Nothing may be nested beneath mixin directives.",
   }

   def test_basic_render
diff --git a/test/sass/results/mixins.css b/test/sass/results/mixins.css
index 542c142..c81480e 100644
--- a/test/sass/results/mixins.css
+++ b/test/sass/results/mixins.css
@@ -7,6 +7,7 @@
   border-top-color: #ffcc00;
   border-left-width: 1px;
   border-left-color: #000;
+  -moz-border-radius: 10px;
   border-style: dotted;
   border-width: 2px;
 }
@@ -19,6 +20,7 @@
   border-top-color: #ffcc00;
   border-left-width: 1px;
   border-left-color: #000;
+  -moz-border-radius: 10px;
   font-size: 2em;
   font-weight: bold;
   float: left;
@@ -29,6 +31,7 @@
   border-top-color: #ffcc00;
   border-left-width: 1px;
   border-left-color: #000;
+  -moz-border-radius: 10px;
   color: #f00;
   font-size: 20px;
   float: right;
@@ -39,6 +42,7 @@
   border-top-color: #ffcc00;
   border-left-width: 1px;
   border-left-color: #000;
+  -moz-border-radius: 10px;
 }

 .complex {
@@ -85,4 +89,5 @@
   border-top-color: #ffcc00;
   border-left-width: 1px;
   border-left-color: #000;
+  -moz-border-radius: 10px;
 }
diff --git a/test/sass/templates/mixins.sass b/test/sass/templates/mixins.sass
index 91230be..2dc482e 100644
--- a/test/sass/templates/mixins.sass
+++ b/test/sass/templates/mixins.sass
@@ -1,6 +1,6 @@
 !yellow = #fc0

--bordered
+$bordered
   :border
     :top
       :width 2px
@@ -8,16 +8,18 @@
     :left
       :width 1px
       :color #000
--header-font
+  -moz-border-radius: 10px
+
+$header-font
   :color #f00
   :font
     :size 20px

--compound
+$compound
   +header-font
   +bordered

--complex
+$complex
   +header-font
   text:
     decoration: none
@@ -30,7 +32,7 @@
   * html &
     height: 1px
     +header-font
--deep
+$deep
   a:hover
     :text-decoration underline
     +compound
--
1.5.4.4