diff --git a/diffLib.js b/diffLib.js index e60f060..69d4f49 100644 --- a/diffLib.js +++ b/diffLib.js @@ -6,18 +6,13 @@ var applyDiff = function(oldStr, diff) { } } -var makeDiff = function(oldStr, newStr) { - if (oldStr.length > newStr.length) return makeDel(oldStr,newStr); - else return makeInsert(oldStr,newStr); -} - var makeDiffList = function(oldStr, newStr) { if (oldStr === newStr) return []; res = []; // i := the number of equal chars at the beginning of the strings for(var i = 0 ; i< oldStr.length && i< newStr.length && oldStr[i]===newStr[i] ; i++) {} // j := the number of equal chars at the end of the strings - for(var j = 0 ; j< oldStr.length && j< newStr.length && oldStr[oldStr.length-j-1]===newStr[newStr.length-j-1] ; j++) {} + for(var j = 0 ; j< oldStr.length - i && j< newStr.length - i && oldStr[oldStr.length-j-1]===newStr[newStr.length-j-1] ; j++) {} if(i+j!==oldStr.length) { // Some stuff was deleted from oldStr res.push({type:"delete",point:i,length:(oldStr.length-i-j)}); @@ -29,29 +24,6 @@ var makeDiffList = function(oldStr, newStr) { return res; } -// Requires that oldStr be the same as newStr, but missing a single contiguous block. -// \exists s1,s2,s3 st oldStr === s1+s3 ^ newStr === s1+s2+s3 -var makeInsert = function(oldStr, newStr) { - var res = {type:"insert", content:""}; - for(var i = 0 ; oldStr[i]===newStr[i] && i