mirror of
https://github.com/erg-lang/erg.git
synced 2025-09-28 12:14:43 +00:00
fix: dynamic container type check
This commit is contained in:
parent
bfa429a347
commit
f157673c59
8 changed files with 94 additions and 10 deletions
|
@ -53,7 +53,7 @@ class Array(list):
|
|||
|
||||
def type_check(self, t: type) -> bool:
|
||||
if isinstance(t, list):
|
||||
if len(t) != len(self):
|
||||
if len(t) < len(self):
|
||||
return False
|
||||
for (inner_t, elem) in zip(t, self):
|
||||
if not contains_operator(inner_t, elem):
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
from _erg_result import is_ok
|
||||
from _erg_range import Range
|
||||
from _erg_type import is_type, isinstance
|
||||
|
||||
from collections import namedtuple
|
||||
|
||||
|
@ -8,7 +9,7 @@ def contains_operator(y, elem) -> bool:
|
|||
if hasattr(elem, "type_check"):
|
||||
return elem.type_check(y)
|
||||
# 1 in Int
|
||||
elif type(y) == type:
|
||||
elif is_type(y):
|
||||
if isinstance(elem, y):
|
||||
return True
|
||||
elif hasattr(y, "try_new") and is_ok(y.try_new(elem)):
|
||||
|
@ -17,26 +18,33 @@ def contains_operator(y, elem) -> bool:
|
|||
return False
|
||||
# [1] in [Int]
|
||||
elif isinstance(y, list) and isinstance(elem, list) and (
|
||||
type(y[0]) == type or isinstance(y[0], Range)
|
||||
len(y) == 0 or is_type(y[0]) or isinstance(y[0], Range)
|
||||
):
|
||||
# FIXME:
|
||||
type_check = contains_operator(y[0], elem[0])
|
||||
len_check = len(elem) == len(y)
|
||||
type_check = all(map(lambda x: contains_operator(x[0], x[1]), zip(y, elem)))
|
||||
len_check = len(elem) <= len(y)
|
||||
return type_check and len_check
|
||||
# (1, 2) in (Int, Int)
|
||||
elif isinstance(y, tuple) and isinstance(elem, tuple) and (
|
||||
type(y[0]) == type or isinstance(y[0], Range)
|
||||
len(y) == 0 or is_type(y[0]) or isinstance(y[0], Range)
|
||||
):
|
||||
if not hasattr(elem, "__iter__"):
|
||||
return False
|
||||
type_check = all(map(lambda x: contains_operator(x[0], x[1]), zip(y, elem)))
|
||||
len_check = len(elem) == len(y)
|
||||
len_check = len(elem) <= len(y)
|
||||
return type_check and len_check
|
||||
# {1: 2} in {Int: Int}
|
||||
elif isinstance(y, dict) and isinstance(elem, dict) and isinstance(next(iter(y.keys())), type):
|
||||
elif isinstance(y, dict) and isinstance(elem, dict) and (
|
||||
len(y) == 0 or is_type(next(iter(y.keys())))
|
||||
):
|
||||
if len(y) == 1:
|
||||
key = next(iter(y.keys()))
|
||||
key_check = all([contains_operator(key, el) for el in elem.keys()])
|
||||
value = next(iter(y.values()))
|
||||
value_check = all([contains_operator(value, el) for el in elem.values()])
|
||||
return key_check and value_check
|
||||
# TODO:
|
||||
type_check = True # contains_operator(next(iter(y.keys())), x[next(iter(x.keys()))])
|
||||
len_check = len(elem) >= len(y)
|
||||
len_check = True # It can be True even if either elem or y has the larger number of elems
|
||||
return type_check and len_check
|
||||
elif isinstance(elem, list):
|
||||
from _erg_array import Array
|
||||
|
|
21
crates/erg_compiler/lib/std/_erg_type.py
Normal file
21
crates/erg_compiler/lib/std/_erg_type.py
Normal file
|
@ -0,0 +1,21 @@
|
|||
from typing import _GenericAlias, Union
|
||||
try:
|
||||
from types import UnionType
|
||||
except ImportError:
|
||||
class UnionType:
|
||||
__args__: list # list[type]
|
||||
def __init__(self, *args):
|
||||
self.__args__ = args
|
||||
|
||||
def is_type(x) -> bool:
|
||||
return isinstance(x, type) or \
|
||||
isinstance(x, _GenericAlias) or \
|
||||
isinstance(x, UnionType)
|
||||
|
||||
instanceof = isinstance
|
||||
# The behavior of `builtins.isinstance` depends on the Python version.
|
||||
def isinstance(obj, classinfo) -> bool:
|
||||
if instanceof(classinfo, _GenericAlias) and classinfo.__origin__ == Union:
|
||||
return any(instanceof(obj, t) for t in classinfo.__args__)
|
||||
else:
|
||||
return instanceof(obj, classinfo)
|
Loading…
Add table
Add a link
Reference in a new issue