mirror of git://gcc.gnu.org/git/gcc.git
libcody: Make it buildable by C++11 to C++26
The following builds with -std=c++11 and c++14 and c++17 and c++20 and c++23 and c++26. I see the u8 string literals are mixed e.g. with strerror, so in -fexec-charset=IBM1047 there will still be garbage, so am not 100% sure if the u8 literals everywhere are worth it either. 2025-11-21 Jakub Jelinek <jakub@redhat.com> * cody.hh (S2C): For __cpp_char8_t >= 201811 use char8_t instead of char in argument type. (MessageBuffer::Space): Revert 2025-11-15 change. (MessageBuffer::Append): For __cpp_char8_t >= 201811 add overload with char8_t const * type of first argument. (Packet::Packet): Similarly for first argument. * client.cc (CommunicationError, Client::ProcessResponse, Client::Connect, ConnectResponse, PathnameResponse, OKResponse, IncludeTranslateResponse): Cast u8 string literals to (const char *) where needed. * server.cc (Server::ProcessRequests, ConnectRequest): Likewise.
This commit is contained in:
Jakub Jelinek
Jakub Jelinek
parent
9dff0355c7
commit
07a767c7a5
|
|
@ -97,7 +97,7 @@ int Client::CommunicateWithServer ()
|
|||
|
||||
static Packet CommunicationError (int err)
|
||||
{
|
||||
std::string e {u8"communication error:"};
|
||||
std::string e {(const char *) u8"communication error:"};
|
||||
e.append (strerror (err));
|
||||
|
||||
return Packet (Client::PC_ERROR, std::move (e));
|
||||
|
|
@ -110,33 +110,34 @@ Packet Client::ProcessResponse (std::vector<std::string> &words,
|
|||
{
|
||||
if (e == EINVAL)
|
||||
{
|
||||
std::string msg (u8"malformed string '");
|
||||
std::string msg ((const char *) u8"malformed string '");
|
||||
msg.append (words[0]);
|
||||
msg.append (u8"'");
|
||||
msg.append ((const char *) u8"'");
|
||||
return Packet (Client::PC_ERROR, std::move (msg));
|
||||
}
|
||||
else
|
||||
return Packet (Client::PC_ERROR, u8"missing response");
|
||||
return Packet (Client::PC_ERROR, (const char *) u8"missing response");
|
||||
}
|
||||
|
||||
Assert (!words.empty ());
|
||||
if (words[0] == u8"ERROR")
|
||||
if (words[0] == (const char *) u8"ERROR")
|
||||
return Packet (Client::PC_ERROR,
|
||||
words.size () == 2 ? words[1]: u8"malformed error response");
|
||||
words.size () == 2 ? words[1]
|
||||
: (const char *) u8"malformed error response");
|
||||
|
||||
if (isLast && !read.IsAtEnd ())
|
||||
return Packet (Client::PC_ERROR,
|
||||
std::string (u8"unexpected extra response"));
|
||||
std::string ((const char *) u8"unexpected extra response"));
|
||||
|
||||
Assert (code < Detail::RC_HWM);
|
||||
Packet result (responseTable[code] (words));
|
||||
result.SetRequest (code);
|
||||
if (result.GetCode () == Client::PC_ERROR && result.GetString ().empty ())
|
||||
{
|
||||
std::string msg {u8"malformed response '"};
|
||||
std::string msg {(const char *) u8"malformed response '"};
|
||||
|
||||
read.LexedLine (msg);
|
||||
msg.append (u8"'");
|
||||
msg.append ((const char *) u8"'");
|
||||
result.GetString () = std::move (msg);
|
||||
}
|
||||
else if (result.GetCode () == Client::PC_CONNECT)
|
||||
|
|
@ -199,7 +200,7 @@ Packet Client::Connect (char const *agent, char const *ident,
|
|||
size_t alen, size_t ilen)
|
||||
{
|
||||
write.BeginLine ();
|
||||
write.AppendWord (u8"HELLO");
|
||||
write.AppendWord ((const char *) u8"HELLO");
|
||||
write.AppendInteger (Version);
|
||||
write.AppendWord (agent, true, alen);
|
||||
write.AppendWord (ident, true, ilen);
|
||||
|
|
@ -211,7 +212,8 @@ Packet Client::Connect (char const *agent, char const *ident,
|
|||
// HELLO $version $agent [$flags]
|
||||
Packet ConnectResponse (std::vector<std::string> &words)
|
||||
{
|
||||
if (words[0] == u8"HELLO" && (words.size () == 3 || words.size () == 4))
|
||||
if (words[0] == (const char *) u8"HELLO"
|
||||
&& (words.size () == 3 || words.size () == 4))
|
||||
{
|
||||
char *eptr;
|
||||
unsigned long val = strtoul (words[1].c_str (), &eptr, 10);
|
||||
|
|
@ -247,7 +249,7 @@ Packet Client::ModuleRepo ()
|
|||
// PATHNAME $dir | ERROR
|
||||
Packet PathnameResponse (std::vector<std::string> &words)
|
||||
{
|
||||
if (words[0] == u8"PATHNAME" && words.size () == 2)
|
||||
if (words[0] == (const char *) u8"PATHNAME" && words.size () == 2)
|
||||
return Packet (Client::PC_PATHNAME, std::move (words[1]));
|
||||
|
||||
return Packet (Client::PC_ERROR, u8"");
|
||||
|
|
@ -256,7 +258,7 @@ Packet PathnameResponse (std::vector<std::string> &words)
|
|||
// OK or ERROR
|
||||
Packet OKResponse (std::vector<std::string> &words)
|
||||
{
|
||||
if (words[0] == u8"OK")
|
||||
if (words[0] == (const char *) u8"OK")
|
||||
return Packet (Client::PC_OK);
|
||||
else
|
||||
return Packet (Client::PC_ERROR,
|
||||
|
|
@ -319,11 +321,11 @@ Packet Client::IncludeTranslate (char const *include, Flags flags, size_t ilen)
|
|||
// PATHNAME $cmifile
|
||||
Packet IncludeTranslateResponse (std::vector<std::string> &words)
|
||||
{
|
||||
if (words[0] == u8"BOOL" && words.size () == 2)
|
||||
if (words[0] == (const char *) u8"BOOL" && words.size () == 2)
|
||||
{
|
||||
if (words[1] == u8"FALSE")
|
||||
return Packet (Client::PC_BOOL, 0);
|
||||
else if (words[1] == u8"TRUE")
|
||||
if (words[1] == (const char *) u8"FALSE")
|
||||
return Packet (Client::PC_BOOL);
|
||||
else if (words[1] == (const char *) u8"TRUE")
|
||||
return Packet (Client::PC_BOOL, 1);
|
||||
else
|
||||
return Packet (Client::PC_ERROR, u8"");
|
||||
|
|
|
|||
|
|
@ -47,12 +47,21 @@ namespace Detail {
|
|||
|
||||
// C++11 doesn't have utf8 character literals :(
|
||||
|
||||
#if __cpp_char8_t >= 201811
|
||||
template<unsigned I>
|
||||
constexpr char S2C (char8_t const (&s)[I])
|
||||
{
|
||||
static_assert (I == 2, "only single octet strings may be converted");
|
||||
return s[0];
|
||||
}
|
||||
#else
|
||||
template<unsigned I>
|
||||
constexpr char S2C (char const (&s)[I])
|
||||
{
|
||||
static_assert (I == 2, "only single octet strings may be converted");
|
||||
return s[0];
|
||||
}
|
||||
#endif
|
||||
|
||||
/// Internal buffering class. Used to concatenate outgoing messages
|
||||
/// and Lex incoming ones.
|
||||
|
|
@ -110,11 +119,7 @@ public:
|
|||
/// Add whitespace word separator. Multiple adjacent whitespace is fine.
|
||||
void Space ()
|
||||
{
|
||||
#if __cpp_unicode_characters >= 201411
|
||||
Append ((char) u8' ');
|
||||
#else
|
||||
Append (Detail::S2C(u8" "));
|
||||
#endif
|
||||
}
|
||||
|
||||
public:
|
||||
|
|
@ -127,6 +132,13 @@ public:
|
|||
Space ();
|
||||
Append (str, maybe_quote, len);
|
||||
}
|
||||
#if __cpp_char8_t >= 201811
|
||||
void AppendWord (char8_t const *str, bool maybe_quote = false,
|
||||
size_t len = ~size_t (0))
|
||||
{
|
||||
AppendWord ((const char *) str, maybe_quote, len);
|
||||
}
|
||||
#endif
|
||||
/// Add a word as with AppendWord
|
||||
/// @param str the string to append
|
||||
/// @param maybe_quote string might need quoting, as for Append
|
||||
|
|
@ -268,6 +280,12 @@ public:
|
|||
: string (s), cat (STRING), code (c)
|
||||
{
|
||||
}
|
||||
#if __cpp_char8_t >= 201811
|
||||
Packet (unsigned c, const char8_t *s)
|
||||
: string ((const char *) s), cat (STRING), code (c)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
Packet (unsigned c, std::vector<std::string> &&v)
|
||||
: vector (std::move (v)), cat (VECTOR), code (c)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@ static RequestPair
|
|||
const requestTable[Detail::RC_HWM] =
|
||||
{
|
||||
// Same order as enum RequestCode
|
||||
RequestPair {u8"HELLO", nullptr},
|
||||
RequestPair {u8"MODULE-REPO", ModuleRepoRequest},
|
||||
RequestPair {u8"MODULE-EXPORT", ModuleExportRequest},
|
||||
RequestPair {u8"MODULE-IMPORT", ModuleImportRequest},
|
||||
RequestPair {u8"MODULE-COMPILED", ModuleCompiledRequest},
|
||||
RequestPair {u8"INCLUDE-TRANSLATE", IncludeTranslateRequest},
|
||||
RequestPair {(const char *) u8"HELLO", nullptr},
|
||||
RequestPair {(const char *) u8"MODULE-REPO", ModuleRepoRequest},
|
||||
RequestPair {(const char *) u8"MODULE-EXPORT", ModuleExportRequest},
|
||||
RequestPair {(const char *) u8"MODULE-IMPORT", ModuleImportRequest},
|
||||
RequestPair {(const char *) u8"MODULE-COMPILED", ModuleCompiledRequest},
|
||||
RequestPair {(const char *) u8"INCLUDE-TRANSLATE", IncludeTranslateRequest},
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -135,21 +135,21 @@ void Server::ProcessRequests (void)
|
|||
std::string msg;
|
||||
|
||||
if (err > 0)
|
||||
msg = u8"error processing '";
|
||||
msg = (const char *) u8"error processing '";
|
||||
else if (ix >= Detail::RC_HWM)
|
||||
msg = u8"unrecognized '";
|
||||
msg = (const char *) u8"unrecognized '";
|
||||
else if (IsConnected () && ix == Detail::RC_CONNECT)
|
||||
msg = u8"already connected '";
|
||||
msg = (const char *) u8"already connected '";
|
||||
else if (!IsConnected () && ix != Detail::RC_CONNECT)
|
||||
msg = u8"not connected '";
|
||||
msg = (const char *) u8"not connected '";
|
||||
else
|
||||
msg = u8"malformed '";
|
||||
msg = (const char *) u8"malformed '";
|
||||
|
||||
read.LexedLine (msg);
|
||||
msg.append (u8"'");
|
||||
msg.append ((const char *) u8"'");
|
||||
if (err > 0)
|
||||
{
|
||||
msg.append (u8" ");
|
||||
msg.append ((const char *) u8" ");
|
||||
msg.append (strerror (err));
|
||||
}
|
||||
resolver->ErrorResponse (this, std::move (msg));
|
||||
|
|
@ -176,7 +176,7 @@ Resolver *ConnectRequest (Server *s, Resolver *r,
|
|||
return nullptr;
|
||||
|
||||
if (words.size () == 3)
|
||||
words.emplace_back (u8"");
|
||||
words.emplace_back ((const char *) u8"");
|
||||
unsigned version = ParseUnsigned (words[1]);
|
||||
if (version == ~0u)
|
||||
return nullptr;
|
||||
|
|
|
|||
Loading…
Reference in New Issue