Skip to content
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.

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

feat: Add Module::structs #6017

Merged
merged 1 commit into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions compiler/noirc_frontend/src/hir/comptime/interpreter/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ impl<'local, 'context> Interpreter<'local, 'context> {
"module_has_named_attribute" => module_has_named_attribute(self, arguments, location),
"module_is_contract" => module_is_contract(self, arguments, location),
"module_name" => module_name(interner, arguments, location),
"module_structs" => module_structs(self, arguments, location),
"modulus_be_bits" => modulus_be_bits(interner, arguments, location),
"modulus_be_bytes" => modulus_be_bytes(interner, arguments, location),
"modulus_le_bits" => modulus_le_bits(interner, arguments, location),
Expand Down Expand Up @@ -2294,6 +2295,30 @@ fn module_functions(
Ok(Value::Slice(func_ids, slice_type))
}

// fn structs(self) -> [StructDefinition]
fn module_structs(
interpreter: &Interpreter,
arguments: Vec<(Value, Location)>,
location: Location,
) -> IResult<Value> {
let self_argument = check_one_argument(arguments, location)?;
let module_id = get_module(self_argument)?;
let module_data = interpreter.elaborator.get_module(module_id);
let struct_ids = module_data
.type_definitions()
.filter_map(|module_def_id| {
if let ModuleDefId::TypeId(id) = module_def_id {
Some(Value::StructDefinition(id))
} else {
None
}
})
.collect();

let slice_type = Type::Slice(Box::new(Type::Quoted(QuotedType::StructDefinition)));
Ok(Value::Slice(struct_ids, slice_type))
}

// fn has_named_attribute(self, name: Quoted) -> bool
fn module_has_named_attribute(
interpreter: &Interpreter,
Expand Down
20 changes: 13 additions & 7 deletions docs/docs/noir/standard_library/meta/module.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,11 @@ Adds a top-level item (a function, a struct, a global, etc.) to the module.
Adding multiple items in one go is also valid if the `Quoted` value has multiple items in it.
Note that the items are type-checked as if they are inside the module they are being added to.

### name

#include_code name noir_stdlib/src/meta/module.nr rust

Returns the name of the module.

### functions

#include_code functions noir_stdlib/src/meta/module.nr rust

Returns each function in the module.
Returns each function defined in the module.

### has_named_attribute

Expand All @@ -39,3 +33,15 @@ Returns true if this module has a custom attribute with the given name.
#include_code is_contract noir_stdlib/src/meta/module.nr rust

`true` if this module is a contract module (was declared via `contract foo { ... }`).

### name

#include_code name noir_stdlib/src/meta/module.nr rust

Returns the name of the module.

### structs

#include_code structs noir_stdlib/src/meta/module.nr rust

Returns each struct defined in the module.
11 changes: 8 additions & 3 deletions noir_stdlib/src/meta/module.nr
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,22 @@ impl Module {
// docs:end:has_named_attribute

#[builtin(module_is_contract)]
// docs:start:is_contract
// docs:start:is_contract
comptime fn is_contract(self) -> bool {}
// docs:end:is_contract

#[builtin(module_functions)]
// docs:start:functions
// docs:start:functions
comptime fn functions(self) -> [FunctionDefinition] {}
// docs:end:functions

#[builtin(module_structs)]
// docs:start:structs
comptime fn structs(self) -> [StructDefinition] {}
// docs:end:structs

#[builtin(module_name)]
// docs:start:name
// docs:start:name
comptime fn name(self) -> Quoted {}
// docs:end:name
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ mod foo {
#![some_attribute]
pub fn x() {}
pub fn y() {}

struct Struct1 {}
}

contract bar {}
Expand Down Expand Up @@ -74,6 +76,10 @@ fn main() {
assert_eq(foo.functions().len(), 2);
assert_eq(bar.functions().len(), 0);

// Check Module::structs
assert_eq(foo.structs().len(), 1);
assert_eq(bar.structs().len(), 0);

// Check Module::name
assert_eq(foo.name(), quote { foo });
assert_eq(bar.name(), quote { bar });
Expand Down
Loading