Skip to content

Deduplicate parts of write_enum_operators into write_binary_bitwise_op. #1649

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
merged 1 commit into from
Sep 19, 2025
+17 −33
Merged

Deduplicate parts of write_enum_operators into write_binary_bitwise_op. #1649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 17 additions & 33 deletions gen/src/write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,50 +513,34 @@ fn write_discriminant(out: &mut OutFile, repr: Atom, discriminant: Discriminant)
}
}

fn write_binary_bitwise_op(out: &mut OutFile, op: &str, enm: &Enum) {
let enum_name = &enm.name.cxx;
writeln!(
out,
"inline {enum_name} operator{op}({enum_name} lhs, {enum_name} rhs) {{",
);
write!(out, " return static_cast<{enum_name}>(static_cast<");
write_atom(out, enm.repr.atom);
write!(out, ">(lhs) {op} static_cast<");
write_atom(out, enm.repr.atom);
writeln!(out, ">(rhs));");
writeln!(out, "}}");
}

fn write_enum_operators(out: &mut OutFile, enm: &Enum) {
if derive::contains(&enm.derives, Trait::BitAnd) {
out.next_section();
writeln!(
out,
"inline {} operator&({} lhs, {} rhs) {{",
enm.name.cxx, enm.name.cxx, enm.name.cxx,
);
write!(out, " return static_cast<{}>(static_cast<", enm.name.cxx);
write_atom(out, enm.repr.atom);
write!(out, ">(lhs) & static_cast<");
write_atom(out, enm.repr.atom);
writeln!(out, ">(rhs));");
writeln!(out, "}}");
write_binary_bitwise_op(out, "&", enm);
}

if derive::contains(&enm.derives, Trait::BitOr) {
out.next_section();
writeln!(
out,
"inline {} operator|({} lhs, {} rhs) {{",
enm.name.cxx, enm.name.cxx, enm.name.cxx,
);
write!(out, " return static_cast<{}>(static_cast<", enm.name.cxx);
write_atom(out, enm.repr.atom);
write!(out, ">(lhs) | static_cast<");
write_atom(out, enm.repr.atom);
writeln!(out, ">(rhs));");
writeln!(out, "}}");
write_binary_bitwise_op(out, "|", enm);
}

if derive::contains(&enm.derives, Trait::BitXor) {
out.next_section();
writeln!(
out,
"inline {} operator^({} lhs, {} rhs) {{",
enm.name.cxx, enm.name.cxx, enm.name.cxx,
);
write!(out, " return static_cast<{}>(static_cast<", enm.name.cxx);
write_atom(out, enm.repr.atom);
write!(out, ">(lhs) ^ static_cast<");
write_atom(out, enm.repr.atom);
writeln!(out, ">(rhs));");
writeln!(out, "}}");
write_binary_bitwise_op(out, "^", enm);
}
}

Expand Down
Loading