Found and fixed the bug that was very occasionally adding extra white… · ellen2015/cppfront@b839468 · GitHub

1. ellen2015
2. cppfront

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit b839468

Browse filesBrowse the repository at this point in the historyBrowse files

hsutter

committed

Found and fixed the bug that was very occasionally adding extra whitespace to some lines

1 parent 843d2de commit b839468
Copy full SHA for b839468

5 files changed

+10-8Lines changed: 10 additions & 8 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• regression-tests/test-results
  • mixed-function-expression-with-pointer-capture.cpp
  • mixed-initialization-safety-3.cpp
  • mixed-parameter-passing.cpp
  • mixed-postfix-expression-custom-formatting.cpp
• source
  • cppfront.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎regression-tests/test-results/mixed-function-expression-with-pointer-capture.cpp‎

Copy file name to clipboardExpand all lines: regression-tests/test-results/mixed-function-expression-with-pointer-capture.cpp

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -23,7 +23,7 @@
23	23	std::string y { "\n" };
24	24	std::ranges::for_each( view, [_0 = (&y)](auto const& x){
25	25	std::cout << (*_0 ).c_str() << x << *_0;
26		- } );
	26	+ } );
27	27
28	28	auto callback { [](auto& x) { return x += "-ish"; } };
29	29	std::ranges::for_each( view, callback );

Collapse file

‎regression-tests/test-results/mixed-initialization-safety-3.cpp‎

Copy file name to clipboardExpand all lines: regression-tests/test-results/mixed-initialization-safety-3.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -12,7 +12,7 @@ auto fill(
12	12	cpp2::out<std::string> x,
13	13	cpp2::in<std::string> value,
14	14	cpp2::in<int> count
15		- ) -> void;
	15	+ ) -> void;
16	16	#line 26 "mixed-initialization-safety-3.cpp2"
17	17	auto print_decorated(auto const& x) -> void;
18	18	#line 28 "mixed-initialization-safety-3.cpp2"
@@ -37,7 +37,7 @@ auto fill(
37	37	cpp2::out<std::string> x,
38	38	cpp2::in<std::string> value,
39	39	cpp2::in<int> count
40		- ) -> void
	40	+ ) -> void
41	41
42	42	{
43	43	cpp2::Default.expects(CPP2_UFCS_0(size, value) >= count, "fill: value must contain at least count elements");

Collapse file

‎regression-tests/test-results/mixed-parameter-passing.cpp‎

Copy file name to clipboardExpand all lines: regression-tests/test-results/mixed-parameter-passing.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ auto parameter_styles(
13	13	std::string b,
14	14	std::string& c,
15	15	std::string&& d
16		- ) -> void;
	16	+ ) -> void;
17	17
18	18	//=== Cpp2 definitions ==========================================================
19	19
@@ -26,7 +26,7 @@ auto parameter_styles(
26	26	std::string b,
27	27	std::string& c,
28	28	std::string&& d
29		- ) -> void
	29	+ ) -> void
30	30	{
31	31	int z { 12 };
32	32

Collapse file

‎regression-tests/test-results/mixed-postfix-expression-custom-formatting.cpp‎

Copy file name to clipboardExpand all lines: regression-tests/test-results/mixed-postfix-expression-custom-formatting.cpp

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -19,5 +19,5 @@
19	19	d::e( ++(*f).g(), // because f is foobar
20	20	CPP2_UFCS_0(i, h),
21	21	j(k, l))
22		- ) ;
	22	+ );
23	23	}

Collapse file

‎source/cppfront.cpp‎

Copy file name to clipboardExpand all lines: source/cppfront.cpp

+4-2Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -286,8 +286,10 @@ class positional_printer
286	286	}
287	287
288	288	// Finally, align to the target column
289		- pos.colno = std::max( 1, pos.colno + pad_for_this_line );
290		- print( pad( pos.colno - curr_pos.colno ) );
	289	+ if (curr_pos.lineno == pos.lineno) {
	290	+ pos.colno = std::max( 1, pos.colno + pad_for_this_line );
	291	+ print( pad( pos.colno - curr_pos.colno ) );
	292	+ }
291	293	}
292	294
293	295

0 commit comments

Comments

0 (0)