From 519a9e5360f2cf0438dd09cfa3070bb9c8819f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Mon, 15 Feb 2021 18:50:28 +0100 Subject: BlobInstance -> Instance --- src/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index ee176e5..c2aee90 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -85,14 +85,14 @@ pub enum Type { Tuple(Vec), Function(Vec, Box), Blob(usize), - BlobInstance(usize), + Instance(usize), } impl PartialEq for Type { fn eq(&self, other: &Self) -> bool { match (self, other) { (Type::Void, Type::Void) => true, - (Type::BlobInstance(a), Type::BlobInstance(b)) => a == b, + (Type::Instance(a), Type::Instance(b)) => a == b, (Type::Blob(a), Type::Blob(b)) => a == b, (Type::Int, Type::Int) => true, (Type::Float, Type::Float) => true, @@ -111,7 +111,7 @@ impl PartialEq for Type { impl From<&Value> for Type { fn from(value: &Value) -> Type { match value { - Value::BlobInstance(i, _) => Type::BlobInstance(*i), + Value::Instance(i, _) => Type::Instance(*i), Value::Blob(i) => Type::Blob(*i), Value::Tuple(v) => { Type::Tuple(v.iter().map(|x| Type::from(x)).collect()) @@ -137,7 +137,7 @@ impl From<&Type> for Value { match ty { Type::Void => Value::Nil, Type::Blob(i) => Value::Blob(*i), - Type::BlobInstance(i) => Value::BlobInstance(*i, Rc::new(RefCell::new(Vec::new()))), + Type::Instance(i) => Value::Instance(*i, Rc::new(RefCell::new(Vec::new()))), Type::Tuple(fields) => { Value::Tuple(Rc::new(fields.iter().map(Value::from).collect())) } @@ -164,7 +164,7 @@ impl From for Value { pub enum Value { Ty(Type), Blob(usize), - BlobInstance(usize, Rc>>), + Instance(usize, Rc>>), Tuple(Rc>), Float(f64), Int(i64), @@ -181,7 +181,7 @@ impl Debug for Value { match self { Value::Ty(ty) => write!(fmt, "(type {:?})", ty), Value::Blob(i) => write!(fmt, "(blob {})", i), - Value::BlobInstance(i, v) => write!(fmt, "(inst {} {:?})", i, v), + Value::Instance(i, v) => write!(fmt, "(inst {} {:?})", i, v), Value::Float(f) => write!(fmt, "(float {})", f), Value::Int(i) => write!(fmt, "(int {})", i), Value::Bool(b) => write!(fmt, "(bool {})", b), -- cgit v1.2.1