mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-03-10 14:13:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed 'type [custom type] does not fit in [litterally the same type but not custom]' problem

Browse Source
This commit is contained in:
mark 2023-04-29 19:56:54 +02:00
parent ef5874747e
commit 1a446248e4
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mers/src/script/val_type.rs
View File

@ -140,10 +140,12 @@ impl VType {
impl VType { impl VType {
/// Returns a vec with all types in self that aren't covered by rhs. If the returned vec is empty, self fits in rhs. /// Returns a vec with all types in self that aren't covered by rhs. If the returned vec is empty, self fits in rhs.
pub fn fits_in(&self, rhs: &Self, info: &GlobalScriptInfo) -> Vec<VSingleType> { pub fn fits_in(&self, rhs: &Self, info: &GlobalScriptInfo) -> Vec<VSingleType> {
#[cfg(debug_assertions)]
eprintln!("{} in {}? [VType]", self, rhs);
let mut no = vec![]; let mut no = vec![];
for t in &self.types { for t in &self.types {
// if t doesnt fit in any of rhs's types // if t doesnt fit in any of rhs's types
if !rhs.types.iter().any(|r| t.fits_in(r, info)) { if !t.fits_in_type(rhs, info) {
no.push(t.clone()) no.push(t.clone())
} }
} }
@ -281,15 +283,15 @@ impl VSingleType {
} }
} }
pub fn fits_in(&self, rhs: &Self, info: &GlobalScriptInfo) -> bool { pub fn fits_in(&self, rhs: &Self, info: &GlobalScriptInfo) -> bool {
// #[cfg(debug_assertions)] #[cfg(debug_assertions)]
// eprintln!("{self} in {rhs}?"); eprintln!("{self} in {rhs}?");
match (self, rhs) { let o = match (self, rhs) {
(Self::Reference(r), Self::Reference(b)) => r.fits_in(b, info), (Self::Reference(r), Self::Reference(b)) => r.fits_in(b, info),
(Self::Reference(_), _) | (_, Self::Reference(_)) => false, (Self::Reference(_), _) | (_, Self::Reference(_)) => false,
(Self::EnumVariant(v1, t1), Self::EnumVariant(v2, t2)) => { (Self::EnumVariant(v1, t1), Self::EnumVariant(v2, t2)) => {
*v1 == *v2 && t1.fits_in(&t2, info).is_empty() *v1 == *v2 && t1.fits_in(&t2, info).is_empty()
}, },
(Self::CustomType(a), Self::CustomType(b)) => *a == *b || info.custom_types[*a].fits_in(&info.custom_types[*b], info).is_empty(), (Self::CustomType(a), Self::CustomType(b)) => *a == *b /* || info.custom_types[*a].fits_in(&info.custom_types[*b], info).is_empty() */,
(Self::CustomType(a), b) => info.custom_types[*a].fits_in(&b.clone().to(), info).is_empty(), (Self::CustomType(a), b) => info.custom_types[*a].fits_in(&b.clone().to(), info).is_empty(),
(a, Self::CustomType(b)) => a.clone().to().fits_in(&info.custom_types[*b], info).is_empty(), (a, Self::CustomType(b)) => a.clone().to().fits_in(&info.custom_types[*b], info).is_empty(),
(Self::CustomTypeS(_), _) | (_, Self::CustomTypeS(_)) => unreachable!("CustomTypeS instead of CustomType - compiler bug?"), (Self::CustomTypeS(_), _) | (_, Self::CustomTypeS(_)) => unreachable!("CustomTypeS instead of CustomType - compiler bug?"),
@ -329,6 +331,15 @@ impl VSingleType {
(Self::Function(..), _) => false, (Self::Function(..), _) => false,
(Self::Thread(a), Self::Thread(b)) => a.fits_in(b, info).is_empty(), (Self::Thread(a), Self::Thread(b)) => a.fits_in(b, info).is_empty(),
(Self::Thread(..), _) => false, (Self::Thread(..), _) => false,
};
#[cfg(debug_assertions)]
eprintln!(" -> {}", o);
o
}
pub fn fits_in_type(&self, rhs: &VType, info: &GlobalScriptInfo) -> bool {
match self {
Self::CustomType(t) => rhs.types.iter().any(|rhs| if let Self::CustomType(rhs) = rhs { *t == *rhs } else { false }) || info.custom_types[*t].fits_in(rhs, info).is_empty(),
_ => rhs.types.iter().any(|t| self.fits_in(t, info)),
} }
} }
} }