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

feat: enhance HomogenousTuple

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-12-22 15:37:23 +09:00
parent 35baaa4031
commit 2d94bfce4f
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/erg_compiler/context/initialize/classes.rs
View file

@ -2890,10 +2890,20 @@ impl Context {
homo_tuple homo_tuple
.register_trait(self, poly(OUTPUT, vec![ty_tp(T.clone())])) .register_trait(self, poly(OUTPUT, vec![ty_tp(T.clone())]))
.unwrap(); .unwrap();
let homo_tuple_t = poly(HOMOGENOUS_TUPLE, vec![ty_tp(T.clone())]); let homo_tup_t = poly(HOMOGENOUS_TUPLE, vec![ty_tp(T.clone())]);
let mut homo_tuple_mul = Self::builtin_methods(Some(poly(MUL, vec![ty_tp(Nat)])), 2);
let t = fn1_met(homo_tup_t.clone(), Nat, homo_tup_t.clone()).quantify();
homo_tuple_mul.register_builtin_erg_impl(OP_MUL, t, Immutable, Visibility::BUILTIN_PUBLIC);
homo_tuple_mul.register_builtin_const(
OUTPUT,
Visibility::BUILTIN_PUBLIC,
None,
ValueObj::builtin_class(homo_tup_t.clone()),
);
homo_tuple.register_trait_methods(homo_tup_t.clone(), homo_tuple_mul);
// __getitem__: (self: HomogenousTuple(T), Nat) -> T // __getitem__: (self: HomogenousTuple(T), Nat) -> T
let idx_t = if PYTHON_MODE { Int } else { Nat }; let idx_t = if PYTHON_MODE { Int | mono(SLICE) } else { Nat };
let tuple_getitem_t = fn1_met(homo_tuple_t.clone(), idx_t, T.clone()).quantify(); let tuple_getitem_t = fn1_met(homo_tup_t.clone(), idx_t, T.clone()).quantify();
homo_tuple.register_builtin_py_impl( homo_tuple.register_builtin_py_impl(
FUNDAMENTAL_GETITEM, FUNDAMENTAL_GETITEM,
tuple_getitem_t, tuple_getitem_t,
@ -2905,7 +2915,7 @@ impl Context {
Self::builtin_methods(Some(poly(SEQUENCE, vec![ty_tp(T.clone())])), 4); Self::builtin_methods(Some(poly(SEQUENCE, vec![ty_tp(T.clone())])), 4);
homo_tuple_seq.register_builtin_erg_impl( homo_tuple_seq.register_builtin_erg_impl(
FUNDAMENTAL_CONTAINS, FUNDAMENTAL_CONTAINS,
fn1_met(homo_tuple_t.clone(), T.clone(), Bool).quantify(), fn1_met(homo_tup_t.clone(), T.clone(), Bool).quantify(),
Const, Const,
Visibility::BUILTIN_PUBLIC, Visibility::BUILTIN_PUBLIC,
); );
@ -2924,7 +2934,7 @@ impl Context {
None, None,
ValueObj::builtin_class(tuple_iter), ValueObj::builtin_class(tuple_iter),
); );
homo_tuple.register_trait_methods(homo_tuple_t.clone(), homo_tuple_seq); homo_tuple.register_trait_methods(homo_tup_t.clone(), homo_tuple_seq);
homo_tuple homo_tuple
.register_trait(self, poly(SEQUENCE, vec![ty_tp(T.clone())])) .register_trait(self, poly(SEQUENCE, vec![ty_tp(T.clone())]))
.unwrap(); .unwrap();
@ -3006,8 +3016,9 @@ impl Context {
let Slf = mono_q(SELF, subtypeof(mono(GENERIC_NAMED_TUPLE))); let Slf = mono_q(SELF, subtypeof(mono(GENERIC_NAMED_TUPLE)));
let input_t = tp_enum(Nat, set! {N.clone()}); let input_t = tp_enum(Nat, set! {N.clone()});
let return_t = proj_call(ty_tp(Slf.clone()), FUNDAMENTAL_GETITEM, vec![N.clone()]); let return_t = proj_call(ty_tp(Slf.clone()), FUNDAMENTAL_GETITEM, vec![N.clone()]);
let named_tuple_getitem = let named_tuple_getitem = fn1_met(Slf.clone(), input_t.clone(), return_t.clone()).quantify()
fn1_met(Slf.clone(), input_t.clone(), return_t.clone()).quantify(); // TODO:
& fn1_met(Slf.clone(), slice_t.clone(), homo_tuple_t(Obj)).quantify();
let mut named_tuple_indexable = Self::builtin_methods( let mut named_tuple_indexable = Self::builtin_methods(
Some(poly(INDEXABLE, vec![ty_tp(input_t), ty_tp(return_t)])), Some(poly(INDEXABLE, vec![ty_tp(input_t), ty_tp(return_t)])),
2, 2,
@ -3080,13 +3091,7 @@ impl Context {
Const, Const,
Some(FUNC_TUPLE), Some(FUNC_TUPLE),
); );
self.register_builtin_type( self.register_builtin_type(homo_tup_t, homo_tuple, vis.clone(), Const, Some(FUNC_TUPLE));
homo_tuple_t,
homo_tuple,
vis.clone(),
Const,
Some(FUNC_TUPLE),
);
self.register_builtin_type(_tuple_t, tuple_, vis.clone(), Const, Some(FUNC_TUPLE)); self.register_builtin_type(_tuple_t, tuple_, vis.clone(), Const, Some(FUNC_TUPLE));
/* Or (true or type) */ /* Or (true or type) */
let or_t = poly(OR, vec![ty_tp(L), ty_tp(R)]); let or_t = poly(OR, vec![ty_tp(L), ty_tp(R)]);

2
crates/erg_compiler/lib/pystd/sys.d.er
View file

@ -60,7 +60,7 @@ io = pyimport "io"
.seed_bits = Nat; .seed_bits = Nat;
.cutoff = Int; .cutoff = Int;
} }
.hex_version: Nat .hexversion: Nat
.int_info: NamedTuple { .int_info: NamedTuple {
.bits_per_digit = Nat; .bits_per_digit = Nat;
.sizeof_digit = Nat; .sizeof_digit = Nat;