greg
/
schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optional scope name

This commit is contained in:
greg 2018-05-10 22:32:36 -07:00
parent e7615fda8b
commit c3be644133
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
schala-lang/src/util.rs
View File

@ -5,7 +5,8 @@ use std::cmp::Eq;
#[derive(Default, Debug)] #[derive(Default, Debug)]
pub struct StateStack<'a, T: 'a, V: 'a> where T: Hash + Eq { pub struct StateStack<'a, T: 'a, V: 'a> where T: Hash + Eq {
parent: Option<&'a StateStack<'a, T, V>>, parent: Option<&'a StateStack<'a, T, V>>,
values: HashMap<T, V> values: HashMap<T, V>,
scope_name: Option<String>
} }
impl<'a, T, V> StateStack<'a, T, V> where T: Hash + Eq { impl<'a, T, V> StateStack<'a, T, V> where T: Hash + Eq {
@ -19,11 +20,15 @@ impl<'a, T, V> StateStack<'a, T, V> where T: Hash + Eq {
(Some(value), _) => Some(value), (Some(value), _) => Some(value),
} }
} }
pub fn new_frame(&'a self) -> StateStack<'a, T, V> where T: Hash + Eq { pub fn new_frame(&'a self, name: Option<String>) -> StateStack<'a, T, V> where T: Hash + Eq {
StateStack { StateStack {
parent: Some(self), parent: Some(self),
values: HashMap::default() values: HashMap::default(),
scope_name: name,
} }
} }
pub fn get_name(&self) -> Option<&String> {
self.scope_name.as_ref()
}
} }