Skip to content

gen-guest-c: Emit prettier comments. #455

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
Jan 3, 2023
Merged

gen-guest-c: Emit prettier comments. #455

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
30 changes: 20 additions & 10 deletions crates/gen-guest-c/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_record(&mut self, id: TypeId, name: &str, record: &Record, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef struct {\n");
self.src.h_defs("typedef struct {\n");
for field in record.fields.iter() {
self.print_ty(SourceType::HDefs, &field.ty);
self.src.h_defs(" ");
Expand All @@ -453,8 +454,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_tuple(&mut self, id: TypeId, name: &str, tuple: &Tuple, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef struct {\n");
self.src.h_defs("typedef struct {\n");
for (i, ty) in tuple.types.iter().enumerate() {
self.print_ty(SourceType::HDefs, ty);
uwriteln!(self.src.h_defs, " f{i};");
Expand All @@ -468,8 +470,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_flags(&mut self, id: TypeId, name: &str, flags: &Flags, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef ");
self.src.h_defs("typedef ");
let repr = flags_repr(flags);
self.src.h_defs(int_repr(repr));
self.src.h_defs(" ");
Expand All @@ -495,8 +498,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_variant(&mut self, id: TypeId, name: &str, variant: &Variant, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef struct {\n");
self.src.h_defs("typedef struct {\n");
self.src.h_defs(int_repr(variant.tag()));
self.src.h_defs(" tag;\n");
self.src.h_defs("union {\n");
Expand Down Expand Up @@ -532,8 +536,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_union(&mut self, id: TypeId, name: &str, union: &Union, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef struct {\n");
self.src.h_defs("typedef struct {\n");
self.src.h_defs(int_repr(union.tag()));
self.src.h_defs(" tag;\n");
self.src.h_defs("union {\n");
Expand All @@ -551,8 +556,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_option(&mut self, id: TypeId, name: &str, payload: &Type, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef struct {\n");
self.src.h_defs("typedef struct {\n");
self.src.h_defs("bool is_some;\n");
if !self.is_empty_type(payload) {
self.print_ty(SourceType::HDefs, payload);
Expand All @@ -567,8 +573,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_result(&mut self, id: TypeId, name: &str, result: &Result_, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef struct {\n");
self.src.h_defs("typedef struct {\n");
self.src.h_defs("bool is_err;\n");
self.src.h_defs("union {\n");
if let Some(ok) = self.get_nonempty_type(result.ok.as_ref()) {
Expand All @@ -589,9 +596,10 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_enum(&mut self, id: TypeId, name: &str, enum_: &Enum, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
uwrite!(self.src.h_defs, "\n");
self.docs(docs);
let int_t = int_repr(enum_.tag());
uwrite!(self.src.h_defs, "\ntypedef {int_t} ");
uwrite!(self.src.h_defs, "typedef {int_t} ");
self.print_typedef_target(name);

if enum_.cases.len() > 0 {
Expand All @@ -614,8 +622,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_alias(&mut self, id: TypeId, name: &str, ty: &Type, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef ");
self.src.h_defs("typedef ");
self.print_ty(SourceType::HDefs, ty);
self.src.h_defs(" ");
self.print_typedef_target(name);
Expand All @@ -625,8 +634,9 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {

fn type_list(&mut self, id: TypeId, name: &str, ty: &Type, docs: &Docs) {
let prev = mem::take(&mut self.src.h_defs);
self.src.h_defs("\n");
self.docs(docs);
self.src.h_defs("\ntypedef struct {\n");
self.src.h_defs("typedef struct {\n");
self.print_ty(SourceType::HDefs, ty);
self.src.h_defs(" *ptr;\n");
self.src.h_defs("size_t len;\n");
Expand Down