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

Fix errors if /client/parent_type is left at the default

Browse source
This commit is contained in:
Tad Hardesty 2020-09-15 19:51:19 -07:00
parent a6466dfb35
commit 3c9be17701
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/dreammaker/constants.rs
View file

@ -130,6 +130,8 @@ impl Constant {
// ------------------------------------------------------------------------
// Constructors
pub const EMPTY_STRING: &'static Constant = &Constant::String(String::new());
pub fn null() -> &'static Constant {
static NULL: Constant = Constant::Null(None);
&NULL

9
src/dreammaker/objtree.rs
View file

@ -758,7 +758,7 @@ impl ObjectTree {
fn assign_parent_types(&mut self, context: &Context) {
for (path, &type_idx) in self.types.iter() {
let mut location = self.graph[type_idx.index()].location;
let mut location = self[type_idx].location;
let idx = if path == "/datum" || path == "/list" || path == "/savefile" || path == "/world" {
// These types have no parent and cannot have one added. In the official compiler:
// - setting list or savefile/parent_type is denied with the same error as setting something's parent type to them;
@ -807,8 +807,11 @@ impl ObjectTree {
}
Err(e) => Err(e),
}
} else if path == "/client" {
Ok(Constant::EMPTY_STRING)
} else {
Err(DMError::new(location, "bad parent_type: no value"))
// A weird situation which should not happen.
Err(DMError::new(location, format!("missing {}/parent_type", path)))
};
match constant {
@ -824,7 +827,7 @@ impl ObjectTree {
parent_type = &parent_type_buf;
}
Ok(other) => {
context.register_error(DMError::new(location, format!("bad parent_type: {}", other)));
context.register_error(DMError::new(location, format!("value of {}/parent_type must be a string or typepath, got {}", path, other)));
}
Err(e) => {
context.register_error(e);