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

fix: cyclic reference modules bugs

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-12-28 14:59:14 +09:00
parent 26c758e67f
commit a2d1809cee
21 changed files with 266 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/erg_parser/ast.rs
View file

@ -6,7 +6,6 @@ use std::fmt::Write as _;
use erg_common::consts::ERG_MODE;
use erg_common::error::Location;
use erg_common::io::Input;
use erg_common::pathutil::NormalizedPathBuf;
use erg_common::set::Set as HashSet;
// use erg_common::dict::Dict as HashMap;
use erg_common::traits::{Locational, NestedDisplay, Stream};
@ -6168,7 +6167,6 @@ pub struct InlineModule {
pub input: Input,
pub ast: AST,
pub import: Call,
pub module_path: NormalizedPathBuf,
}
impl NestedDisplay for InlineModule {
@ -6190,12 +6188,7 @@ impl InlineModule {
}
impl InlineModule {
pub const fn new(input: Input, ast: AST, import: Call, module_path: NormalizedPathBuf) -> Self {
Self {
input,
ast,
import,
module_path,
}
pub const fn new(input: Input, ast: AST, import: Call) -> Self {
Self { input, ast, import }
}
}

7
crates/erg_parser/desugar.rs
View file

@ -408,12 +408,7 @@ impl Desugarer {
chunks.push(desugar(chunk));
}
let ast = AST::new(inline.ast.name, Module::new(chunks));
Expr::InlineModule(InlineModule::new(
inline.input,
ast,
inline.import,
inline.module_path,
))
Expr::InlineModule(InlineModule::new(inline.input, ast, inline.import))
}
Expr::Dummy(exprs) => {
let loc = exprs.loc;