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 Option<T> to noir stdlib #1781

Merged
merged 8 commits into from
Aug 1, 2023
Merged
Changes from 1 commit
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
Next Next commit
Add Option
  • Loading branch information
jfecher committed Jun 21, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 7fb413519227dd361ecc6aa3a8d55d1c2572cafe
1 change: 1 addition & 0 deletions noir_stdlib/src/lib.nr
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ mod ec;
mod unsafe;
mod collections;
mod compat;
mod option;

#[builtin(println)]
fn println<T>(_input : T) {}
113 changes: 113 additions & 0 deletions noir_stdlib/src/option.nr
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
struct Option<T> {
_is_some: bool,
value: T,
}

impl<T> Option<T> {
fn none() -> Self {
Self { _is_some: false, value: std::unsafe::zeroed() }
}

fn some(value: T) -> Self {
Self { _is_some: true, value }
}

fn is_none(self) -> bool {
!self._is_some
}

fn is_some(self) -> bool {
self._is_some
}

fn unwrap(self) -> T {
assert(self._is_some);
self.value
}

fn unwrap_or(self, default: T) -> T {
if self._is_some {
self.value
} else {
default
}
}

fn unwrap_or_else(self, default: fn() -> T) -> T {
if self._is_some {
self.value
} else {
default()
}
}

fn map<U>(self, f: fn(T) -> U) -> Option<U> {
if self._is_some {
Option::some(f(self.value))
} else {
Option::none()
}
}

fn map_or<U>(self, default: U, f: fn(T) -> U) -> U {
if self._is_some {
f(self.value)
} else {
default
}
}

fn map_or_else<U>(self, default: fn() -> U, f: fn(T) -> U) -> U {
if self._is_some {
f(self.value)
} else {
default()
}
}

fn and(self, other: Self) -> Self {
jfecher marked this conversation as resolved.
Show resolved Hide resolved
if self.is_none() {
Option::none()
} else {
other
}
}

fn and_then<U>(self, f: fn(T) -> Option<U>) -> Option<U> {
if self._is_some {
f(self.value)
} else {
Option::none()
}
}

fn or(self, other: Self) -> Self {
if self._is_some {
self
} else {
other
}
}

fn or_else<U>(self, default: fn() -> Option<T>) -> Option<T> {
if self._is_some {
self
} else {
default()
}
}

fn xor(self, other: Self) -> Self {
if self._is_some {
if other._is_some {
Option::none()
} else {
self
}
} else if other._is_some {
other
} else {
Option::none()
}
}
}