Skip to content

Represent Variant with a non-optional payload type #220

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
alexcrichton merged 1 commit into from
May 10, 2022
Merged

Represent Variant with a non-optional payload type #220

Show file tree
Hide file tree
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
56 changes: 23 additions & 33 deletions crates/gen-c/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,16 +488,12 @@ impl C {
TypeDefKind::Variant(v) => {
self.src.c("switch ((int32_t) ptr->tag) {\n");
for (i, case) in v.cases.iter().enumerate() {
let case_ty = match &case.ty {
Some(ty) => ty,
None => continue,
};
if !self.owns_anything(iface, case_ty) {
if !self.owns_anything(iface, &case.ty) {
continue;
}
self.src.c(&format!("case {}: {{\n", i));
let expr = format!("&ptr->val.{}", case.name.to_snake_case());
self.free(iface, case_ty, &expr);
self.free(iface, &case.ty, &expr);
self.src.c("break;\n");
self.src.c("}\n");
}
Expand Down Expand Up @@ -554,11 +550,7 @@ impl C {
TypeDefKind::Flags(_) => false,
TypeDefKind::Enum(_) => false,
TypeDefKind::List(_) => true,
TypeDefKind::Variant(v) => v
.cases
.iter()
.filter_map(|c| c.ty.as_ref())
.any(|t| self.owns_anything(iface, t)),
TypeDefKind::Variant(v) => v.cases.iter().any(|c| self.owns_anything(iface, &c.ty)),
TypeDefKind::Union(v) => v
.cases
.iter()
Expand Down Expand Up @@ -793,16 +785,17 @@ impl Generator for C {
self.docs(docs);
self.names.insert(&name.to_snake_case()).unwrap();
self.src.h("typedef struct {\n");
self.src.h(int_repr(variant.tag));
self.src.h(int_repr(variant.tag()));
self.src.h(" tag;\n");
self.src.h("union {\n");
for case in variant.cases.iter() {
if let Some(ty) = &case.ty {
self.print_ty(iface, ty);
self.src.h(" ");
self.src.h(&case.name.to_snake_case());
self.src.h(";\n");
if self.is_empty_type(iface, &case.ty) {
continue;
}
self.print_ty(iface, &case.ty);
self.src.h(" ");
self.src.h(&case.name.to_snake_case());
self.src.h(";\n");
}
self.src.h("} val;\n");
self.src.h("} ");
Expand Down Expand Up @@ -1637,17 +1630,15 @@ impl Bindgen for FunctionBindgen<'_> {
variant.cases.iter().zip(blocks).zip(payloads).enumerate()
{
self.src.push_str(&format!("case {}: {{\n", i));
if let Some(ty) = &case.ty {
if !self.gen.is_empty_type(iface, ty) {
let ty = self.gen.type_string(iface, ty);
self.src.push_str(&format!(
"const {} *{} = &({}).val",
ty, payload, operands[0],
));
self.src.push_str(".");
self.src.push_str(&case.name.to_snake_case());
self.src.push_str(";\n");
}
if !self.gen.is_empty_type(iface, &case.ty) {
let ty = self.gen.type_string(iface, &case.ty);
self.src.push_str(&format!(
"const {} *{} = &({}).val",
ty, payload, operands[0],
));
self.src.push_str(".");
self.src.push_str(&case.name.to_snake_case());
self.src.push_str(";\n");
}
self.src.push_str(&block);

Expand Down Expand Up @@ -1677,15 +1668,13 @@ impl Bindgen for FunctionBindgen<'_> {
{
self.src.push_str(&format!("case {}: {{\n", i));
self.src.push_str(&block);
assert!(block_results.len() == 1);

if case.ty.is_some() {
assert!(block_results.len() == 1);
if !self.gen.is_empty_type(iface, &case.ty) {
let mut dst = format!("{}.val", result);
dst.push_str(".");
dst.push_str(&case.name.to_snake_case());
self.store_op(&block_results[0], &dst);
} else {
assert!(block_results.is_empty());
}
self.src.push_str("break;\n}\n");
}
Expand Down Expand Up @@ -1810,9 +1799,10 @@ impl Bindgen for FunctionBindgen<'_> {
Instruction::OptionLift { payload, ty, .. } => {
let (some, some_results) = self.blocks.pop().unwrap();
let (none, none_results) = self.blocks.pop().unwrap();
assert!(none_results.is_empty());
assert!(none_results.len() == 1);
assert!(some_results.len() == 1);
let some_result = &some_results[0];
assert_eq!(none_results[0], "INVALID");

let ty = self.gen.type_string(iface, &Type::Id(*ty));
let result = self.locals.tmp("option");
Expand Down
8 changes: 2 additions & 6 deletions crates/gen-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,7 @@ impl Types {
TypeDefKind::Enum(_) => {}
TypeDefKind::Variant(v) => {
for case in v.cases.iter() {
if let Some(ty) = &case.ty {
info |= self.type_info(iface, ty);
}
info |= self.type_info(iface, &case.ty);
}
}
TypeDefKind::List(ty) => {
Expand Down Expand Up @@ -279,9 +277,7 @@ impl Types {
TypeDefKind::Enum(_) => {}
TypeDefKind::Variant(v) => {
for case in v.cases.iter() {
if let Some(ty) = &case.ty {
self.set_param_result_ty(iface, ty, param, result)
}
self.set_param_result_ty(iface, &case.ty, param, result)
}
}
TypeDefKind::List(ty) | TypeDefKind::Type(ty) | TypeDefKind::Option(ty) => {
Expand Down
15 changes: 8 additions & 7 deletions crates/gen-js/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,9 +445,9 @@ impl Generator for Js {
self.src.ts("tag: \"");
self.src.ts(&case.name);
self.src.ts("\",\n");
if let Some(ty) = &case.ty {
if case.ty != Type::Unit {
self.src.ts("val: ");
self.print_ty(iface, ty);
self.print_ty(iface, &case.ty);
self.src.ts(",\n");
}
self.src.ts("}\n");
Expand Down Expand Up @@ -1595,7 +1595,7 @@ impl Bindgen for FunctionBindgen<'_> {
for (case, (block, block_results)) in variant.cases.iter().zip(blocks) {
self.src
.js(&format!("case \"{}\": {{\n", case.name.as_str()));
if case.ty.is_some() {
if case.ty != Type::Unit {
self.src.js(&format!("const e = variant{}.val;\n", tmp));
}
self.src.js(&block);
Expand Down Expand Up @@ -1633,11 +1633,11 @@ impl Bindgen for FunctionBindgen<'_> {

self.src.js(&format!("variant{} = {{\n", tmp));
self.src.js(&format!("tag: \"{}\",\n", case.name.as_str()));
if case.ty.is_some() {
assert!(block_results.len() == 1);
assert!(block_results.len() == 1);
if case.ty != Type::Unit {
self.src.js(&format!("val: {},\n", block_results[0]));
} else {
assert!(block_results.is_empty());
assert_eq!(block_results[0], "undefined");
}
self.src.js("};\n");
self.src.js("break;\n}\n");
Expand Down Expand Up @@ -1789,9 +1789,10 @@ impl Bindgen for FunctionBindgen<'_> {
Instruction::OptionLift { payload, .. } => {
let (some, some_results) = self.blocks.pop().unwrap();
let (none, none_results) = self.blocks.pop().unwrap();
assert!(none_results.is_empty());
assert!(none_results.len() == 1);
assert!(some_results.len() == 1);
let some_result = &some_results[0];
assert_eq!(none_results[0], "undefined");

let tmp = self.tmp();

Expand Down
6 changes: 2 additions & 4 deletions crates/gen-markdown/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,8 @@ impl Generator for Markdown {
format!("{}::{}", name, case.name),
format!("#{}.{}", name.to_snake_case(), case.name.to_snake_case()),
);
if let Some(ty) = &case.ty {
self.src.push_str(": ");
self.print_ty(iface, ty, false);
}
self.src.push_str(": ");
self.print_ty(iface, &case.ty, false);
self.src.indent(1);
self.src.push_str("\n\n");
self.docs(&case.docs);
Expand Down
17 changes: 9 additions & 8 deletions crates/gen-rust-wasm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,26 +1018,27 @@ impl Bindgen for FunctionBindgen<'_> {
for (case, block) in variant.cases.iter().zip(blocks) {
let case_name = case.name.to_camel_case();
self.push_str(&format!("{name}::{case_name}"));
if case.ty.is_some() {
self.push_str("(e)");
if case.ty == Type::Unit {
self.push_str(&format!(" => {{\nlet e = ();\n{block}\n}}\n"));
} else {
self.push_str(&format!("(e) => {block},\n"));
}
self.push_str(&format!(" => {block},\n"));
}
self.push_str("};\n");
}

// In unchecked mode when this type is a named enum then we know we
// defined the type so we can transmute directly into it.
Instruction::VariantLift { name, variant, .. }
if variant.cases.iter().all(|c| c.ty.is_none()) && unchecked =>
if variant.cases.iter().all(|c| c.ty == Type::Unit) && unchecked =>
{
self.blocks.drain(self.blocks.len() - variant.cases.len()..);
let mut result = format!("core::mem::transmute::<_, ");
result.push_str(&name.to_camel_case());
result.push_str(">(");
result.push_str(&operands[0]);
result.push_str(" as ");
result.push_str(int_repr(variant.tag));
result.push_str(int_repr(variant.tag()));
result.push_str(")");
results.push(result);
}
Expand All @@ -1056,7 +1057,7 @@ impl Bindgen for FunctionBindgen<'_> {
} else {
i.to_string()
};
let block = if case.ty.is_some() {
let block = if case.ty != Type::Unit {
format!("({block})")
} else {
String::new()
Expand Down Expand Up @@ -1124,8 +1125,8 @@ impl Bindgen for FunctionBindgen<'_> {
let operand = &operands[0];
self.push_str(&format!(
"match {operand} {{
Some(e) => {{ {some} }},
None => {{ {none} }},
Some(e) => {some},
None => {{\nlet e = ();\n{none}\n}},
}};"
));
}
Expand Down
21 changes: 12 additions & 9 deletions crates/gen-rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ pub trait RustGenerator {
variant
.cases
.iter()
.map(|c| (c.name.to_camel_case(), &c.docs, c.ty.as_ref())),
.map(|c| (c.name.to_camel_case(), &c.docs, &c.ty)),
docs,
);
}
Expand All @@ -473,7 +473,7 @@ pub trait RustGenerator {
.cases
.iter()
.enumerate()
.map(|(i, c)| (format!("V{i}"), &c.docs, Some(&c.ty))),
.map(|(i, c)| (format!("V{i}"), &c.docs, &c.ty)),
docs,
);
}
Expand All @@ -482,7 +482,7 @@ pub trait RustGenerator {
&mut self,
iface: &Interface,
id: TypeId,
cases: impl IntoIterator<Item = (String, &'a Docs, Option<&'a Type>)> + Clone,
cases: impl IntoIterator<Item = (String, &'a Docs, &'a Type)> + Clone,
docs: &Docs,
) where
Self: Sized,
Expand All @@ -504,9 +504,9 @@ pub trait RustGenerator {
for (case_name, docs, payload) in cases.clone() {
self.rustdoc(docs);
self.push_str(&case_name);
if let Some(ty) = payload {
if *payload != Type::Unit {
self.push_str("(");
self.print_ty(iface, ty, mode);
self.print_ty(iface, payload, mode);
self.push_str(")")
}
self.push_str(",\n");
Expand All @@ -530,7 +530,7 @@ pub trait RustGenerator {
id: TypeId,
mode: TypeMode,
name: &str,
cases: impl IntoIterator<Item = (String, Option<&'a Type>)>,
cases: impl IntoIterator<Item = (String, &'a Type)>,
) where
Self: Sized,
{
Expand All @@ -548,12 +548,12 @@ pub trait RustGenerator {
self.push_str(name);
self.push_str("::");
self.push_str(&case_name);
if payload.is_some() {
if *payload != Type::Unit {
self.push_str("(e)");
}
self.push_str(" => {\n");
self.push_str(&format!("f.debug_tuple(\"{}::{}\")", name, case_name));
if payload.is_some() {
if *payload != Type::Unit {
self.push_str(".field(e)");
}
self.push_str(".finish()\n");
Expand Down Expand Up @@ -689,7 +689,10 @@ pub trait RustGenerator {
id,
TypeMode::Owned,
&name,
enum_.cases.iter().map(|c| (c.name.to_camel_case(), None)),
enum_
.cases
.iter()
.map(|c| (c.name.to_camel_case(), &Type::Unit)),
)
}
}
Expand Down
30 changes: 9 additions & 21 deletions crates/gen-wasmtime-py/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,14 +650,9 @@ impl Generator for WasmtimePy {
let name = format!("{}{}", name.to_camel_case(), case.name.to_camel_case());
self.src.push_str(&format!("class {}:\n", name));
self.indent();
match &case.ty {
Some(ty) => {
self.src.push_str("value: ");
self.print_ty(iface, ty);
self.src.push_str("\n");
}
None => self.src.push_str("pass\n"),
}
self.src.push_str("value: ");
self.print_ty(iface, &case.ty);
self.src.push_str("\n");
self.deindent();
self.src.push_str("\n");
cases.push(name);
Expand Down Expand Up @@ -1658,12 +1653,8 @@ impl Bindgen for FunctionBindgen<'_> {
case.name.to_camel_case()
));
self.src.indent(2);

if case.ty.is_some() {
self.src
.push_str(&format!("{} = {}.value\n", payload, operands[0]));
}

self.src
.push_str(&format!("{} = {}.value\n", payload, operands[0]));
self.src.push_str(&block);

for (i, result) in block_results.iter().enumerate() {
Expand Down Expand Up @@ -1713,12 +1704,8 @@ impl Bindgen for FunctionBindgen<'_> {
name.to_camel_case(),
case.name.to_camel_case()
));
if case.ty.is_some() {
assert!(block_results.len() == 1);
self.src.push_str(&block_results[0]);
} else {
assert!(block_results.is_empty());
}
assert!(block_results.len() == 1);
self.src.push_str(&block_results[0]);
self.src.push_str(")\n");
self.src.deindent(2);
}
Expand Down Expand Up @@ -1848,9 +1835,10 @@ impl Bindgen for FunctionBindgen<'_> {
Instruction::OptionLift { ty, .. } => {
let (some, some_results) = self.blocks.pop().unwrap();
let (none, none_results) = self.blocks.pop().unwrap();
assert!(none_results.is_empty());
assert!(none_results.len() == 1);
assert!(some_results.len() == 1);
let some_result = &some_results[0];
assert_eq!(none_results[0], "None");

let result = self.locals.tmp("option");
self.src.push_str(&format!(
Expand Down
Loading