github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-29 06:12:18 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: New FillDiff features

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6948 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-02-24 19:06:00 +00:00
parent a2a391f4e3
commit 3024f7af94
16 changed files with 389 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

102
uppsrc/TextDiffCtrl/PatchDiff.cpp Normal file
View file

@ -0,0 +1,102 @@
#include "TextDiffCtrl.h"
namespace Upp {
void PatchDiff::Copy(FileIn& in, FileIn& oin, int& l, int ln, int n)
{
if(ln < l)
throw CParser::Error("");
while(l < ln) {
if(oin.IsEof())
throw CParser::Error("");
extfile << oin.GetLine() << "\r\n";
l++;
}
l += n;
while(n--)
oin.GetLine();
}
void PatchDiff::LoadDiff(const char *fn)
{
try {
FileIn in(fn);
FileIn oin(editfile);
extfile.Clear();
int l = 1;
String s = in.GetLine();
if(IsDigit(*s)) {
in.Seek(0);
while(!in.IsEof()) {
s = in.GetLine();
if(IsDigit(*s)) {
CParser p(s);
int ln = p.ReadNumber();
int n = 0;
if(p.Char('a'))
ln++;
else {
n = p.Char(',') ? p.ReadNumber() - ln + 1 : 1;
if(!p.Char('c'))
p.PassChar('d');
}
Copy(in, oin, l, ln, n);
}
else
if(*s == '>') {
if(s[1] != ' ')
throw CParser::Error("");
extfile << s.Mid(2) << "\r\n";
}
else
if(*s != '<' && *s != '-')
throw CParser::Error("");
}
}
else {
for(;;) {
if(in.IsEof())
throw CParser::Error("");
if(in.GetLine().Mid(0, 4) == "+++ ")
break;
}
while(!in.IsEof()) {
String s = in.GetLine();
if(*s == '@') {
CParser p(s);
p.PassChar2('@', '@');
p.PassChar('-');
int ln = p.ReadNumber();
int n = 1;
if(p.Char(','))
n = p.ReadNumber();
Copy(in, oin, l, ln, n);
}
else
if(*s == '+' || *s == ' ')
extfile << s.Mid(1) << "\r\n";
else
if(*s != '-')
throw CParser::Error("");
}
}
while(!oin.IsEof())
extfile << oin.GetLine() << "\r\n";
}
catch(CParser::Error&) {
Exclamation("Invalid file format!");
extfile = LoadFile(fn);
}
}
void PatchDiff::Open()
{
if(!DiffFs().ExecuteOpen())
return;
String f = ~DiffFs();
r <<= f;
LoadDiff(f);
diff.Set(LoadFile(editfile), extfile);
}
};