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

Update transpile.rs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-08-24 19:10:25 +09:00
parent 0c43323508
commit 2035824b58
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/erg_compiler/transpile.rs
View file

@ -313,7 +313,7 @@ pub struct PyScriptGenerator {
fresh_var_n: usize, fresh_var_n: usize,
namedtuple_loaded: bool, namedtuple_loaded: bool,
mutate_op_loaded: bool, mutate_op_loaded: bool,
in_op_loaded: bool, contains_op_loaded: bool,
range_ops_loaded: bool, range_ops_loaded: bool,
builtin_types_loaded: bool, builtin_types_loaded: bool,
builtin_control_loaded: bool, builtin_control_loaded: bool,
@ -328,7 +328,7 @@ impl PyScriptGenerator {
fresh_var_n: 0, fresh_var_n: 0,
namedtuple_loaded: false, namedtuple_loaded: false,
mutate_op_loaded: false, mutate_op_loaded: false,
in_op_loaded: false, contains_op_loaded: false,
range_ops_loaded: false, range_ops_loaded: false,
builtin_types_loaded: false, builtin_types_loaded: false,
builtin_control_loaded: false, builtin_control_loaded: false,
@ -367,6 +367,7 @@ impl PyScriptGenerator {
.replace("from _erg_result import Error", "") .replace("from _erg_result import Error", "")
.replace("from _erg_result import is_ok", "") .replace("from _erg_result import is_ok", "")
.replace("from _erg_control import then__", "") .replace("from _erg_control import then__", "")
.replace("from _erg_contains_operator import contains_operator", "")
} }
fn load_namedtuple_if_not(&mut self) { fn load_namedtuple_if_not(&mut self) {
@ -389,12 +390,12 @@ impl PyScriptGenerator {
} }
fn load_contains_op_if_not(&mut self) { fn load_contains_op_if_not(&mut self) {
if !self.in_op_loaded { if !self.contains_op_loaded {
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_result.py")); self.prelude += &Self::replace_import(include_str!("lib/std/_erg_result.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_range.py")); self.prelude += &Self::replace_import(include_str!("lib/std/_erg_range.py"));
self.prelude += self.prelude +=
&Self::replace_import(include_str!("lib/std/_erg_contains_operator.py")); &Self::replace_import(include_str!("lib/std/_erg_contains_operator.py"));
self.in_op_loaded = true; self.contains_op_loaded = true;
} }
} }
@ -408,18 +409,11 @@ impl PyScriptGenerator {
fn load_builtin_types_if_not(&mut self) { fn load_builtin_types_if_not(&mut self) {
if !self.builtin_types_loaded { if !self.builtin_types_loaded {
self.load_builtin_controls_if_not(); self.load_builtin_controls_if_not();
self.load_contains_op_if_not();
if self.range_ops_loaded { if self.range_ops_loaded {
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_float.py")); self.prelude += &Self::replace_import(include_str!("lib/std/_erg_float.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_array.py")); self.prelude += &Self::replace_import(include_str!("lib/std/_erg_array.py"));
} else if self.in_op_loaded {
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_int.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_nat.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_bool.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_str.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_float.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_array.py"));
} else { } else {
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_result.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_int.py")); self.prelude += &Self::replace_import(include_str!("lib/std/_erg_int.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_nat.py")); self.prelude += &Self::replace_import(include_str!("lib/std/_erg_nat.py"));
self.prelude += &Self::replace_import(include_str!("lib/std/_erg_bool.py")); self.prelude += &Self::replace_import(include_str!("lib/std/_erg_bool.py"));
@ -461,11 +455,12 @@ impl PyScriptGenerator {
Expr::UnaryOp(unary) => self.transpile_unaryop(unary), Expr::UnaryOp(unary) => self.transpile_unaryop(unary),
Expr::Array(array) => match array { Expr::Array(array) => match array {
Array::Normal(arr) => { Array::Normal(arr) => {
let mut code = "[".to_string(); self.load_builtin_types_if_not();
let mut code = "Array([".to_string();
for elem in arr.elems.pos_args { for elem in arr.elems.pos_args {
code += &format!("{},", self.transpile_expr(elem.expr)); code += &format!("{},", self.transpile_expr(elem.expr));
} }
code += "]"; code += "])";
code code
} }
other => todo!("transpiling {other}"), other => todo!("transpiling {other}"),