support splitter as a function while compare

Author: nighca

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "diff-merge",
   "main": "dist/index.js",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "https://github.com/nighca/diff-merge",
   "authors": [
     "nighca <[email protected]>"

dist/diff.js

@@ -12,7 +12,7 @@
  */
 
 var compare = function(cnt1, cnt2, splitter){
-    var SPLITTER = splitter || '',
+    var SPLITTER = typeof splitter === 'string' ? splitter : '',
 
         MARK_EMPTY = -1,
         MARK_SAME = 0,
@@ -35,8 +35,14 @@ var compare = function(cnt1, cnt2, splitter){
     }
 
     // convert string to array
-    var arr1 = cnt1.split(SPLITTER),
+    var arr1, arr2;
+    if(typeof splitter === 'function'){
+        arr1 = splitter(cnt1);
+        arr2 = splitter(cnt2);
+    }else{
+        arr1 = cnt1.split(SPLITTER);
         arr2 = cnt2.split(SPLITTER);
+    }
 
     var N = arr1.length,
         M = arr2.length,

dist/diff.min.js

@@ -5,7 +5,7 @@
  */
 
 var compare = function(cnt1, cnt2, splitter){
-    var SPLITTER = splitter || '',
+    var SPLITTER = typeof splitter === 'string' ? splitter : '',
 
         MARK_EMPTY = -1,
         MARK_SAME = 0,
@@ -28,8 +28,14 @@ var compare = function(cnt1, cnt2, splitter){
     }
 
     // convert string to array
-    var arr1 = cnt1.split(SPLITTER),
+    var arr1, arr2;
+    if(typeof splitter === 'function'){
+        arr1 = splitter(cnt1);
+        arr2 = splitter(cnt2);
+    }else{
+        arr1 = cnt1.split(SPLITTER);
         arr2 = cnt2.split(SPLITTER);
+    }
 
     var N = arr1.length,
         M = arr2.length,

lib/myers-compare.js

@@ -1,6 +1,6 @@
 {
   "name": "diff-merge",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "diff & merge algorithm realized with Javascript",
   "main": "index.js",
   "directories": {

package.json

@@ -67,7 +67,30 @@
         in2 = document.getElementById('in2');
 
     var doTest = function(){
-        test(in1.value, in2.value, ',');
+        test(in1.value, in2.value, participle);
+    };
+
+    // do test with participle
+    var participle = function(cnt){
+        var arr = [];
+        for(var i = 1, l = cnt.length, pos = 0; i < l; i++){
+            var isPlainPattern = /[\w\_\$]+/,
+                isPrevPlain = isPlainPattern.test(cnt[i-1]),
+                isPlain = isPlainPattern.test(cnt[i]);
+
+            if(
+                !(isPrevPlain && isPlain)
+            ){
+                arr.push(cnt.slice(pos, i));
+                pos = i;
+            }
+
+            if(i === l-1){
+                arr.push(cnt.slice(pos));
+            }
+        }
+
+        return arr;
     };
 </script>
 </body>