debug (got one more splitter after merge while diff occurs by edge)

Author: nighca

lib/merge.js

@@ -12,7 +12,7 @@
 
         for(var i = diff.length - 1, item; i >= 0; i--){
             item = diff[i];
-            result.splice(item[0], item[1], item[2]);
+            result.splice.apply(result, item);
         }
 
         return result.join(splitter);

lib/myers-compare.js

@@ -119,9 +119,13 @@
             if(j < i){
                 start = src.slice(0, j + 1).filter(notEmpty).length;            // start pos of diffs (on src)
                 len = src.slice(j + 1, i + 1).filter(notEmpty).length;          // length should be replaced (on src)
-                to = target.slice(j + 1, i + 1).filter(notEmpty).join(SPLITTER);// new content
+                to = target.slice(j + 1, i + 1).filter(notEmpty)                // new content
 
-                diff.unshift([start, len, to]);
+                diff.unshift(
+                    to.length ?
+                    [start, len, to.join(SPLITTER)] :                           // replace
+                    [start, len]                                                // remove
+                );
             }
 
             i = j - 1;

test/test.html

@@ -22,31 +22,46 @@
 <script type="text/javascript" src="../lib/myers-compare.js"></script>
 <script type="text/javascript" src="../lib/merge.js"></script>
 <script type="text/javascript">
-    var test = function(s1, s2, splitter){
-        //console.log(s1, s2);
-
+    var test = function(s1, s2, splitter, silently){
         var t = Date.now();
 
         var compareResult = compare(s1, s2, splitter);
 
-        console.debug(Date.now() - t + ' ms');
-        console.log(compareResult);
+        if(!silently){
+            console.log(s1, s2);
+            console.debug(Date.now() - t + ' ms');
+            console.log(compareResult);
+        }
 
         if(merge(s1, compareResult) !== s2){
-            console.error('wrong');
+            window.errorPair = [s1, s2];
+            console.warn(window.errorPair);
+            throw new Error('Wrong! see in window.errorPair.');
         }else{
             console.info('ok');
         }
     };
 
-    /*
     // do random tests
-    for(var l = 1000; l > 0; l--){
-        test((Math.random() + '').slice(-l), (Math.random() + '').slice(-l));
-    }
-    console.info('FINISHED');
-    */
-
+    /*var makeStr = function(len){
+        var s = '';
+        while(s.length < len){
+            s += Math.random();
+        }
+        return s.slice(0, len);
+    };
+    var randomTestTimer = setInterval(function(){
+        for(var l = 200; l > 0; l--){
+            try{
+                test(makeStr(l), makeStr(l), '', true);
+            }catch(e){
+                clearInterval(randomTestTimer);
+                throw e;
+            }
+        }
+        console.info('FINISHED');
+    }, 1000);*/
+    
     // do test with given input
     var in1 = document.getElementById('in1'),
         in2 = document.getElementById('in2');