language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-04 10:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into perf_or_type

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-09-15 12:49:18 +09:00
commit a0810adc9c
10 changed files with 73 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/erg_compiler/context/compare.rs
View file

@ -383,15 +383,24 @@ impl Context {
};
// () -> Never <: () -> Int <: () -> Object
// (Object) -> Int <: (Int) -> Int <: (Never) -> Int
// (Int, Int) -> Int <!: (Int) -> Int
// (Int, n := Int) -> Int <: (Int, Int) -> Int
// (Int, Int, n := Int) -> Int <!: (Int, n := Int) -> Int
// (Int, n := Int, m := Int) -> Int <: (Int, Int) -> Int
// (Int, n := Int) -> Int <!: (Int, Int, Int) -> Int
// (*Int) -> Int <: (Int, Int) -> Int
// (*Int) -> Int !<: (n := Int, m := Int) -> Int
// (self: Self, T) -> U <: T -> U
let len_judge = ls.non_default_params.len()
<= rs.non_default_params.len() + rs.default_params.len()
|| rs.var_params.is_some();
// && ls.default_params.len() <= rs.default_params.len();
let len_judge = (if rs.default_params.is_empty() {
ls.non_default_params.len() == rs.non_default_params.len()
} else {
ls.non_default_params.len() >= rs.non_default_params.len()
&& ls.non_default_params.len()
<= rs.non_default_params.len() + rs.default_params.len()
} && ls.default_params.len() <= rs.default_params.len())
|| (ls.default_params.is_empty() && rs.var_params.is_some())
|| (ls.non_default_params.is_empty() && rs.kw_var_params.is_some())
|| (rs.var_params.is_some() && rs.kw_var_params.is_some());
let rhs_ret = rs
.return_t
.clone()

12
crates/erg_compiler/context/eval.rs
View file

@ -1687,8 +1687,8 @@ impl Context {
lhs: TyParam,
rhs: TyParam,
) -> EvalResult<TyParam> {
let lhs = self.eval_tp(lhs).map_err(|(_, es)| es)?;
let rhs = self.eval_tp(rhs).map_err(|(_, es)| es)?;
// let lhs = self.eval_tp(lhs).map_err(|(_, es)| es)?;
// let rhs = self.eval_tp(rhs).map_err(|(_, es)| es)?;
match (lhs, rhs) {
(TyParam::Value(lhs), TyParam::Value(rhs)) => {
self.eval_bin(op, lhs, rhs).map(TyParam::value)
@ -1807,7 +1807,7 @@ impl Context {
/// val: may be unevaluated
pub(crate) fn eval_unary_tp(&self, op: OpKind, val: TyParam) -> EvalResult<TyParam> {
let val = self.eval_tp(val).map_err(|(_, es)| es)?;
// let val = self.eval_tp(val).map_err(|(_, es)| es)?;
match val {
TyParam::Value(c) => self.eval_unary_val(op, c).map(TyParam::Value),
TyParam::FreeVar(fv) if fv.is_linked() => {
@ -1824,9 +1824,9 @@ impl Context {
/// args: may be unevaluated
pub(crate) fn eval_app(&self, name: Str, args: Vec<TyParam>) -> Failable<TyParam> {
let args = self
.eval_type_args(args)
.map_err(|(args, es)| (TyParam::app(name.clone(), args), es))?;
/*let args = self
.eval_type_args(args)
.map_err(|(args, es)| (TyParam::app(name.clone(), args), es))?;*/
if let Ok(value_args) = args
.iter()
.map(|tp| self.convert_tp_into_value(tp.clone()))

19
crates/erg_compiler/context/instantiate_spec.rs
View file

@ -484,17 +484,14 @@ impl Context {
}
};
if let Some(decl_pt) = opt_decl_t {
if kind.is_var_params() {
let spec_t = unknown_len_list_t(spec_t.clone());
if let Err(es) = self.sub_unify(
decl_pt.typ(),
&spec_t,
&sig.t_spec.as_ref().ok_or(sig),
None,
) {
return Err((spec_t, errs.concat(es)));
}
} else if let Err(es) = self.sub_unify(
let spec_t = if kind.is_var_params() {
unknown_len_list_t(spec_t.clone())
} else if kind.is_kw_var_params() {
str_dict_t(spec_t.clone())
} else {
spec_t.clone()
};
if let Err(es) = self.sub_unify(
decl_pt.typ(),
&spec_t,
&sig.t_spec.as_ref().ok_or(sig),

2
crates/erg_compiler/context/register.rs
View file

@ -619,7 +619,7 @@ impl Context {
}
}
if let Some(kw_var_params) = &mut params.kw_var_params {
if let Some(pt) = &subr_t.var_params {
if let Some(pt) = &subr_t.kw_var_params {
let pt = pt.clone().map_type(&mut str_dict_t);
if let Err(es) = self.assign_param(
kw_var_params,