Python
/
pylyzer
mirror of https://github.com/mtshiba/pylyzer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: update deps & internal changes

This commit is contained in:
Shunsuke Shibayama 2023-07-07 01:19:28 +09:00
parent b1988b73b1
commit bbe3bc39ab
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -252,9 +252,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]] [[package]]
name = "els" name = "els"
version = "0.1.28-nightly.6" version = "0.1.28-nightly.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89d5f9be721f6c4eebbaed9252eed1ea80c6f1eb9d62d5381b8af3070f583170" checksum = "59e54b5527e4aae01813772f4e7eed9f8dbe6966c14fc2c3e10eddabfb7486a7"
dependencies = [ dependencies = [
"erg_common", "erg_common",
"erg_compiler", "erg_compiler",
@ -274,9 +274,9 @@ dependencies = [
[[package]] [[package]]
name = "erg_common" name = "erg_common"
version = "0.6.16-nightly.6" version = "0.6.16-nightly.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca973cb87fe95b78d16d7efcb600a7b806dd0f7746143eaf785358d08dec545b" checksum = "5c55887471b1c888138ea9aacc9ac06f03b90b5d2e12b5223df5e1e2e5b28512"
dependencies = [ dependencies = [
"backtrace-on-stack-overflow", "backtrace-on-stack-overflow",
"parking_lot", "parking_lot",
@ -285,9 +285,9 @@ dependencies = [
[[package]] [[package]]
name = "erg_compiler" name = "erg_compiler"
version = "0.6.16-nightly.6" version = "0.6.16-nightly.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a41c6ec328f24694a6ada250e5c9159576dde92c25f7a176db1c180b83f633d5" checksum = "a224d2547116ef86ca1943a24791e2533b331127db9701b5bc6aec0017ba1c7f"
dependencies = [ dependencies = [
"erg_common", "erg_common",
"erg_parser", "erg_parser",
@ -295,9 +295,9 @@ dependencies = [
[[package]] [[package]]
name = "erg_parser" name = "erg_parser"
version = "0.6.16-nightly.6" version = "0.6.16-nightly.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb5e83ccfe4f35712f8759d29b980e78800801f3847fcbe4d7ef12968e7c856c" checksum = "42d1db8387f29098b956d02f840913abb1230cda6732c07c2c1bb891bea5671b"
dependencies = [ dependencies = [
"erg_common", "erg_common",
"unicode-xid 0.2.4", "unicode-xid 0.2.4",

6
Cargo.toml
View File

@ -22,9 +22,9 @@ edition = "2021"
repository = "https://github.com/mtshiba/pylyzer" repository = "https://github.com/mtshiba/pylyzer"
[workspace.dependencies] [workspace.dependencies]
erg_common = { version = "0.6.16-nightly.6", features = ["py_compat", "els"] } erg_common = { version = "0.6.16-nightly.7", features = ["py_compat", "els"] }
erg_compiler = { version = "0.6.16-nightly.6", features = ["py_compat", "els"] } erg_compiler = { version = "0.6.16-nightly.7", features = ["py_compat", "els"] }
els = { version = "0.1.28-nightly.6", features = ["py_compat"] } els = { version = "0.1.28-nightly.7", features = ["py_compat"] }
rustpython-parser = "0.1.2" rustpython-parser = "0.1.2"
# erg_compiler = { git = "https://github.com/erg-lang/erg", branch = "main", features = ["py_compat", "els"] } # erg_compiler = { git = "https://github.com/erg-lang/erg", branch = "main", features = ["py_compat", "els"] }
# erg_common = { git = "https://github.com/erg-lang/erg", branch = "main", features = ["py_compat", "els"] } # erg_common = { git = "https://github.com/erg-lang/erg", branch = "main", features = ["py_compat", "els"] }

9
crates/py2erg/gen_decl.rs
View File

@ -3,6 +3,7 @@ use std::io::{BufWriter, Write};
use erg_common::io::Input; use erg_common::io::Input;
use erg_common::log; use erg_common::log;
use erg_common::traits::LimitedDisplay;
use erg_compiler::context::register::{CheckStatus, PylyzerStatus}; use erg_compiler::context::register::{CheckStatus, PylyzerStatus};
use erg_compiler::hir::{Expr, HIR}; use erg_compiler::hir::{Expr, HIR};
use erg_compiler::ty::value::{GenTypeObj, TypeObj}; use erg_compiler::ty::value::{GenTypeObj, TypeObj};
@ -68,7 +69,7 @@ impl DeclFileGenerator {
.replace('\0', "") .replace('\0', "")
.replace('%', "___"); .replace('%', "___");
let ref_t = def.sig.ident().ref_t(); let ref_t = def.sig.ident().ref_t();
let typ = ref_t.replace_failure().to_string(); let typ = ref_t.replace_failure().to_string_unabbreviated();
let typ = escape_type(typ); let typ = escape_type(typ);
// Erg can automatically import nested modules // Erg can automatically import nested modules
// `import http.client` => `http = pyimport "http"` // `import http.client` => `http = pyimport "http"`
@ -97,7 +98,7 @@ impl DeclFileGenerator {
self.code += &decl; self.code += &decl;
self.code.push('\n'); self.code.push('\n');
if let GenTypeObj::Subclass(class) = &def.obj { if let GenTypeObj::Subclass(class) = &def.obj {
let sup = class.sup.as_ref().typ().to_string(); let sup = class.sup.as_ref().typ().to_string_unabbreviated();
let sup = escape_type(sup); let sup = escape_type(sup);
let decl = format!(".{class_name} <: {sup}\n"); let decl = format!(".{class_name} <: {sup}\n");
self.code += &decl; self.code += &decl;
@ -108,7 +109,7 @@ impl DeclFileGenerator {
}) = def.obj.base_or_sup() }) = def.obj.base_or_sup()
{ {
for (attr, t) in rec.iter() { for (attr, t) in rec.iter() {
let typ = escape_type(t.to_string()); let typ = escape_type(t.to_string_unabbreviated());
let decl = format!("{}.{}: {typ}\n", self.namespace, attr.symbol); let decl = format!("{}.{}: {typ}\n", self.namespace, attr.symbol);
self.code += &decl; self.code += &decl;
} }
@ -119,7 +120,7 @@ impl DeclFileGenerator {
}) = def.obj.additional() }) = def.obj.additional()
{ {
for (attr, t) in rec.iter() { for (attr, t) in rec.iter() {
let typ = escape_type(t.to_string()); let typ = escape_type(t.to_string_unabbreviated());
let decl = format!("{}.{}: {typ}\n", self.namespace, attr.symbol); let decl = format!("{}.{}: {typ}\n", self.namespace, attr.symbol);
self.code += &decl; self.code += &decl;
} }