Skip to content

Commit

Permalink
reinstate function level bool
Browse files Browse the repository at this point in the history
  • Loading branch information
yowl committed Jan 20, 2024
1 parent c98d352 commit c089fde
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions crates/csharp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl InterfaceTypeAndFragments {
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum FunctionLevel {
Interface,
Freestanding,
FreeStanding,
}

#[derive(Default)]
Expand Down Expand Up @@ -166,7 +166,7 @@ impl WorldGenerator for CSharp {
) {
let name = interface_name(self, resolve, key, Direction::Import);
self.interface_names.insert(id, name.clone());
let mut gen = self.interface(resolve, &name, Direction::Import);
let mut gen = self.interface(resolve, &name, Direction::Import, FunctionLevel::Interface);

gen.types(id);

Expand All @@ -189,7 +189,12 @@ impl WorldGenerator for CSharp {
_files: &mut Files,
) {
let name = &format!("{}-world", resolve.worlds[world].name);
let mut gen = self.interface(resolve, name, Direction::Import);
let mut gen = self.interface(
resolve,
name,
Direction::Import,
FunctionLevel::FreeStanding,
);

for (import_module_name, func) in funcs {
gen.import(import_module_name, func);
Expand All @@ -207,7 +212,7 @@ impl WorldGenerator for CSharp {
) -> Result<()> {
let name = interface_name(self, resolve, key, Direction::Export);
self.interface_names.insert(id, name.clone());
let mut gen = self.interface(resolve, &name, Direction::Export);
let mut gen = self.interface(resolve, &name, Direction::Export, FunctionLevel::Interface);

gen.types(id);

Expand All @@ -231,7 +236,12 @@ impl WorldGenerator for CSharp {
_files: &mut Files,
) -> Result<()> {
let name = &format!("{}-world", resolve.worlds[world].name);
let mut gen = self.interface(resolve, name, Direction::Export);
let mut gen = self.interface(
resolve,
name,
Direction::Export,
FunctionLevel::FreeStanding,
);

for (_, func) in funcs {
gen.export(func, None);
Expand All @@ -249,7 +259,7 @@ impl WorldGenerator for CSharp {
_files: &mut Files,
) {
let name = &format!("{}-world", resolve.worlds[world].name);
let mut gen = self.interface(resolve, name, Direction::Import);
let mut gen = self.interface(resolve, name, Direction::Import, FunctionLevel::Interface);

for (ty_name, ty) in types {
gen.define_type(ty_name, *ty);
Expand Down Expand Up @@ -2040,7 +2050,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
.strip_prefix("I")
.unwrap()
.to_upper_camel_case(),
FunctionLevel::Freestanding => interface_name,
FunctionLevel::FreeStanding => interface_name,
})
.to_upper_camel_case();

Expand Down

0 comments on commit c089fde

Please sign in to comment.