This is an archive of the discontinued LLVM Phabricator instance.

Show All 27 Lines	static cl::opt<bool>
ASTDump("ast-dump",		ASTDump("ast-dump",
cl::desc("Print the internal representation of the AST as JSON."),		cl::desc("Print the internal representation of the AST as JSON."),
cl::init(false), cl::cat(ClangDiffCategory));		cl::init(false), cl::cat(ClangDiffCategory));

static cl::opt<bool>		static cl::opt<bool>
PrintMatches("m", cl::desc("Print the matched nodes (verbose)."),		PrintMatches("m", cl::desc("Print the matched nodes (verbose)."),
cl::init(false), cl::cat(ClangDiffCategory));		cl::init(false), cl::cat(ClangDiffCategory));

		static cl::opt<bool> HtmlDiff("html",
		cl::desc("Output a side-by-side diff in HTML."),
		cl::init(false), cl::cat(ClangDiffCategory));

static cl::opt<std::string> SourcePath(cl::Positional, cl::desc("<source>"),		static cl::opt<std::string> SourcePath(cl::Positional, cl::desc("<source>"),
cl::Required,		cl::Required,
cl::cat(ClangDiffCategory));		cl::cat(ClangDiffCategory));

static cl::opt<std::string> DestinationPath(cl::Positional,		static cl::opt<std::string> DestinationPath(cl::Positional,
cl::desc("<destination>"),		cl::desc("<destination>"),
cl::Optional,		cl::Optional,
cl::cat(ClangDiffCategory));		cl::cat(ClangDiffCategory));
▲ Show 20 Lines • Show All 84 Lines • ▼ Show 20 Lines	static std::unique_ptr<ASTUnit> getAST(const StringRef Filename) {
Tool.buildASTs(ASTs);		Tool.buildASTs(ASTs);
if (ASTs.size() != Files.size())		if (ASTs.size() != Files.size())
return nullptr;		return nullptr;
return std::move(ASTs[0]);		return std::move(ASTs[0]);
}		}

