language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add GetVar trait for sharing between Atom and Prefab

Browse source
This commit is contained in:
Tad Hardesty 2018-09-14 22:51:51 -07:00
parent 2493b699b4
commit 6d568ad0f5
4 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/editor/map_renderer.rs
View file

@ -9,7 +9,7 @@ use ndarray::Axis;
use dm::objtree::ObjectTree;
use dm::constants::Constant;
use dmm_tools::dmm::Map;
use dmm_tools::minimap::{self, Atom};
use dmm_tools::minimap::{self, Atom, GetVar};
use dmi::*;

28
src/tools/dmm.rs
View file

@ -8,7 +8,6 @@ use ndarray::{self, Array3, Axis};
use linked_hash_map::LinkedHashMap;
use dm::{DMError, Location, HasLocation};
use dm::objtree::ObjectTree;
use dm::lexer::{LocationTracker, from_latin1, from_latin1_borrowed};
use dm::constants::Constant;
@ -106,33 +105,6 @@ impl Map {
}
}
impl Prefab {
pub fn get_var<'a>(&'a self, key: &str, objtree: &'a ObjectTree) -> &Constant {
self.get_var_spec(key, objtree).unwrap_or(Constant::null())
}
pub fn get_var_notnull<'a>(&'a self, key: &str, objtree: &'a ObjectTree) -> Option<&Constant> {
match self.get_var_spec(key, objtree) {
None | Some(&Constant::Null(_)) => None,
Some(other) => Some(other)
}
}
fn get_var_spec<'a>(&'a self, key: &str, objtree: &'a ObjectTree) -> Option<&Constant> {
if let Some(v) = self.vars.get(key) {
return Some(v);
}
let mut current = objtree.find(&self.path);
while let Some(t) = current.take() {
if let Some(v) = t.get().vars.get(key) {
return Some(v.value.constant.as_ref().unwrap_or(Constant::null()));
}
current = t.parent_type();
}
None
}
}
// ----------------------------------------------------------------------------
// Map Writer

46
src/tools/minimap.rs
View file

@ -328,18 +328,34 @@ impl<'a> Atom<'a> {
subpath(&self.type_.path, parent)
}
pub fn get_var(&self, key: &str, objtree: &'a ObjectTree) -> &Constant {
self.get_var_spec(key, objtree).unwrap_or(Constant::null())
pub fn copy_var(&mut self, key: &str, from: &Atom, objtree: &'a ObjectTree) {
if let Some(var) = from.get_var_notnull(key, objtree) {
self.set_var(key, var.clone());
}
}
pub fn get_var_notnull(&self, key: &str, objtree: &'a ObjectTree) -> Option<&Constant> {
match self.get_var_spec(key, objtree) {
pub fn set_var<K: Into<String>>(&mut self, key: K, value: Constant) {
self.vars.insert(key.into(), value);
}
}
pub trait GetVar {
fn get_var<'a>(&'a self, key: &str, objtree: &'a ObjectTree) -> &'a Constant {
self.get_var_inner(key, objtree).unwrap_or(Constant::null())
}
fn get_var_notnull<'a>(&'a self, key: &str, objtree: &'a ObjectTree) -> Option<&'a Constant> {
match self.get_var_inner(key, objtree) {
None | Some(&Constant::Null(_)) => None,
Some(other) => Some(other)
}
}
fn get_var_spec(&self, key: &str, objtree: &'a ObjectTree) -> Option<&Constant> {
fn get_var_inner<'a>(&'a self, key: &str, objtree: &'a ObjectTree) -> Option<&'a Constant>;
}
impl<'a> GetVar for Atom<'a> {
fn get_var_inner<'b>(&'b self, key: &str, objtree: &'b ObjectTree) -> Option<&'b Constant> {
if let Some(v) = self.vars.get(key) {
return Some(v);
}
@ -357,15 +373,21 @@ impl<'a> Atom<'a> {
}
None
}
}
pub fn copy_var(&mut self, key: &str, from: &Atom, objtree: &'a ObjectTree) {
if let Some(var) = from.get_var_notnull(key, objtree) {
self.set_var(key, var.clone());
impl GetVar for Prefab {
fn get_var_inner<'a>(&'a self, key: &str, objtree: &'a ObjectTree) -> Option<&Constant> {
if let Some(v) = self.vars.get(key) {
return Some(v);
}
}
pub fn set_var<K: Into<String>>(&mut self, key: K, value: Constant) {
self.vars.insert(key.into(), value);
let mut current = objtree.find(&self.path);
while let Some(t) = current.take() {
if let Some(v) = t.get().vars.get(key) {
return Some(v.value.constant.as_ref().unwrap_or(Constant::null()));
}
current = t.parent_type();
}
None
}
}

2
src/tools/render_passes/mod.rs
View file

@ -1,6 +1,6 @@
use dm::objtree::*;
use dm::constants::Constant;
use minimap::Atom;
use minimap::{Atom, GetVar};
pub mod transit_tube;
pub mod random;