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

bugfix for builtin functions using 3-tuples

Browse Source
This commit is contained in:
Mark 2024-10-11 23:42:14 +02:00
parent 786d72660f
commit d83f6f942f
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mers/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "mers"
version = "0.9.8"
version = "0.9.9"
edition = "2021"
license = "MIT OR Apache-2.0"
description = "dynamically typed but type-checked programming language"
@ -15,7 +15,7 @@ default = ["colored-output"]
colored-output = ["mers_lib/ecolor-term", "mers_lib/pretty-print", "dep:colored"]
[dependencies]
mers_lib = "0.9.8"
mers_lib = "0.9.9"
# mers_lib = { path = "../mers_lib" }
clap = { version = "4.3.19", features = ["derive"] }
colored = { version = "2.1.0", optional = true }

2
mers_lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "mers_lib"
version = "0.9.8"
version = "0.9.9"
edition = "2021"
license = "MIT OR Apache-2.0"
description = "library to use the mers language in other projects"

13
mers_lib/src/program/configs/gen/function.rs
View File

@ -1,4 +1,4 @@
use std::{marker::PhantomData, sync::Arc};
use std::marker::PhantomData;
use crate::{
data::{self, Data, MersData, Type},
@ -59,10 +59,13 @@ pub trait StaticMersFunc: Sized + 'static + Send + Sync {
None => Err(CheckError::from(format!(
"unexpected argument of type {}, expected {}",
a.get().as_type().with_info(i),
Type::new(data::function::FunctionT(
Err(Arc::new(Self::types())),
crate::info::Info::neverused()
))
{
let mut o = Type::empty();
for t in Self::types() {
o.add_all(&t.0);
}
o
}
.with_info(i)
))),
}

2
mers_lib/src/program/configs/gen/mod.rs
View File

@ -288,7 +288,7 @@ impl<A: FromMersData, B: FromMersData, C: FromMersData> FromMersData for (A, B,
if let Some(v) = d
.as_any()
.downcast_ref::<data::tuple::Tuple>()
.filter(|v| v.0.len() == 2)
.filter(|v| v.0.len() == 3)
{
A::try_represent(v.0[0].get().as_ref(), |v1| {
if let Some(va) = v1 {