[llvm-cov] Make an API more consistent, NFC
Make renderExpansionView() look a bit more like renderLine(), and
clarify its doxygen comment.
llvm-svn: 273773
diff --git a/llvm/tools/llvm-cov/SourceCoverageView.cpp b/llvm/tools/llvm-cov/SourceCoverageView.cpp
index 285767e..45684d7 100644
--- a/llvm/tools/llvm-cov/SourceCoverageView.cpp
+++ b/llvm/tools/llvm-cov/SourceCoverageView.cpp
@@ -133,7 +133,7 @@
OS, *NextESV,
RenderedSubView ? Optional<LineRef>({*LI, LI.line_number()})
: Optional<LineRef>(),
- ExpansionColumn, WrappedSegment, LineSegments, ViewDepth);
+ WrappedSegment, LineSegments, ExpansionColumn, ViewDepth);
RenderedSubView = true;
}
for (; NextISV != EndISV && NextISV->Line == LI.line_number(); ++NextISV) {
diff --git a/llvm/tools/llvm-cov/SourceCoverageView.h b/llvm/tools/llvm-cov/SourceCoverageView.h
index 82822ca..763529a 100644
--- a/llvm/tools/llvm-cov/SourceCoverageView.h
+++ b/llvm/tools/llvm-cov/SourceCoverageView.h
@@ -163,12 +163,14 @@
CoverageSegmentArray Segments,
unsigned ViewDepth) = 0;
- /// \brief Render an expansion view. If \p FirstLine is provided, it points
- /// to the expansion site, which must be re-rendered for clarity.
- virtual unsigned renderExpansionView(
- raw_ostream &OS, ExpansionView &ESV, Optional<LineRef> FirstLine,
- unsigned ExpansionCol, const coverage::CoverageSegment *WrappedSegment,
- CoverageSegmentArray LineSegments, unsigned ViewDepth) = 0;
+ /// \brief Render an expansion view. If the expansion site must be re-rendered
+ /// for clarity, it is passed in via \p FirstLine.
+ virtual unsigned
+ renderExpansionView(raw_ostream &OS, ExpansionView &ESV,
+ Optional<LineRef> FirstLine,
+ const coverage::CoverageSegment *WrappedSegment,
+ CoverageSegmentArray Segments, unsigned ExpansionCol,
+ unsigned ViewDepth) = 0;
/// \brief Render an instantiation view.
virtual void renderInstantiationView(raw_ostream &OS, InstantiationView &ISV,
diff --git a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp
index c1f281c..e02f4b1 100644
--- a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp
+++ b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp
@@ -158,8 +158,8 @@
unsigned SourceCoverageViewText::renderExpansionView(
raw_ostream &OS, ExpansionView &ESV, Optional<LineRef> FirstLine,
- unsigned ExpansionCol, const coverage::CoverageSegment *WrappedSegment,
- CoverageSegmentArray LineSegments, unsigned ViewDepth) {
+ const coverage::CoverageSegment *WrappedSegment,
+ CoverageSegmentArray Segments, unsigned ExpansionCol, unsigned ViewDepth) {
unsigned NextExpansionCol = ExpansionCol;
if (FirstLine.hasValue()) {
@@ -168,7 +168,7 @@
NextExpansionCol = ESV.getStartCol();
renderLinePrefix(OS, ViewDepth);
OS.indent(getCombinedColumnWidth(getOptions()) + (ViewDepth == 0 ? 0 : 1));
- renderLine(OS, *FirstLine, WrappedSegment, LineSegments, ExpansionCol,
+ renderLine(OS, *FirstLine, WrappedSegment, Segments, ExpansionCol,
ViewDepth);
renderViewDivider(OS, ViewDepth + 1);
}
diff --git a/llvm/tools/llvm-cov/SourceCoverageViewText.h b/llvm/tools/llvm-cov/SourceCoverageViewText.h
index 6753a59..36b7c96 100644
--- a/llvm/tools/llvm-cov/SourceCoverageViewText.h
+++ b/llvm/tools/llvm-cov/SourceCoverageViewText.h
@@ -33,9 +33,9 @@
unsigned renderExpansionView(raw_ostream &OS, ExpansionView &ESV,
Optional<LineRef> FirstLine,
- unsigned ExpansionCol,
const coverage::CoverageSegment *WrappedSegment,
- CoverageSegmentArray LineSegments,
+ CoverageSegmentArray Segments,
+ unsigned ExpansionCol,
unsigned ViewDepth) override;
void renderInstantiationView(raw_ostream &OS, InstantiationView &ISV,