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 tuple reversing type order when initializing

Browse Source 
and try's error message now starts counting at Function #1 instead of #0.
This commit is contained in:
Mark 2023-10-24 20:04:14 +02:00
parent 5e20f92849
commit fd2a3382fc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mers_lib/src/program/configs/with_base.rs
View File

@ -75,7 +75,7 @@ impl Config {
for (i, err) in func_errors.into_iter().enumerate() { for (i, err) in func_errors.into_iter().enumerate() {
if let Some(err) = err { if let Some(err) = err {
e = e e = e
.msg(format!("Error for function #{i}:")) .msg(format!("Error for function #{}:", i + 1))
.err(err); .err(err);
} }
} }

6
mers_lib/src/program/run/tuple.rs
View File

@ -1,4 +1,4 @@
use std::sync::Arc; use std::{collections::VecDeque, sync::Arc};
use colored::Colorize; use colored::Colorize;
@ -20,7 +20,7 @@ impl MersStatement for Tuple {
let mut it = if let Some(init_to) = init_to { let mut it = if let Some(init_to) = init_to {
let mut vec = (0..self.elems.len()) let mut vec = (0..self.elems.len())
.map(|_| Type::empty()) .map(|_| Type::empty())
.collect::<Vec<_>>(); .collect::<VecDeque<_>>();
for t in init_to.types.iter() { for t in init_to.types.iter() {
if let Some(t) = t.as_any().downcast_ref::<TupleT>() { if let Some(t) = t.as_any().downcast_ref::<TupleT>() {
if t.0.len() == self.elems.len() { if t.0.len() == self.elems.len() {
@ -46,7 +46,7 @@ impl MersStatement for Tuple {
v.check( v.check(
info, info,
if let Some(it) = &mut it { if let Some(it) = &mut it {
Some(it.pop().unwrap()) Some(it.pop_front().unwrap())
} else { } else {
None None
} }