From 080596e6a16cc574a4515678fcf01006ffddf2dd Mon Sep 17 00:00:00 2001
From: jiyinyiyong <jiyinyiyong@gmail.com>
Date: Sun, 16 Feb 2014 23:49:54 +0800
Subject: [PATCH] fix dollar; add comma syntax

---
 demo/kitchen-sink/docs/cirru.cirru    |  8 +++++++-
 lib/ace/mode/cirru_highlight_rules.js | 12 ++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/demo/kitchen-sink/docs/cirru.cirru b/demo/kitchen-sink/docs/cirru.cirru
index 98013998..244833df 100644
--- a/demo/kitchen-sink/docs/cirru.cirru
+++ b/demo/kitchen-sink/docs/cirru.cirru
@@ -33,4 +33,10 @@ brackets ((((()))))
 print (add $ (int 1) (int 2))
 
 print $ unwrap $
-  map (a $ int 1) (b $ int 2)
\ No newline at end of file
+  map (a $ int 1) (b $ int 2)
+
+print a
+  int 1
+  , b c
+  int 2
+  , d
\ No newline at end of file
diff --git a/lib/ace/mode/cirru_highlight_rules.js b/lib/ace/mode/cirru_highlight_rules.js
index 27c60368..737ec0be 100644
--- a/lib/ace/mode/cirru_highlight_rules.js
+++ b/lib/ace/mode/cirru_highlight_rules.js
@@ -47,6 +47,10 @@ var CirruHighlightRules = function() {
         }, {
             token: 'storage.modifier',
             regex: /\(/,
+        }, {
+            token: 'storage.modifier',
+            regex: /\,/,
+            next: 'line',
         }, {
             token: 'support.function',
             regex: /[^\(\)\"\s]+/,
@@ -88,6 +92,10 @@ var CirruHighlightRules = function() {
             token: 'markup.raw',
             regex: /^\s*/,
             next: 'start',
+        }, {
+            token: 'storage.modifier',
+            regex: /\$/,
+            next: 'start',
         }, {
             token: 'variable.parameter',
             regex: /[^\(\)\"\s]+/
@@ -102,10 +110,6 @@ var CirruHighlightRules = function() {
             token: 'markup.raw',
             regex: /^\ */,
             next: 'start',
-        }, {
-            token: 'storage.modifier',
-            regex: /\$/,
-            next: 'start',
         }, {
             token: 'string.quoted.double',
             regex: /"/,