diff options
author | Griffin Smith <grfn@gws.fyi> | 2021-04-17T06·28+0200 |
---|---|---|
committer | grfn <grfn@gws.fyi> | 2021-04-17T06·33+0000 |
commit | 48098f83c1e3943d1fb76aaecdce3b4f56cf4d4a (patch) | |
tree | c7a09a380bf66b4b20a46ab60890e2d8c7a2de67 /users/grfn/achilles/src/interpreter/value.rs | |
parent | e1c45be3f58f5ae139439994b8d72f7d58c5c895 (diff) |
feat(grfn/achilles): Implement tuples, and tuple patterns r/2522
Implement tuple expressions, types, and patterns, all the way through the parser down to the typechecker. In LLVM, these are implemented as anonymous structs, using an `extract` instruction when they're pattern matched on to get out the individual fields. Currently the only limitation here is patterns aren't supported in function argument position, but you can still do something like fn xy = let (x, y) = xy in x + y Change-Id: I357f17e9d4052e741eda8605b6662822f331efde Reviewed-on: https://cl.tvl.fyi/c/depot/+/3027 Reviewed-by: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'users/grfn/achilles/src/interpreter/value.rs')
-rw-r--r-- | users/grfn/achilles/src/interpreter/value.rs | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/users/grfn/achilles/src/interpreter/value.rs b/users/grfn/achilles/src/interpreter/value.rs index 55ba42f9de58..272d1167a33c 100644 --- a/users/grfn/achilles/src/interpreter/value.rs +++ b/users/grfn/achilles/src/interpreter/value.rs @@ -6,6 +6,7 @@ use std::rc::Rc; use std::result; use derive_more::{Deref, From, TryInto}; +use itertools::Itertools; use super::{Error, Result}; use crate::ast::hir::Expr; @@ -25,6 +26,7 @@ pub enum Val<'a> { Float(f64), Bool(bool), String(Cow<'a, str>), + Tuple(Vec<Value<'a>>), Function(Function<'a>), } @@ -49,6 +51,7 @@ impl<'a> fmt::Debug for Val<'a> { Val::Function(Function { type_, .. }) => { f.debug_struct("Function").field("type_", type_).finish() } + Val::Tuple(members) => f.debug_tuple("Tuple").field(members).finish(), } } } @@ -79,6 +82,7 @@ impl<'a> Display for Val<'a> { Val::Bool(x) => x.fmt(f), Val::String(s) => write!(f, "{:?}", s), Val::Function(Function { type_, .. }) => write!(f, "<{}>", type_), + Val::Tuple(members) => write!(f, "({})", members.iter().join(", ")), } } } @@ -91,6 +95,7 @@ impl<'a> Val<'a> { Val::Bool(_) => Type::Bool, Val::String(_) => Type::CString, Val::Function(Function { type_, .. }) => Type::Function(type_.clone()), + Val::Tuple(members) => Type::Tuple(members.iter().map(|expr| expr.type_()).collect()), } } @@ -114,6 +119,22 @@ impl<'a> Val<'a> { }), } } + + pub fn as_tuple(&self) -> Option<&Vec<Value<'a>>> { + if let Self::Tuple(v) = self { + Some(v) + } else { + None + } + } + + pub fn try_into_tuple(self) -> result::Result<Vec<Value<'a>>, Self> { + if let Self::Tuple(v) = self { + Ok(v) + } else { + Err(self) + } + } } #[derive(Debug, PartialEq, Clone, Deref)] |