Skip to content

Handle all Rust reserved keywords #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nunoplopes merged 4 commits into from
Apr 17, 2026
Merged

Handle all Rust reserved keywords #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a68891
Handle all Rust reserved keywords
lucic71 Apr 17, 2026
848fb21
Delete C++ keywords
lucic71 Apr 17, 2026
e82d3c1
clang-format
lucic71 Apr 17, 2026
967d087
Add vec to reserved keywords
lucic71 Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp2rust/converter/converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2234,7 +2234,7 @@ bool Converter::VisitInitListExpr(clang::InitListExpr *expr) {
StrCat(GetUnsafeTypeAsString(qual_type), token::kOpenCurlyBracket);
int i = 0;
for (const auto *field : record->fields()) {
StrCat(field->getName(), token::kColon);
StrCat(GetNamedDeclAsString(field), token::kColon);
ConvertVarInit(field->getType(), expr->getInit(i++));
StrCat(token::kComma);
}
Expand Down
46 changes: 44 additions & 2 deletions cpp2rust/converter/converter_lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,50 @@
#include "converter/lex.h"
#include "converter/mapper.h"

static std::array<const char *, 5> rust_keywords = {
"fn", "in", "mut", "vec", "ref",
// https://doc.rust-lang.org/reference/keywords.html
static const char *rust_keywords[] = {
// Strict keywords
"as",
"async",
"await",
"crate",
"dyn",
"fn",
"impl",
"in",
"let",
"loop",
"match",
"mod",
"move",
"mut",
"pub",
"ref",
"self",
"Self",
"super",
"trait",
"type",
"unsafe",
"use",
"where",
// Reserved keywords
"abstract",
"become",
"box",
"final",
"gen",
"macro",
"override",
"priv",
"unsized",
"yield",
// Weak keywords
"macro_rules",
"raw",
"safe",
// Standard library keywords
"vec",
};

namespace cpp2rust {
Expand Down
2 changes: 1 addition & 1 deletion cpp2rust/converter/models/converter_refcount.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ bool ConverterRefCount::VisitInitListExpr(clang::InitListExpr *expr) {
int i = 0;
PushConversionKind push(*this, ConversionKind::FullRefCount);
for (const auto *field : record->fields()) {
StrCat(field->getName(), token::kColon);
StrCat(GetNamedDeclAsString(field), token::kColon);
ConvertVarInit(field->getType(), expr->getInit(i++));
StrCat(token::kComma);
}
Expand Down
Loading