Skip to content

Hi Gareth, I know you're there, please pull. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jvillard wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Hi Gareth, I know you're there, please pull. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ab7081
initialise changeLog of new users
Oct 25, 2011
783b04a
changed Content-type of the answer to putDiff to text/json
Oct 25, 2011
75da69f
remove unused functions from the diff library
Oct 25, 2011
e282560
fixed bug in the diff algorithm
Oct 25, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions diffLib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)});
Expand All @@ -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<newStr.length ; i++) { }
res.point = i;
for( ; oldStr[res.point]!==newStr[i] && i<newStr.length ; i++) {
res.content+=newStr[i];
}
// Assert: newStr.length - oldStr.length === i - res.point
return res;
}

// Requires that oldStr be the same as newStr, but with one extra char.
// \exists s1,s2,s3 st oldStr === s1+s2+s3 ^ newStr === s1+s3 ^ len(s2)===1
var makeDel = function(oldStr, newStr) {
var res = {type:"delete", length:1}
for(var i = 0 ; oldStr[i]===newStr[i] && i<newStr.length ; i++) { }
res.point = i;
// Assert: newStr.length - oldStr.length === i - res.point
return res;
}

// Tells you if two diffs clash footprints
var isClash = function(d1,d2) {
var d1fp = {start:d1.point, end:d1.point};
Expand All @@ -71,9 +43,6 @@ var updateAafterB = function(d1,d2) {

if(typeof(exports)!=='undefined') {
exports.applyDiff = applyDiff;
exports.makeDiff = makeDiff;
exports.makeInsert = makeInsert;
exports.makeDel = makeDel;
exports.isClash = isClash;
exports.updateAafterB = updateAafterB;
exports.makeDiffList = makeDiffList;
Expand Down
5 changes: 2 additions & 3 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ var handleReq = function(req, res) {
} else if(req.url.match(/^\/getDoc/)) {
res.writeHead(200, {'Content-Type': 'text/json'});
res.end(JSON.stringify([doc,++lastUser]));
changeLog[lastUser] = [];
} else if(df = req.url.match(/^\/getDiff\?(.*)/)) {
var uid = unescape(df[1]);
var mydiffs = changeLog[uid];
res.writeHead(200, {'Content-Type': 'text/plain'});
res.writeHead(200, {'Content-Type': 'text/json'});
res.end(JSON.stringify(mydiffs));
changeLog[uid] = [];
} else if(df = req.url.match(/^\/putDiff\?(.*)/)) {
Expand Down Expand Up @@ -63,5 +64,3 @@ var applyConcurrentDiff = function(df) {
}

http.createServer(handleReq).listen(4242,"127.0.0.1")