Skip to content

Commit 8c64b0e

Browse files
dutkalexdutkalex
authored
Merge branch 'main' into refactoring
Signed-off-by: Alex Dutka <[email protected]>
2 parents 3a8e009 + e12e301 commit 8c64b0e

File tree

7 files changed

+137
-86
lines changed

7 files changed

+137
-86
lines changed

‎CITATION.cff

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
cff-version: 1.2.0
2+
message: >-
3+
If you use this software, please cite it using the
4+
metadata from this file.
5+
type: software
6+
title: cppfront
7+
authors:
8+
- given-names: Herb
9+
family-names: Sutter
10+
repository-code: 'https://github.com/hsutter/cppfront'
11+
abstract: A personal experimental C++ Syntax 2 -> Syntax 1 compiler
12+
license: CC-BY-NC-ND-4.0

‎include/cpp2util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ inline auto to_string(std::tuple<Ts...> const& t) -> std::string
11161116
#if defined(__cpp_lib_format) || (defined(_MSC_VER) && _MSC_VER >= 1929)
11171117
inline auto to_string(auto&& value, std::string_view fmt) -> std::string
11181118
{
1119-
return std::vformat(fmt, std::make_format_args(CPP2_FORWARD(value)));
1119+
return std::vformat(fmt, std::make_format_args(value));
11201120
}
11211121
#else
11221122
inline auto to_string(auto&& value, std::string_view) -> std::string

‎regression-tests/test-results/gcc-13/gcc-version.output

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
g++ (GCC) 13.2.1 20231011 (Red Hat 13.2.1-4)
1+
g++ (GCC) 13.2.1 20240316 (Red Hat 13.2.1-7)
22
Copyright (C) 2023 Free Software Foundation, Inc.
33
This is free software; see the source for copying conditions. There is NO
44
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

‎regression-tests/test-results/msvc-2022/MSVC-version.output

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Microsoft (R) C/C++ Optimizing Compiler Version 19.39.33522 for x86
1+
Microsoft (R) C/C++ Optimizing Compiler Version 19.39.33523 for x86
22
Copyright (C) Microsoft Corporation. All rights reserved.
33

‎source/common.h

Lines changed: 81 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -250,44 +250,6 @@ struct multiline_raw_string
250250
source_position end = {0, 0};
251251
};
252252

253-
//-----------------------------------------------------------------------
254-
//
255-
// error: represents a user-readable error message
256-
//
257-
//-----------------------------------------------------------------------
258-
//
259-
struct error_entry
260-
{
261-
source_position where;
262-
std::string msg;
263-
bool internal = false;
264-
bool fallback = false; // only emit this message if there was nothing better
265-
266-
error_entry(
267-
source_position w,
268-
std::string_view m,
269-
bool i = false,
270-
bool f = false
271-
)
272-
: where{w}
273-
, msg{m}
274-
, internal{i}
275-
, fallback{f}
276-
{ }
277-
278-
auto operator==(error_entry const& that)
279-
-> bool
280-
{
281-
return
282-
where == that.where
283-
&& msg == that.msg
284-
;
285-
}
286-
287-
auto print(auto& o, std::string const& file) const
288-
-> void;
289-
};
290-
291253

292254
//-----------------------------------------------------------------------
293255
//
@@ -639,13 +601,18 @@ class cmdline_processor
639601
std::unordered_map<int, std::string> labels = {
640602
{ 2, "Additional dynamic safety checks and contract information" },
641603
{ 4, "Support for constrained target environments" },
642-
{ 9, "Other options" }
604+
{ 8, "Cpp1 file emission options" },
605+
{ 9, "Cppfront output options" }
643606
};
644607

645-
// Define this in the main .cpp to avoid bringing <iostream> into the headers,
646-
// so that we can't accidentally start depending on iostreams in the compiler body
647-
static auto print(std::string_view, int width = 0)
648-
-> void;
608+
static auto print(std::string_view s, int width = 0)
609+
-> void
610+
{
611+
if (width > 0) {
612+
std::cout << std::setw(width) << std::left;
613+
}
614+
std::cout << s;
615+
}
649616

650617
public:
651618
auto process_flags()
@@ -925,6 +892,77 @@ static cmdline_processor::register_flag cmd_internal_debug(
925892
[]{ flag_internal_debug = true; }
926893
);
927894

895+
static auto flag_print_colon_errors = false;
896+
static cmdline_processor::register_flag cmd_print_colon_errors(
897+
9,
898+
"format-colon-errors",
899+
"Emit ':line:col:' format for messages - lights up some tools",
900+
[]{ flag_print_colon_errors = true; }
901+
);
902+
903+
904+
//-----------------------------------------------------------------------
905+
//
906+
// error: represents a user-readable error message
907+
//
908+
//-----------------------------------------------------------------------
909+
//
910+
struct error_entry
911+
{
912+
source_position where;
913+
std::string msg;
914+
bool internal = false;
915+
bool fallback = false; // only emit this message if there was nothing better
916+
917+
error_entry(
918+
source_position w,
919+
std::string_view m,
920+
bool i = false,
921+
bool f = false
922+
)
923+
: where{w}
924+
, msg{m}
925+
, internal{i}
926+
, fallback{f}
927+
{ }
928+
929+
auto operator==(error_entry const& that)
930+
-> bool
931+
{
932+
return
933+
where == that.where
934+
&& msg == that.msg
935+
;
936+
}
937+
938+
auto print(auto& o, std::string const& file) const
939+
-> void
940+
{
941+
o << file ;
942+
if (where.lineno > 0) {
943+
if (flag_print_colon_errors) {
944+
o << ":" << (where.lineno);
945+
if (where.colno >= 0) {
946+
o << ":" << where.colno;
947+
}
948+
}
949+
else {
950+
o << "("<< (where.lineno);
951+
if (where.colno >= 0) {
952+
o << "," << where.colno;
953+
}
954+
o << ")";
955+
}
956+
}
957+
o << ":";
958+
if (internal) {
959+
o << " internal compiler";
960+
}
961+
o << " error: " << msg << "\n";
962+
}
963+
964+
};
965+
928966

