Use ~ rather than () for whitespace control.

3 files changed, 30 insertions, 30 deletions

diff --git a/spec/whitespace-control.js b/spec/whitespace-control.js
index 3a2711d..2088ed8 100644
--- a/spec/whitespace-control.js
+++ b/spec/whitespace-control.js
@@ -2,61 +2,61 @@ describe('whitespace control', function() {
   it('should strip whitespace around mustache calls', function() {
     var hash = {foo: 'bar<'};
 
-    shouldCompileTo(' {{(foo)}} ', hash, 'bar&lt;');
-    shouldCompileTo(' {{(foo}} ', hash, 'bar&lt; ');
-    shouldCompileTo(' {{foo)}} ', hash, ' bar&lt;');
+    shouldCompileTo(' {{~foo~}} ', hash, 'bar&lt;');
+    shouldCompileTo(' {{~foo}} ', hash, 'bar&lt; ');
+    shouldCompileTo(' {{foo~}} ', hash, ' bar&lt;');
 
-    shouldCompileTo(' {{(&foo)}} ', hash, 'bar<');
-    shouldCompileTo(' {{({foo})}} ', hash, 'bar<');
+    shouldCompileTo(' {{~&foo~}} ', hash, 'bar<');
+    shouldCompileTo(' {{~{foo}~}} ', hash, 'bar<');
   });
 
   describe('blocks', function() {
     it('should strip whitespace around simple block calls', function() {
       var hash = {foo: 'bar<'};
 
-      shouldCompileTo(' {{(#if foo)}} bar {{(/if)}} ', hash, 'bar');
-      shouldCompileTo(' {{#if foo)}} bar {{/if)}} ', hash, ' bar ');
-      shouldCompileTo(' {{(#if foo}} bar {{(/if}} ', hash, ' bar ');
+      shouldCompileTo(' {{~#if foo~}} bar {{~/if~}} ', hash, 'bar');
+      shouldCompileTo(' {{#if foo~}} bar {{/if~}} ', hash, ' bar ');
+      shouldCompileTo(' {{~#if foo}} bar {{~/if}} ', hash, ' bar ');
       shouldCompileTo(' {{#if foo}} bar {{/if}} ', hash, '  bar  ');
     });
     it('should strip whitespace around inverse block calls', function() {
       var hash = {};
 
-      shouldCompileTo(' {{(^if foo)}} bar {{(/if)}} ', hash, 'bar');
-      shouldCompileTo(' {{^if foo)}} bar {{/if)}} ', hash, ' bar ');
-      shouldCompileTo(' {{(^if foo}} bar {{(/if}} ', hash, ' bar ');
+      shouldCompileTo(' {{~^if foo~}} bar {{~/if~}} ', hash, 'bar');
+      shouldCompileTo(' {{^if foo~}} bar {{/if~}} ', hash, ' bar ');
+      shouldCompileTo(' {{~^if foo}} bar {{~/if}} ', hash, ' bar ');
       shouldCompileTo(' {{^if foo}} bar {{/if}} ', hash, '  bar  ');
     });
     it('should strip whitespace around complex block calls', function() {
       var hash = {foo: 'bar<'};
 
-      shouldCompileTo('{{#if foo)}} bar {{(^)}} baz {{(/if}}', hash, 'bar');
-      shouldCompileTo('{{#if foo)}} bar {{^)}} baz {{/if}}', hash, 'bar ');
-      shouldCompileTo('{{#if foo}} bar {{(^)}} baz {{(/if}}', hash, ' bar');
-      shouldCompileTo('{{#if foo}} bar {{^)}} baz {{/if}}', hash, ' bar ');
+      shouldCompileTo('{{#if foo~}} bar {{~^~}} baz {{~/if}}', hash, 'bar');
+      shouldCompileTo('{{#if foo~}} bar {{^~}} baz {{/if}}', hash, 'bar ');
+      shouldCompileTo('{{#if foo}} bar {{~^~}} baz {{~/if}}', hash, ' bar');
+      shouldCompileTo('{{#if foo}} bar {{^~}} baz {{/if}}', hash, ' bar ');
 
-      shouldCompileTo('{{#if foo)}} bar {{(else)}} baz {{(/if}}', hash, 'bar');
+      shouldCompileTo('{{#if foo~}} bar {{~else~}} baz {{~/if}}', hash, 'bar');
 
       hash = {};
 
-      shouldCompileTo('{{#if foo)}} bar {{(^)}} baz {{(/if}}', hash, 'baz');
-      shouldCompileTo('{{#if foo}} bar {{(^)}} baz {{/if}}', hash, 'baz ');
-      shouldCompileTo('{{#if foo)}} bar {{(^}} baz {{(/if}}', hash, ' baz');
-      shouldCompileTo('{{#if foo)}} bar {{(^}} baz {{/if}}', hash, ' baz ');
+      shouldCompileTo('{{#if foo~}} bar {{~^~}} baz {{~/if}}', hash, 'baz');
+      shouldCompileTo('{{#if foo}} bar {{~^~}} baz {{/if}}', hash, 'baz ');
+      shouldCompileTo('{{#if foo~}} bar {{~^}} baz {{~/if}}', hash, ' baz');
+      shouldCompileTo('{{#if foo~}} bar {{~^}} baz {{/if}}', hash, ' baz ');
 
-      shouldCompileTo('{{#if foo)}} bar {{(else)}} baz {{(/if}}', hash, 'baz');
+      shouldCompileTo('{{#if foo~}} bar {{~else~}} baz {{~/if}}', hash, 'baz');
     });
   });
 
   it('should strip whitespace around partials', function() {
-    shouldCompileToWithPartials('foo {{(> dude)}} ', [{}, {}, {dude: 'bar'}], true, 'foobar');
-    shouldCompileToWithPartials('foo {{> dude)}} ', [{}, {}, {dude: 'bar'}], true, 'foo bar');
+    shouldCompileToWithPartials('foo {{~> dude~}} ', [{}, {}, {dude: 'bar'}], true, 'foobar');
+    shouldCompileToWithPartials('foo {{> dude~}} ', [{}, {}, {dude: 'bar'}], true, 'foo bar');
     shouldCompileToWithPartials('foo {{> dude}} ', [{}, {}, {dude: 'bar'}], true, 'foo bar ');
   });
 
   it('should only strip whitespace once', function() {
     var hash = {foo: 'bar'};
 
-    shouldCompileTo(' {{(foo)}} {{foo}} {{foo}} ', hash, 'barbar bar ');
+    shouldCompileTo(' {{~foo~}} {{foo}} {{foo}} ', hash, 'barbar bar ');
   });
 });
diff --git a/src/handlebars.l b/src/handlebars.l
index 740015b..ddb7fe9 100644
--- a/src/handlebars.l
+++ b/src/handlebars.l
@@ -9,11 +9,11 @@ function strip(start, end) {
 
 %}
 
-LEFT_STRIP    "("
-RIGHT_STRIP   ")"
+LEFT_STRIP    "~"
+RIGHT_STRIP   "~"
 
-LOOKAHEAD           [=)}\s\/.]
-LITERAL_LOOKAHEAD   [)}\s]
+LOOKAHEAD           [=~}\s\/.]
+LITERAL_LOOKAHEAD   [~}\s]
 
 /*
 ID is the inverse of control characters.
diff --git a/src/handlebars.yy b/src/handlebars.yy
index 6ee2207..0afd2cb 100644
--- a/src/handlebars.yy
+++ b/src/handlebars.yy
@@ -6,8 +6,8 @@
 
 function stripFlags(open, close) {
   return {
-    left: open[2] === '(',
-    right: close[0] === ')' || close[1] === ')'
+    left: open[2] === '~',
+    right: close[0] === '~' || close[1] === '~'
   };
 }