fixed regexes

riot · Dec 10, 2015 · 3459a5e · 3459a5e
1 parent 3e98bbd
commit 3459a5e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog for riot-tmpl
 
 ### v2.3.15
+- Regression of optimized regexes not working in IE9/10.
 - Fix [riot#1416](https://github.com/riot/riot/issues/1416): Issue with space in expression of `each`.
 - Fix: when calling the compiler with different brackets, `brackets.array` changes the global configuration (`riot.settings.brackets`).
 

diff --git a/dist/es6.tmpl.js b/dist/es6.tmpl.js
@@ -18,7 +18,7 @@ var brackets = (function (UNDEF) {
     REGLOB  = 'g',
 
     MLCOMMS = /\/\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//g,
-    STRINGS = /"[^"\\]*(?:\\[^][^"\\]*)*"|'[^'\\]*(?:\\[^][^'\\]*)*'/g,
+    STRINGS = /"[^"\\]*(?:\\[\S\s][^"\\]*)*"|'[^'\\]*(?:\\[\S\s][^'\\]*)*'/g,
 
     S_QBSRC = STRINGS.source + '|' +
       /(?:\breturn\s+|(?:[$\w\)\]]|\+\+|--)\s*(\/)(?![*\/]))/.source + '|' +
@@ -63,7 +63,7 @@ var brackets = (function (UNDEF) {
       arr = arr.concat(pair.replace(/(?=[[\]()*+?.^$|])/g, '\\').split(' '))
       cvt = _rewrite
     }
-    arr[4] = cvt(arr[1].length > 1 ? /{[^]*?}/ : /{[^}]*}/, arr)
+    arr[4] = cvt(arr[1].length > 1 ? /{[\S\s]*?}/ : /{[^}]*}/, arr)
     arr[5] = cvt(/\\({|})/g, arr)
     arr[6] = cvt(/(\\?)({)/g, arr)
     arr[7] = RegExp('(\\\\?)(?:([[({])|(' + arr[3] + '))|' + S_QBSRC, REGLOB)
@@ -208,7 +208,7 @@ var tmpl = (function () {
   }
 
   _tmpl.haveRaw = function (src) {
-    return brackets(/{=[^]*?}/).test(src)
+    return brackets(/(^|[^\\]){=[\S\s]*?}/).test(src)
   }
 
   _tmpl.hasExpr = brackets.hasExpr

diff --git a/dist/riot.tmpl.js b/dist/riot.tmpl.js
@@ -18,7 +18,7 @@ var brackets = (function (UNDEF) {
     REGLOB  = 'g',
 
     MLCOMMS = /\/\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//g,
-    STRINGS = /"[^"\\]*(?:\\[^][^"\\]*)*"|'[^'\\]*(?:\\[^][^'\\]*)*'/g,
+    STRINGS = /"[^"\\]*(?:\\[\S\s][^"\\]*)*"|'[^'\\]*(?:\\[\S\s][^'\\]*)*'/g,
 
     S_QBSRC = STRINGS.source + '|' +
       /(?:\breturn\s+|(?:[$\w\)\]]|\+\+|--)\s*(\/)(?![*\/]))/.source + '|' +
@@ -63,7 +63,7 @@ var brackets = (function (UNDEF) {
       arr = arr.concat(pair.replace(/(?=[[\]()*+?.^$|])/g, '\\').split(' '))
       cvt = _rewrite
     }
-    arr[4] = cvt(arr[1].length > 1 ? /{[^]*?}/ : /{[^}]*}/, arr)
+    arr[4] = cvt(arr[1].length > 1 ? /{[\S\s]*?}/ : /{[^}]*}/, arr)
     arr[5] = cvt(/\\({|})/g, arr)
     arr[6] = cvt(/(\\?)({)/g, arr)
     arr[7] = RegExp('(\\\\?)(?:([[({])|(' + arr[3] + '))|' + S_QBSRC, REGLOB)
@@ -208,7 +208,7 @@ var tmpl = (function () {
   }
 
   _tmpl.haveRaw = function (src) {
-    return brackets(/{=[^]*?}/).test(src)
+    return brackets(/(^|[^\\]){=[\S\s]*?}/).test(src)
   }
 
   _tmpl.hasExpr = brackets.hasExpr

diff --git a/dist/tmpl.js b/dist/tmpl.js
@@ -16,7 +16,7 @@
       REGLOB  = 'g',
 
       MLCOMMS = /\/\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//g,
-      STRINGS = /"[^"\\]*(?:\\[^][^"\\]*)*"|'[^'\\]*(?:\\[^][^'\\]*)*'/g,
+      STRINGS = /"[^"\\]*(?:\\[\S\s][^"\\]*)*"|'[^'\\]*(?:\\[\S\s][^'\\]*)*'/g,
 
       S_QBSRC = STRINGS.source + '|' +
         /(?:\breturn\s+|(?:[$\w\)\]]|\+\+|--)\s*(\/)(?![*\/]))/.source + '|' +
@@ -61,7 +61,7 @@
         arr = arr.concat(pair.replace(/(?=[[\]()*+?.^$|])/g, '\\').split(' '))
         cvt = _rewrite
       }
-      arr[4] = cvt(arr[1].length > 1 ? /{[^]*?}/ : /{[^}]*}/, arr)
+      arr[4] = cvt(arr[1].length > 1 ? /{[\S\s]*?}/ : /{[^}]*}/, arr)
       arr[5] = cvt(/\\({|})/g, arr)
       arr[6] = cvt(/(\\?)({)/g, arr)
       arr[7] = RegExp('(\\\\?)(?:([[({])|(' + arr[3] + '))|' + S_QBSRC, REGLOB)
@@ -206,7 +206,7 @@
     }
 
     _tmpl.haveRaw = function (src) {
-      return brackets(/{=[^]*?}/).test(src)
+      return brackets(/(^|[^\\]){=[\S\s]*?}/).test(src)
     }
 
     _tmpl.hasExpr = brackets.hasExpr

diff --git a/lib/brackets.js b/lib/brackets.js
@@ -33,7 +33,7 @@ var brackets = (function (UNDEF) {
   // `STRINGS` - Quoted strings. Don't care about inner eols<br>
 
     MLCOMMS = /\/\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//g,
-    STRINGS = /"[^"\\]*(?:\\[^][^"\\]*)*"|'[^'\\]*(?:\\[^][^'\\]*)*'/g,
+    STRINGS = /"[^"\\]*(?:\\[\S\s][^"\\]*)*"|'[^'\\]*(?:\\[\S\s][^'\\]*)*'/g,
 
   // `S_QBSRC` - `STRINGS` combined with regex sources matching division operators
   // and literal regexes, for use with the RegExp ctor.
@@ -111,7 +111,7 @@ var brackets = (function (UNDEF) {
       arr = arr.concat(pair.replace(/(?=[[\]()*+?.^$|])/g, '\\').split(' '))
       cvt = _rewrite
     }
-    arr[$_RIX_TEST] = cvt(arr[1].length > 1 ? /{[^]*?}/ : /{[^}]*}/, arr)
+    arr[$_RIX_TEST] = cvt(arr[1].length > 1 ? /{[\S\s]*?}/ : /{[^}]*}/, arr)
     arr[$_RIX_ESC] = cvt(/\\({|})/g, arr)
     arr[$_RIX_OPEN] = cvt(/(\\?)({)/g, arr) // for _split()
     arr[$_RIX_CLOSE] = RegExp('(\\\\?)(?:([[({])|(' + arr[3] + '))|' + S_QBSRC, REGLOB)

diff --git a/lib/tmpl.js b/lib/tmpl.js
@@ -64,7 +64,7 @@ var tmpl = (function () {
   }
 
   _tmpl.haveRaw = function (src) {
-    return brackets(/{=[^]*?}/).test(src)
+    return brackets(/(^|[^\\]){=[\S\s]*?}/).test(src)
   }
 
   /**

diff --git a/test/specs/brackets.specs.js b/test/specs/brackets.specs.js
@@ -66,6 +66,7 @@ describe('brackets', function () {
       expect(render('\\{ 1 }')).to.equal('{ 1 }')
       expect(render('{ "\\}" }')).to.equal('}')
       expect(render('{ "\\{" }')).to.equal('{')
+      expect(render('{ \\{\\} }')).to.eql({})
     })
 
     it('though escaping is optional', function () {
@@ -78,9 +79,11 @@ describe('brackets', function () {
 
       setBrackets('{{ }}')
       expect(render('a{{ "b{{c}}d" }}e {{ "{f{{f}}}" }} g')).to.equal('ab{{c}}de {f{{f}}} g')
+      expect(render('{{{}}}')).to.eql({})
 
-      //setBrackets('<% %>')
-      //expect(render('a<% "b<%c%>d" %>e <% "<%f<%f%>%>" %> g')).to.equal('ab<%c%>de <%f<%f%>%> g')
+      setBrackets('{^ ^}')
+      expect(render('{^ "x" ^}')).to.equal('x')
+      expect(render('{^ /{^}/ ^}').source).to.equal(/{^}/.source)
 
       setBrackets('[[ ]]')
       expect(render('a[[ "b[[c]]d" ]]e [["[[f[f]]]"]]g[[]]')).to.equal('ab[[c]]de [[f[f]]]g')