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

fix: bugs with enumeration of vars

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-03-06 19:44:49 +09:00
parent b1a9f7bf40
commit fa2919e824
15 changed files with 107 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,20 +85,8 @@ impl Context {
Visibility::BUILTIN_PUBLIC,
ValueObj::Float(2.220446049250313e-16),
);
float.register_builtin_py_impl(
REAL,
Float,
Const,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_REAL),
);
float.register_builtin_py_impl(
IMAG,
Float,
Const,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_IMAG),
);
float.register_builtin_py_impl(REAL, Float, Const, Visibility::BUILTIN_PUBLIC, Some(REAL));
float.register_builtin_py_impl(IMAG, Float, Const, Visibility::BUILTIN_PUBLIC, Some(IMAG));
float.register_py_builtin(
FUNC_AS_INTEGER_RATIO,
fn0_met(Float, tuple_t(vec![Int, Int])),
@ -124,6 +112,10 @@ impl Context {
Some(FUNC_FROMHEX),
53,
);
float.register_py_builtin(OP_GT, fn1_met(Float, Float, Bool), Some(OP_GT), 0);
float.register_py_builtin(OP_GE, fn1_met(Float, Float, Bool), Some(OP_GE), 0);
float.register_py_builtin(OP_LT, fn1_met(Float, Float, Bool), Some(OP_LT), 0);
float.register_py_builtin(OP_LE, fn1_met(Float, Float, Bool), Some(OP_LE), 0);
float.register_marker_trait(mono(NUM));
float.register_marker_trait(mono(ORD));
let mut float_ord = Self::builtin_methods(Some(mono(ORD)), 2);
@ -250,20 +242,8 @@ impl Context {
// TODO: Int, Nat, Boolの継承元をRatioにする(今はFloat)
let mut ratio = Self::builtin_mono_class(RATIO, 2);
ratio.register_superclass(Obj, &obj);
ratio.register_builtin_py_impl(
REAL,
Ratio,
Const,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_REAL),
);
ratio.register_builtin_py_impl(
IMAG,
Ratio,
Const,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_IMAG),
);
ratio.register_builtin_py_impl(REAL, Ratio, Const, Visibility::BUILTIN_PUBLIC, Some(REAL));
ratio.register_builtin_py_impl(IMAG, Ratio, Const, Visibility::BUILTIN_PUBLIC, Some(IMAG));
ratio.register_marker_trait(mono(NUM));
ratio.register_marker_trait(mono(ORD));
let mut ratio_ord = Self::builtin_methods(Some(mono(ORD)), 2);
@ -513,20 +493,8 @@ impl Context {
Some(FUNDAMENTAL_STR),
);
int.register_trait(Int, int_show);
int.register_builtin_py_impl(
REAL,
Int,
Const,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_REAL),
);
int.register_builtin_py_impl(
IMAG,
Int,
Const,
Visibility::BUILTIN_PUBLIC,
Some(FUNC_IMAG),
);
int.register_builtin_py_impl(REAL, Int, Const, Visibility::BUILTIN_PUBLIC, Some(REAL));
int.register_builtin_py_impl(IMAG, Int, Const, Visibility::BUILTIN_PUBLIC, Some(IMAG));
/* Nat */
let mut nat = Self::builtin_mono_class(NAT, 10);

6
crates/erg_compiler/context/initialize/mod.rs
View file

@ -100,10 +100,8 @@ const BYTES: &str = "Bytes";
const FLOAT: &str = "Float";
const MUT_FLOAT: &str = "Float!";
const EPSILON: &str = "EPSILON";
const REAL: &str = "Real";
const FUNC_REAL: &str = "real";
const IMAG: &str = "Imag";
const FUNC_IMAG: &str = "imag";
const REAL: &str = "real";
const IMAG: &str = "imag";
const FUNC_AS_INTEGER_RATIO: &str = "as_integer_ratio";
const FUNC_CONJUGATE: &str = "conjugate";
const FUNC_IS_INTEGER: &str = "is_integer";