diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2011-04-06 17:56:44 -0700 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2011-04-06 17:58:18 -0700 |
| commit | 2e90bd94de32c739733966bfac96cf35e9a08655 (patch) | |
| tree | 01cecc3fbc92d27e01177b5d3cb0785239877ea9 /src/lib/option.rs | |
| parent | 36d75d6391873b34a1f4e10c34d3d58c54a453c5 (diff) | |
| download | rust-2e90bd94de32c739733966bfac96cf35e9a08655.tar.gz rust-2e90bd94de32c739733966bfac96cf35e9a08655.zip | |
Continued sketching out code for checking states against preconditions.
It's still sketchy. I added a typestate annotation field to statements tagged stmt_decl or stmt_expr, because a stmt_decl statement has a typestate that's different from that of its child node. This necessitated trivial changes to a bunch of other files all over to the compiler. I also added a few small standard library functions, some of which I didn't actually end up using but which I thought might be useful anyway.
Diffstat (limited to 'src/lib/option.rs')
| -rw-r--r-- | src/lib/option.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/option.rs b/src/lib/option.rs index 29a6f6eb96b..66a41bcac68 100644 --- a/src/lib/option.rs +++ b/src/lib/option.rs @@ -38,6 +38,13 @@ fn is_none[T](&t[T] opt) -> bool { } } +fn from_maybe[T](&T def, &t[T] opt) -> T { + alt(opt) { + case (none[T]) { ret def; } + case (some[T](?t)) { ret t; } + } +} + // Local Variables: // mode: rust; // fill-column: 78; |
