mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2026-03-04 08:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Type no longer implements MersType

Browse Source
This commit is contained in:
Mark
2024-04-16 13:38:50 +02:00
parent 4fc9441bd5
commit 2742112b09
33 changed files with 109 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mers_lib/src/data/bool.rs
View File

@@ -36,7 +36,7 @@ impl MersType for BoolT {
fn is_same_type_as(&self, other: &dyn MersType) -> bool {
other.as_any().downcast_ref::<Self>().is_some()
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
self.is_same_type_as(target)
}
fn subtypes(&self, acc: &mut Type) {

2
mers_lib/src/data/byte.rs
View File

@@ -36,7 +36,7 @@ impl MersType for ByteT {
fn is_same_type_as(&self, other: &dyn MersType) -> bool {
other.as_any().downcast_ref::<Self>().is_some()
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
self.is_same_type_as(target)
}
fn subtypes(&self, acc: &mut Type) {

2
mers_lib/src/data/float.rs
View File

@@ -36,7 +36,7 @@ impl MersType for FloatT {
fn is_same_type_as(&self, other: &dyn MersType) -> bool {
other.as_any().downcast_ref::<Self>().is_some()
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
self.is_same_type_as(target)
}
fn subtypes(&self, acc: &mut Type) {

4
mers_lib/src/data/function.rs
View File

@@ -121,7 +121,7 @@ impl MersType for FunctionT {
if t.0.len() > 1 {
return None;
} else if let Some(t) = t.0.first() {
out.add(Arc::new(t.clone()))
out.add_all(&t);
}
} else {
return None;
@@ -153,7 +153,7 @@ impl MersType for FunctionT {
false
}
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
if let Some(target) = target.as_any().downcast_ref::<Self>() {
if let Err(s) = &target.0 {
s.iter()

2
mers_lib/src/data/int.rs
View File

@@ -36,7 +36,7 @@ impl MersType for IntT {
fn is_same_type_as(&self, other: &dyn MersType) -> bool {
other.as_any().downcast_ref::<Self>().is_some()
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
self.is_same_type_as(target)
}
fn subtypes(&self, acc: &mut Type) {

54
mers_lib/src/data/mod.rs
View File

@@ -50,17 +50,7 @@ pub trait MersType: Any + Debug + Display + Send + Sync {
/// this *must* return false.
fn is_same_type_as(&self, other: &dyn MersType) -> bool;
/// This doesn't handle the case where target is Type (is_included_in handles it)
fn is_included_in_single(&self, target: &dyn MersType) -> bool;
fn is_included_in(&self, target: &dyn MersType) -> bool {
if let Some(target) = target.as_any().downcast_ref::<Type>() {
target
.types
.iter()
.any(|t| self.is_included_in_single(t.as_ref()))
} else {
self.is_included_in_single(target)
}
}
fn is_included_in(&self, target: &dyn MersType) -> bool;
/// Returns all types that can result from the use of this type.
/// Usually, this is just `acc.add(Arc::new(self.clone()))`
/// but if there exists one or more inner types, this becomes interesting:
@@ -268,7 +258,7 @@ impl Type {
.filter(|v| v.0.len() == 1)
.and_then(|v| v.0.get(0))
{
o.add(Arc::new(t.clone()));
o.add_all(&t);
} else {
return None;
}
@@ -287,7 +277,7 @@ impl Type {
.and_then(|v| v.0.get(0))
{
nothing = false;
o.add(Arc::new(t.clone()));
o.add_all(&t);
}
}
if nothing {
@@ -315,7 +305,7 @@ impl Type {
let mut o = Self::empty();
for t in &self.types {
if let Some(t) = t.is_reference_to() {
o.add(Arc::new(t.clone()));
o.add_all(&t);
} else {
return None;
}
@@ -334,47 +324,45 @@ impl Type {
// then repeat with the second type if possible (here not, but for longer tuples, probably?)
// merge the last existing type in all the collections until we reach the first type again or the last types aren't equal anymore (how to check????)
impl MersType for Type {
fn is_same_type_as(&self, other: &dyn MersType) -> bool {
impl Type {
pub fn is_same_type_as(&self, other: &Self) -> bool {
// TODO! improve
self.is_included_in(other) && other.is_included_in(self)
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
self.types.iter().all(|t| t.is_included_in_single(target))
pub fn is_included_in(&self, target: &Self) -> bool {
self.types
.iter()
.all(|s| target.types.iter().any(|t| s.is_included_in(&**t)))
}
fn is_included_in(&self, target: &dyn MersType) -> bool {
self.types.iter().all(|t| t.is_included_in(target))
pub fn is_included_in_single(&self, target: &dyn MersType) -> bool {
self.types.iter().all(|s| s.is_included_in(target))
}
fn subtypes(&self, acc: &mut Type) {
pub fn subtypes(&self, acc: &mut Type) {
for t in &self.types {
t.subtypes(acc);
}
}
fn as_any(&self) -> &dyn Any {
self
pub fn subtypes_type(&self) -> Type {
let mut acc = Type::empty();
self.subtypes(&mut acc);
acc
}
fn mut_any(&mut self) -> &mut dyn Any {
self
}
fn to_any(self) -> Box<dyn Any> {
Box::new(self)
}
fn iterable(&self) -> Option<Type> {
pub fn iterable(&self) -> Option<Type> {
let mut o = Self::empty();
for t in self.types.iter() {
if let Some(t) = t.iterable() {
o.add(Arc::new(t));
o.add_all(&t);
} else {
return None;
}
}
Some(o)
}
fn get(&self) -> Option<Type> {
pub fn get(&self) -> Option<Type> {
let mut o = Self::empty();
for t in self.types.iter() {
if let Some(t) = t.get() {
o.add(Arc::new(t));
o.add_all(&t);
} else {
return None;
}

2
mers_lib/src/data/object.rs
View File

@@ -48,7 +48,7 @@ impl MersType for ObjectT {
.all(|((s1, t1), (s2, t2))| s1 == s2 && t1.is_same_type_as(t2))
})
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
target
.as_any()
.downcast_ref::<Self>()

2
mers_lib/src/data/reference.rs
View File

@@ -44,7 +44,7 @@ impl MersType for ReferenceT {
false
}
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
// &int isn't included in &(int/float), otherwise we could assign a float to it
self.is_same_type_as(target)
}

2
mers_lib/src/data/string.rs
View File

@@ -36,7 +36,7 @@ impl MersType for StringT {
fn is_same_type_as(&self, other: &dyn MersType) -> bool {
other.as_any().downcast_ref::<Self>().is_some()
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
self.is_same_type_as(target)
}
fn subtypes(&self, acc: &mut Type) {

4
mers_lib/src/data/tuple.rs
View File

@@ -48,7 +48,7 @@ impl MersType for TupleT {
fn iterable(&self) -> Option<Type> {
let mut o = Type::empty();
for t in self.0.iter() {
o.add(Arc::new(t.clone()));
o.add_all(&t);
}
Some(o)
}
@@ -64,7 +64,7 @@ impl MersType for TupleT {
false
}
}
fn is_included_in_single(&self, target: &dyn MersType) -> bool {
fn is_included_in(&self, target: &dyn MersType) -> bool {
if let Some(target) = target.as_any().downcast_ref::<Self>() {
self.0.len() == target.0.len()
&& self