Merge pull request #15 from johnkpaul/fix_issue_14

fix issue #14, break out of regex loop if match length is 0
jonmagic · Apr 12, 2012 · 8dc32ee · 8dc32ee
2 parents 3d5b74e + 5059204
commit 8dc32ee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/application.js b/application.js
diff --git a/scripts/application.coffee b/scripts/application.coffee
@@ -104,6 +104,7 @@ class Results
         index = execution.index
         length = execution[0].length
         result.push({index:index,length:length})
+        break if length+index == 0
         value = value.substr(length+index)
     result
 

diff --git a/spec/ResultsSpec.coffee b/spec/ResultsSpec.coffee
@@ -8,6 +8,7 @@ describe 'Results', ->
 
   subjects = [
     {'regex': 'a', 'test_strings': [{'string': 'a'}], 'output': '<span>a</span>'}
+    {'regex': '(issues)?', 'test_strings': [{'string': 'issues'}], 'output': '<span>issues</span>'}
     {'regex': 'a$', 'test_strings': [{'string': 'asdfja'}], 'output': 'asdfj<span>a</span>'}
     {'regex': '"$', 'test_strings': [{'string': '"hello"'}], 'output': '"hello<span>"</span>'}
     {'regex': 'a(.*)c', 'test_strings': [{'string': 'abcdd', 'matches': ['b']}], 'output': '<span>abc</span>dd'}

diff --git a/spec/ResultsSpec.js b/spec/ResultsSpec.js