929967
//-----------------------------------------------------------------------
930968
//

‎source/cppfront.cpp

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ static cpp2::cmdline_processor::register_flag cmd_debug(
2525
[]{ flag_debug_output = true; }
2626
);
2727

28+
static auto flag_quiet = false;
29+
static cpp2::cmdline_processor::register_flag cmd_quiet(
30+
9,
31+
"quiet",
32+
"Print only error output",
33+
[]{ flag_quiet = true; }
34+
);
35+
2836
auto main(
2937
int argc,
3038
char* argv[]
@@ -51,7 +59,9 @@ auto main(
5159
{
5260
auto& out = flag_cpp1_filename != "stdout" ? std::cout : std::cerr;
5361

54-
out << arg.text << "...";
62+
if (!flag_quiet) {
63+
out << arg.text << "...";
64+
}
5565

5666
// Load + lex + parse + sema
5767
cppfront c(arg.text);
@@ -62,37 +72,40 @@ auto main(
6272
// If there were no errors, say so and generate Cpp1
6373
if (c.had_no_errors())
6474
{
65-
if (!c.has_cpp1()) {
66-
out << " ok (all Cpp2, passes safety checks)\n";
67-
}
68-
else if (c.has_cpp2()) {
69-
out << " ok (mixed Cpp1/Cpp2, Cpp2 code passes safety checks)\n";
70-
}
71-
else {
72-
out << " ok (all Cpp1)\n";
73-
}
75+
if (!flag_quiet)
76+
{
77+
if (!c.has_cpp1()) {
78+
out << " ok (all Cpp2, passes safety checks)\n";
79+
}
80+
else if (c.has_cpp2()) {
81+
out << " ok (mixed Cpp1/Cpp2, Cpp2 code passes safety checks)\n";
82+
}
83+
else {
84+
out << " ok (all Cpp1)\n";
85+
}
7486

75-
if (flag_verbose) {
76-
out << " Cpp1: " << print_with_thousands(count.cpp1_lines) << " line" << (count.cpp1_lines != 1 ? "s" : "");
77-
out << "\n Cpp2: " << print_with_thousands(count.cpp2_lines) << " line" << (count.cpp2_lines != 1 ? "s" : "");
78-
auto total = count.cpp1_lines + count.cpp2_lines;
79-
if (total > 0) {
80-
out << " (";
81-
if (count.cpp1_lines == 0) {
82-
out << 100;
83-
}
84-
else if (count.cpp2_lines / count.cpp1_lines > 25) {
85-
out << std::setprecision(3)
86-
<< 100.0 * count.cpp2_lines / total;
87+
if (flag_verbose) {
88+
out << " Cpp1: " << print_with_thousands(count.cpp1_lines) << " line" << (count.cpp1_lines != 1 ? "s" : "");
89+
out << "\n Cpp2: " << print_with_thousands(count.cpp2_lines) << " line" << (count.cpp2_lines != 1 ? "s" : "");
90+
auto total = count.cpp1_lines + count.cpp2_lines;
91+
if (total > 0) {
92+
out << " (";
93+
if (count.cpp1_lines == 0) {
94+
out << 100;
95+
}
96+
else if (count.cpp2_lines / count.cpp1_lines > 25) {
97+
out << std::setprecision(3)
98+
<< 100.0 * count.cpp2_lines / total;
99+
}
100+
else {
101+
out << 100 * count.cpp2_lines / total;
102+
}
103+
out << "%)";
87104
}
88-
else {
89-
out << 100 * count.cpp2_lines / total;
90-
}
91-
out << "%)";
92105
}
93-
}
94106

95-
out << "\n";
107+
out << "\n";
108+
}
96109
}
97110
// Otherwise, print the errors
98111
else

‎source/to_cpp1.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@
2626

2727
namespace cpp2 {
2828

29-
// Defined out of line here just to avoid bringing <iostream> in before this,
30-
// so that we can't accidentally start depending on iostreams in earlier phases
31-
auto cmdline_processor::print(std::string_view s, int width)
32-
-> void
33-
{
34-
if (width > 0) {
35-
std::cout << std::setw(width) << std::left;
36-
}
37-
std::cout << s;
38-
}
39-
40-
4129
//-----------------------------------------------------------------------
4230
//
4331
// cppfront: a compiler instance

0 commit comments

Comments
 (0)