fix: import resolution bug

This commit is contained in:
Shunsuke Shibayama 2024-12-07 22:23:25 +09:00
parent 4c57e6ead7
commit a24164bbee
5 changed files with 27 additions and 15 deletions

22
Cargo.lock generated
View File

@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 4
[[package]] [[package]]
name = "addr2line" name = "addr2line"
@ -150,9 +150,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]] [[package]]
name = "els" name = "els"
version = "0.1.61-nightly.0" version = "0.1.61-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "244a1a121d8ab0ab571e829c2527a8be32593a7b4f41a43d49a67ddb65aa6aa1" checksum = "5b705181f9b147925f775655b5aea6b0c88ad54269c53f411304fc087892b9c5"
dependencies = [ dependencies = [
"erg_common", "erg_common",
"erg_compiler", "erg_compiler",
@ -166,9 +166,9 @@ dependencies = [
[[package]] [[package]]
name = "erg_common" name = "erg_common"
version = "0.6.49-nightly.0" version = "0.6.49-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d60194637dad5c998f15dc910df97c55ee7f777a460e177170f71fd47f668182" checksum = "6d1568d2f4c9b8ea39874c331400d3a6412d00bd6991a93fa221502946ff9705"
dependencies = [ dependencies = [
"backtrace-on-stack-overflow", "backtrace-on-stack-overflow",
"erg_proc_macros", "erg_proc_macros",
@ -179,9 +179,9 @@ dependencies = [
[[package]] [[package]]
name = "erg_compiler" name = "erg_compiler"
version = "0.6.49-nightly.0" version = "0.6.49-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5b028e94363b80c4d9ed7ae7bd46b11afba31f32c5fbf52a9978f9a3db501a2" checksum = "faa06833a44ba70f90441adfb278604a8fd425e3266482c61907099b9323480b"
dependencies = [ dependencies = [
"erg_common", "erg_common",
"erg_parser", "erg_parser",
@ -189,9 +189,9 @@ dependencies = [
[[package]] [[package]]
name = "erg_parser" name = "erg_parser"
version = "0.6.49-nightly.0" version = "0.6.49-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb479b79c0276dd57cbaa3143e11bce95043d620ad3783f29e144b6a84671000" checksum = "9c544aa6070b30e73b0acef20d41a731ae1839346ae6967993e68bd7d6001d85"
dependencies = [ dependencies = [
"erg_common", "erg_common",
"erg_proc_macros", "erg_proc_macros",
@ -200,9 +200,9 @@ dependencies = [
[[package]] [[package]]
name = "erg_proc_macros" name = "erg_proc_macros"
version = "0.6.49-nightly.0" version = "0.6.49-nightly.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5acc0616d02c541916ae426268da2d92877a894fbb94ce10dfe9dd5ce0898b9e" checksum = "d7472e453f644bd4cfd93b8f6258dd7a8c8aa89f08d40db27c2a060dd423d86d"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",

View File

@ -24,9 +24,9 @@ edition = "2021"
repository = "https://github.com/mtshiba/pylyzer" repository = "https://github.com/mtshiba/pylyzer"
[workspace.dependencies] [workspace.dependencies]
erg_common = { version = "0.6.49-nightly.0", features = ["py_compat", "els"] } erg_common = { version = "0.6.49-nightly.1", features = ["py_compat", "els"] }
erg_compiler = { version = "0.6.49-nightly.0", features = ["py_compat", "els"] } erg_compiler = { version = "0.6.49-nightly.1", features = ["py_compat", "els"] }
els = { version = "0.1.61-nightly.0", features = ["py_compat"] } els = { version = "0.1.61-nightly.1", features = ["py_compat"] }
# rustpython-parser = { version = "0.3.0", features = ["all-nodes-with-ranges", "location"] } # rustpython-parser = { version = "0.3.0", features = ["all-nodes-with-ranges", "location"] }
# rustpython-ast = { version = "0.3.0", features = ["all-nodes-with-ranges", "location"] } # rustpython-ast = { version = "0.3.0", features = ["all-nodes-with-ranges", "location"] }
rustpython-parser = { git = "https://github.com/RustPython/Parser", version = "0.4.0", features = ["all-nodes-with-ranges", "location"] } rustpython-parser = { git = "https://github.com/RustPython/Parser", version = "0.4.0", features = ["all-nodes-with-ranges", "location"] }

View File

@ -1,9 +1,11 @@
i = 0 i = 0
class Bar: class Bar:
CONST = "foo.bar"
def f(self): return 1 def f(self): return 1
class Baz(Exception): class Baz(Exception):
CONST = "foo.baz"
pass pass
class Qux(Baz): class Qux(Baz):

View File

@ -1 +1,4 @@
i = 0 i = 0
class Bar:
CONST = "foo.baz.bar"

View File

@ -2,6 +2,7 @@ import export
import foo import foo
from . import foo from . import foo
from foo import bar, Bar from foo import bar, Bar
from foo.bar import Baz
from foo import baz from foo import baz
import random import random
from random import randint as rdi from random import randint as rdi
@ -30,6 +31,12 @@ assert d.y == 2
assert foo.i == 0 assert foo.i == 0
assert Bar().f() == 1 assert Bar().f() == 1
assert Bar.CONST == "foo.bar"
assert Baz.CONST == "foo.baz"
from foo.baz import Bar
assert Bar.CONST == "foo.baz.bar"
from glob import glob from glob import glob
print(glob("*")) print(glob("*"))