2018-02-12 16:24:13 +01:00
|
|
|
|
using System;
|
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
|
using System.Linq;
|
|
|
|
|
|
using System.Text;
|
|
|
|
|
|
using System.Threading.Tasks;
|
|
|
|
|
|
using System.IO;
|
|
|
|
|
|
using System.Text.RegularExpressions;
|
|
|
|
|
|
|
|
|
|
|
|
namespace difftool
|
|
|
|
|
|
{
|
|
|
|
|
|
class Program
|
|
|
|
|
|
{
|
|
|
|
|
|
static private List<string> GetDiff(string[] s1, string[] s2)
|
|
|
|
|
|
{
|
|
|
|
|
|
List<string> ret = new List<string>();
|
|
|
|
|
|
|
|
|
|
|
|
int i2 = 0;
|
|
|
|
|
|
for (int i1 = 0; i1 < s1.Length; ++i1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (i2 >= s2.Length)
|
|
|
|
|
|
{
|
|
|
|
|
|
ret.Add(s1[i1]);
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (s1[i1] == s2[i2])
|
|
|
|
|
|
{
|
|
|
|
|
|
++i2;
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
for (int i3 = i2 + 1; i3 < i2 + 300 && i3 < s2.Length; ++i3)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (s1[i1] == s2[i3])
|
|
|
|
|
|
{
|
|
|
|
|
|
i2 = i3;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (s1[i1] == s2[i2])
|
|
|
|
|
|
{
|
|
|
|
|
|
++i2;
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
ret.Add(s1[i1]);
|
|
|
|
|
|
}
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static private string textToHtml(string s) {
|
|
|
|
|
|
return s.Replace("&", "&").Replace("<", "<").Replace(">", ">");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static Boolean isNameChar(char c) {
|
|
|
|
|
|
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_';
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2018-02-13 13:15:39 +01:00
|
|
|
|
// color theme:
|
|
|
|
|
|
// http://www.eclipsecolorthemes.org/?view=theme&id=47
|
|
|
|
|
|
private const string foregroundFont = "<font color=\"#E2E2E2\">";
|
|
|
|
|
|
private const string keywordFont = "<font color=\"#8DCBE2\">";
|
|
|
|
|
|
private const string numberFont = "<font color=\"#EAB882\">";
|
|
|
|
|
|
private const string stringFont = "<font color=\"#CC9393\">";
|
|
|
|
|
|
private const string singleLineCommentFont = "<font color=\"#7F9F7F\">";
|
|
|
|
|
|
private const string multiLineCommentFont = "<font color=\"#73879B\">";
|
|
|
|
|
|
private const string lineNumberFont = "<font color=\"#C0C0C0\">";
|
|
|
|
|
|
|
2018-02-12 16:24:13 +01:00
|
|
|
|
static private void writeSourceFile(string path, string w, string filename) {
|
|
|
|
|
|
string errorLoc = w.Substring(0, w.IndexOf(']'));
|
|
|
|
|
|
string f = errorLoc.Substring(1, errorLoc.LastIndexOf(':')-1);
|
|
|
|
|
|
int errorLine = Int32.Parse(errorLoc.Substring(1 + errorLoc.LastIndexOf(':')));
|
|
|
|
|
|
string[] lines = System.IO.File.ReadAllLines(path + f);
|
2018-02-13 13:15:39 +01:00
|
|
|
|
string[] keywords = { "void", "bool", "char", "short", "int", "long", "double", "float",
|
|
|
|
|
|
"class", "struct", "union", "enum", "namespace",
|
|
|
|
|
|
"for", "if", "while", "using", "return", "unsigned", "signed",
|
|
|
|
|
|
"private", "protected", "public",
|
|
|
|
|
|
"static", "const", "template", "typename", "auto",
|
|
|
|
|
|
"true", "false", "this" };
|
2018-02-12 16:24:13 +01:00
|
|
|
|
System.IO.StreamWriter file = new System.IO.StreamWriter(path + filename);
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.Write("<html><head><title>" + textToHtml(w) + "</title></head><body bgcolor=\"#202020\"><pre>" + foregroundFont + textToHtml(w) + "\n");
|
|
|
|
|
|
int linenr = 0;
|
|
|
|
|
|
bool multiline = false;
|
2018-02-12 16:24:13 +01:00
|
|
|
|
foreach (string line in lines) {
|
2018-02-13 13:15:39 +01:00
|
|
|
|
++linenr;
|
|
|
|
|
|
file.Write(lineNumberFont + (linenr.ToString() + " ").Substring(0, 8) + "</font>");
|
2018-02-12 16:24:13 +01:00
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < line.Length;) {
|
|
|
|
|
|
if (line[i] == ' ')
|
|
|
|
|
|
{
|
|
|
|
|
|
file.Write(line[i]);
|
|
|
|
|
|
i++;
|
|
|
|
|
|
}
|
2018-02-13 13:15:39 +01:00
|
|
|
|
else if (multiline)
|
|
|
|
|
|
{
|
|
|
|
|
|
string currentToken = "";
|
|
|
|
|
|
while (i < line.Length && multiline)
|
|
|
|
|
|
{
|
|
|
|
|
|
currentToken += line[i];
|
|
|
|
|
|
i++;
|
|
|
|
|
|
if (currentToken.EndsWith("*/"))
|
|
|
|
|
|
multiline = false;
|
|
|
|
|
|
}
|
|
|
|
|
|
file.Write(multiLineCommentFont + textToHtml(currentToken) + "</font>");
|
|
|
|
|
|
}
|
2018-02-12 16:24:13 +01:00
|
|
|
|
else if (isNameChar(line[i]))
|
|
|
|
|
|
{
|
|
|
|
|
|
string currentToken = "";
|
|
|
|
|
|
while (i < line.Length && isNameChar(line[i]))
|
|
|
|
|
|
{
|
|
|
|
|
|
currentToken += line[i];
|
|
|
|
|
|
i++;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (keywords.Contains(currentToken))
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.Write(keywordFont + currentToken + "</font>");
|
2018-02-12 16:24:13 +01:00
|
|
|
|
else if (currentToken[0] >= '0' && currentToken[0] <= '9')
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.Write(numberFont + currentToken + "</font>");
|
2018-02-12 16:24:13 +01:00
|
|
|
|
else
|
|
|
|
|
|
file.Write(currentToken);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (line[i] == '\"' || line[i] == '\'')
|
|
|
|
|
|
{
|
|
|
|
|
|
string currentToken = "";
|
|
|
|
|
|
while (i < line.Length)
|
|
|
|
|
|
{
|
|
|
|
|
|
currentToken += line[i];
|
|
|
|
|
|
i++;
|
|
|
|
|
|
if (currentToken.Length > 1 && currentToken[0] == line[i - 1])
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.Write(stringFont + textToHtml(currentToken) + "</font>");
|
2018-02-12 16:24:13 +01:00
|
|
|
|
}
|
|
|
|
|
|
else if (line[i] == '/' && i + 1 < line.Length && line[i + 1] == '/')
|
|
|
|
|
|
{
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.Write(singleLineCommentFont + textToHtml(line.Substring(i)) + "</font>");
|
2018-02-12 16:24:13 +01:00
|
|
|
|
i = line.Length;
|
|
|
|
|
|
}
|
2018-02-13 13:15:39 +01:00
|
|
|
|
else if (line[i] == '/' && i + 1 < line.Length && line[i + 1] == '*')
|
|
|
|
|
|
{
|
|
|
|
|
|
multiline = true;
|
|
|
|
|
|
string currentToken = "/*";
|
|
|
|
|
|
i += 2;
|
|
|
|
|
|
while (i < line.Length && multiline)
|
|
|
|
|
|
{
|
|
|
|
|
|
currentToken += line[i];
|
|
|
|
|
|
i++;
|
|
|
|
|
|
if (currentToken.Length > 3 && currentToken.EndsWith("*/"))
|
|
|
|
|
|
multiline = false;
|
|
|
|
|
|
}
|
|
|
|
|
|
file.Write(multiLineCommentFont + textToHtml(currentToken) + "</font>");
|
|
|
|
|
|
}
|
2018-02-12 16:24:13 +01:00
|
|
|
|
else
|
|
|
|
|
|
{
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.Write(textToHtml(line.Substring(i, 1)));
|
2018-02-12 16:24:13 +01:00
|
|
|
|
i++;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
file.Write('\n');
|
2018-02-13 13:15:39 +01:00
|
|
|
|
|
|
|
|
|
|
if (errorLine == linenr)
|
|
|
|
|
|
file.Write(" <mark>" + textToHtml(w.Substring(errorLoc.Length + 2)) + "</mark>\n");
|
2018-02-12 16:24:13 +01:00
|
|
|
|
}
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.Write("</font></pre></body></html>");
|
2018-02-12 16:24:13 +01:00
|
|
|
|
file.Close();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void Main(string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
string path;
|
|
|
|
|
|
if (Directory.Exists("/home/danielm/shared/testing"))
|
|
|
|
|
|
path = "/home/danielm/shared/testing/";
|
2018-02-12 21:12:40 +01:00
|
|
|
|
else if (Directory.Exists("/home/danielm/testing"))
|
|
|
|
|
|
path = "/home/danielm/testing/";
|
2018-02-12 16:24:13 +01:00
|
|
|
|
else if (Directory.Exists(@"c:\Users\danielm.evidente\testing"))
|
|
|
|
|
|
path = @"c:\Users\danielm.evidente\testing\";
|
|
|
|
|
|
else
|
2018-02-12 21:12:40 +01:00
|
|
|
|
{
|
|
|
|
|
|
Console.WriteLine("Directory testing not found");
|
2018-02-12 16:24:13 +01:00
|
|
|
|
return;
|
2018-02-12 21:12:40 +01:00
|
|
|
|
}
|
2018-02-12 16:24:13 +01:00
|
|
|
|
|
|
|
|
|
|
string[] old = System.IO.File.ReadAllLines(path + "1.82.txt");
|
|
|
|
|
|
string[] head = System.IO.File.ReadAllLines(path + "head.txt");
|
|
|
|
|
|
|
|
|
|
|
|
Array.Sort(old, StringComparer.InvariantCulture);
|
|
|
|
|
|
Array.Sort(head, StringComparer.InvariantCulture);
|
|
|
|
|
|
|
|
|
|
|
|
List<string> removed = GetDiff(old, head);
|
|
|
|
|
|
List<string> added = GetDiff(head, old);
|
|
|
|
|
|
|
|
|
|
|
|
int fileIndex = 1;
|
|
|
|
|
|
|
|
|
|
|
|
using (System.IO.StreamWriter file = new System.IO.StreamWriter(path + "main.html"))
|
|
|
|
|
|
{
|
|
|
|
|
|
file.WriteLine("<html>");
|
|
|
|
|
|
file.WriteLine("<head>");
|
|
|
|
|
|
file.WriteLine("<title>Comparison 1.82 / Head</title>");
|
|
|
|
|
|
file.WriteLine("</head>");
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.WriteLine("<body bgcolor=\"#1e1e1e\">");
|
|
|
|
|
|
file.WriteLine(keywordFont);
|
2018-02-12 16:24:13 +01:00
|
|
|
|
|
|
|
|
|
|
file.WriteLine("<h1>Comparison 1.82 / Head</h1>");
|
|
|
|
|
|
file.WriteLine("<p>Package: {0}</p>", @"ftp://ftp.se.debian.org/debian/pool/main/f/firefox/firefox_59.0~b4.orig.tar.bz2");
|
|
|
|
|
|
file.WriteLine("<p>+ Added warnings {0}</p>", added.Count);
|
|
|
|
|
|
file.WriteLine("<p>- Removed warnings {0}</p>", removed.Count);
|
|
|
|
|
|
|
2018-02-13 13:15:39 +01:00
|
|
|
|
file.WriteLine("<svg width=\"{0}\" height=\"{1}\">", 60 + Math.Max(added.Count, removed.Count) + 10, 40);
|
|
|
|
|
|
file.WriteLine(" <rect x=\"0\" y=\"0\" width=\"100%\" height=\"100%\" stroke=\"#8DCBE2\" fill=\"#303030\"/>");
|
|
|
|
|
|
file.WriteLine(" <text x=\"4\" y=\"15\" font-family=\"Verdana\" font-size=\"10\" fill=\"#8DCBE2\">Added</text>");
|
|
|
|
|
|
file.WriteLine(" <text x=\"4\" y=\"30\" font-family=\"Verdana\" font-size=\"10\" fill=\"#8DCBE2\">Removed</text>");
|
|
|
|
|
|
file.WriteLine(" <rect x=\"60\" y=\"8\" width=\"{0}\" height=\"8\" fill=\"#40ff40\" />", added.Count);
|
|
|
|
|
|
file.WriteLine(" <rect x=\"60\" y=\"23\" width=\"{0}\" height=\"8\" fill=\"#ff4040\" />", removed.Count);
|
|
|
|
|
|
file.WriteLine("</svg>");
|
|
|
|
|
|
|
2018-02-12 16:24:13 +01:00
|
|
|
|
file.WriteLine("<h2>Added warnings</h2>");
|
|
|
|
|
|
file.WriteLine("<pre>");
|
|
|
|
|
|
foreach (string w in added)
|
|
|
|
|
|
{
|
|
|
|
|
|
string filename = "code" + fileIndex.ToString() + ".html";
|
|
|
|
|
|
fileIndex++;
|
|
|
|
|
|
writeSourceFile(path, w, filename);
|
|
|
|
|
|
file.WriteLine("<a href=\"{0}\">{1}</a>", filename, textToHtml(w));
|
|
|
|
|
|
}
|
|
|
|
|
|
file.WriteLine("</pre>");
|
|
|
|
|
|
|
|
|
|
|
|
file.WriteLine("<h2>Removed warnings</h2>");
|
|
|
|
|
|
file.WriteLine("<pre>");
|
|
|
|
|
|
foreach (string w in removed)
|
|
|
|
|
|
{
|
|
|
|
|
|
string filename = "code" + fileIndex.ToString() + ".html";
|
|
|
|
|
|
fileIndex++;
|
|
|
|
|
|
writeSourceFile(path, w, filename);
|
|
|
|
|
|
file.WriteLine("<a href=\"{0}\">{1}</a>", filename, textToHtml(w));
|
|
|
|
|
|
}
|
|
|
|
|
|
file.WriteLine("</pre>");
|
|
|
|
|
|
|
|
|
|
|
|
file.WriteLine("</body>");
|
|
|
|
|
|
file.WriteLine("</html>");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
