Wisp/wisp
Wisp/wisp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added captures to values

Browse source
This commit is contained in:
Erin 2022-07-21 21:54:28 +02:00 committed by ondra05
parent 91bbdf0b37
commit 79f77cb7d9
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/value.rs
View file

@ -4,6 +4,7 @@ use std::{
borrow::Cow, borrow::Cow,
collections::BTreeMap, collections::BTreeMap,
fmt::{Display, Write}, fmt::{Display, Write},
rc::Rc,
}; };
/// A Wisp value /// A Wisp value
@ -13,7 +14,7 @@ pub enum Value<'a> {
Vector(Vec<Self>), Vector(Vec<Self>),
Map(BTreeMap<Self, Self>), Map(BTreeMap<Self, Self>),
Module(Module<'a>), Module(Module<'a>),
Function(Function), Function(Function<'a>),
Symbol(Symbol<'a>), Symbol(Symbol<'a>),
Keyword(Cow<'a, str>), Keyword(Cow<'a, str>),
Bool(bool), Bool(bool),
@ -24,12 +25,28 @@ pub enum Value<'a> {
#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)] #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
pub struct Module<'a> { pub struct Module<'a> {
members: BTreeMap<u64, Value<'a>>, members: BTreeMap<u64, Rc<Value<'a>>>,
symbol_table: BTreeMap<String, u64>, symbol_table: BTreeMap<String, u64>,
} }
#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)] #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
pub struct Function {} pub struct Function<'a> {
// TODO: bytecode
captures: Box<[Capture<'a>]>,
symbol_table: BTreeMap<Symbol<'a>, SymbolMapping>,
}
#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
pub enum Capture<'a> {
Reference(Rc<Value<'a>>),
Owned(Value<'a>),
}
#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
pub enum SymbolMapping {
Local(u64),
Capture(u64),
}
#[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)] #[derive(Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
pub enum Symbol<'a> { pub enum Symbol<'a> {