static char hexdigit(int N) { return N &= 0xf, N + (N < 10 ? '0' : 'a' - 10); }		static char hexdigit(int N) { return N &= 0xf, N + (N < 10 ? '0' : 'a' - 10); }

		static const char HtmlDiffHeader[] = R"(
		<html>
		<head>
		<meta charset='utf-8'/>
		<style>
		span.d { color: red; }
		span.u { color: #cc00cc; }
		span.i { color: green; }
		span.m { font-weight: bold; }
		span { font-weight: normal; color: black; }
		div.code {
		width: 48%;
		height: 98%;
		overflow: scroll;
		float: left;
		padding: 0 0 0.5% 0.5%;
		border: solid 2px LightGrey;
		border-radius: 5px;
		}
		</style>
		</head>
		<script type='text/javascript'>
		highlightStack = []
		function clearHighlight() {
		while (highlightStack.length) {
		let [l, r] = highlightStack.pop()
		document.getElementById(l).style.backgroundColor = 'white'
		document.getElementById(r).style.backgroundColor = 'white'
		}
		}
		function highlight(event) {
		id = event.target['id']
		doHighlight(id)
		}
		function doHighlight(id) {
		clearHighlight()
		source = document.getElementById(id)
		if (!source.attributes['tid'])
		return
		tid = source.attributes['tid'].value
		target = document.getElementById(tid)
		if (!target \|\| source.parentElement && source.parentElement.classList.contains('code'))
		return
		source.style.backgroundColor = target.style.backgroundColor = 'lightgrey'
		highlightStack.push([id, tid])
		source.scrollIntoView()
		target.scrollIntoView()
		location.hash = '#' + id
		}
		function scrollToBoth() {
		doHighlight(location.hash.substr(1))
		}
		window.onload = scrollToBoth
		</script>
		<body>
		<div onclick='highlight(event)'>
		)";

		static void printHtml(raw_ostream &OS, char C) {
		switch (C) {
		case '&':
		OS << "&";
		break;
		case '<':
		OS << "<";
		break;
		case '>':
		OS << ">";
		break;
		case '\'':
		OS << "'";
		break;
		case '"':
		OS << """;
		break;
		default:
		OS << C;
		}
		}

		static void printHtml(raw_ostream &OS, const StringRef Str) {
		for (char C : Str)
		printHtml(OS, C);
		}

		static std::string getChangeKindAbbr(diff::ChangeKind Kind) {
		switch (Kind) {
		case diff::None:
		return "";
		case diff::Delete:
		return "d";
		case diff::Update:
		return "u";
		case diff::Insert:
		return "i";
		case diff::Move:
		return "m";
		case diff::UpdateMove:
		return "u m";
		}
		}

		static unsigned printHtmlForNode(raw_ostream &OS, const diff::ASTDiff &Diff,
		diff::SyntaxTree &Tree, diff::NodeId Id,
		unsigned Offset) {
		const diff::Node &Node = Tree.getNode(Id);
		bool IsLeft = &Tree == &Diff.SrcTree;
		char MyTag, OtherTag;
		diff::NodeId LeftId, RightId;
		diff::NodeId TargetId = Diff.getMapped(Tree, Id);
		if (IsLeft) {
		MyTag = 'L';
		OtherTag = 'R';
		LeftId = Id;
		RightId = TargetId;
		} else {
		MyTag = 'R';
		OtherTag = 'L';
		LeftId = TargetId;
		RightId = Id;
		}
		unsigned Begin, End;
		std::tie(Begin, End) = Tree.getFileOffsets(Node);
		const SourceManager &SrcMgr = Tree.getASTContext().getSourceManager();
		auto Code = SrcMgr.getBuffer(SrcMgr.getMainFileID())->getBuffer();
		for (; Offset < Begin; ++Offset)
		printHtml(OS, Code[Offset]);
		OS << "<span id='" << MyTag << Id << "' "
		<< "tid='" << OtherTag << TargetId << "' ";
		OS << "title='";
		printHtml(OS, Node.getTypeLabel());
		OS << "\n" << LeftId << " -> " << RightId;
		std::string Value = Tree.getNodeValue(Node);
		if (!Value.empty()) {
		OS << "\n";
		printHtml(OS, Value);
		}
		OS << "'";
		if (Node.ChangeKind != diff::None)
		OS << " class='" << getChangeKindAbbr(Node.ChangeKind) << "'";
		OS << ">";

		for (diff::NodeId Child : Node.Children)
		Offset = printHtmlForNode(OS, Diff, Tree, Child, Offset);

		for (; Offset < End; ++Offset)
		printHtml(OS, Code[Offset]);
		if (Id == Tree.getRootId()) {
		End = Code.size();
		for (; Offset < End; ++Offset)
		printHtml(OS, Code[Offset]);
		}
		OS << "</span>";
		return Offset;
		}

static void printJsonString(raw_ostream &OS, const StringRef Str) {		static void printJsonString(raw_ostream &OS, const StringRef Str) {
for (char C : Str) {		for (char C : Str) {
switch (C) {		switch (C) {
case '"':		case '"':
OS << R"(\")";		OS << R"(\")";
break;		break;
case '\\':		case '\\':
OS << R"(\\)";		OS << R"(\\)";
▲ Show 20 Lines • Show All 137 Lines • ▼ Show 20 Lines	int main(int argc, const char **argv) {
if (!Src \|\| !Dst)		if (!Src \|\| !Dst)
return 1;		return 1;

diff::ComparisonOptions Options;		diff::ComparisonOptions Options;
diff::SyntaxTree SrcTree(Src->getASTContext());		diff::SyntaxTree SrcTree(Src->getASTContext());
diff::SyntaxTree DstTree(Dst->getASTContext());		diff::SyntaxTree DstTree(Dst->getASTContext());
diff::ASTDiff Diff(SrcTree, DstTree, Options);		diff::ASTDiff Diff(SrcTree, DstTree, Options);

		if (HtmlDiff) {
		llvm::outs() << HtmlDiffHeader << "<pre>";
		llvm::outs() << "<div id='L' class='code'>";
		printHtmlForNode(llvm::outs(), Diff, SrcTree, SrcTree.getRootId(), 0);
		llvm::outs() << "</div>";
		llvm::outs() << "<div id='R' class='code'>";
		printHtmlForNode(llvm::outs(), Diff, DstTree, DstTree.getRootId(), 0);
		llvm::outs() << "</div>";
		llvm::outs() << "</pre></div></body></html>\n";
		return 0;
		}

for (diff::NodeId Dst : DstTree) {		for (diff::NodeId Dst : DstTree) {
diff::NodeId Src = Diff.getMapped(DstTree, Dst);		diff::NodeId Src = Diff.getMapped(DstTree, Dst);
if (PrintMatches && Src.isValid()) {		if (PrintMatches && Src.isValid()) {
llvm::outs() << "Match ";		llvm::outs() << "Match ";
printNode(llvm::outs(), SrcTree, Src);		printNode(llvm::outs(), SrcTree, Src);
llvm::outs() << " to ";		llvm::outs() << " to ";
printNode(llvm::outs(), DstTree, Dst);		printNode(llvm::outs(), DstTree, Dst);
llvm::outs() << "\n";		llvm::outs() << "\n";
Show All 12 Lines

This is an archive of the discontinued LLVM Phabricator instance.

[clang-diff] HTML side-by-side diffAbandonedPublic

Details

Diff Detail

Event Timeline

Revision Contents

Diff 108371

tools/clang-diff/ClangDiff.cpp

[clang-diff] HTML side-by-side diff
AbandonedPublic