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

Add builder & linker

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-09-21 01:21:17 +09:00
parent 671fbee518
commit 201b313cd2
19 changed files with 241 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/erg_compiler/context/initialize/mod.rs
View file

@ -1783,13 +1783,13 @@ impl Context {
ctx
}
pub fn new_main_module() -> Self {
pub fn new_main_module(mod_cache: SharedModuleCache) -> Self {
Context::new(
"<module>".into(),
ContextKind::Module,
vec![],
Some(Context::init_builtins()),
Some(SharedModuleCache::new()),
Some(mod_cache),
Context::TOP_LEVEL,
)
}

1
compiler/erg_compiler/context/mod.rs
View file

@ -238,6 +238,7 @@ impl From<DefKind> for ContextKind {
DefKind::Class | DefKind::Inherit => Self::Class,
DefKind::Trait | DefKind::Subsume => Self::Trait,
DefKind::StructuralTrait => Self::StructuralTrait,
DefKind::Module => Self::Module,
DefKind::Other => Self::Instant,
}
}

51
compiler/erg_compiler/context/register.rs
View file

@ -1,5 +1,7 @@
use std::option::Option; // conflicting to Type::Option
use erg_common::config::{ErgConfig, Input};
use erg_common::error::MultiErrorDisplay;
use erg_common::traits::{Locational, Stream};
use erg_common::vis::Visibility;
use erg_common::Str;
@ -14,11 +16,12 @@ use erg_type::value::{GenTypeObj, TypeKind, TypeObj, ValueObj};
use erg_type::{HasType, ParamTy, SubrType, TyBound, Type};
use Type::*;
use crate::builder::HIRBuilder;
use crate::context::{ClassDefType, Context, DefaultInfo, RegistrationMode, TraitInstance};
use crate::error::readable_name;
use crate::error::{TyCheckError, TyCheckResult};
use crate::hir;
use crate::mod_cache::ModuleEntry;
use crate::mod_cache::SharedModuleCache;
use crate::varinfo::{Mutability, ParamIdx, VarInfo, VarKind};
use Mutability::*;
use RegistrationMode::*;
@ -763,56 +766,55 @@ impl Context {
match mod_name {
hir::Expr::Lit(lit) => {
if self.subtype_of(&lit.value.class(), &Str) {
let name = enum_unwrap!(lit.value.clone(), ValueObj::Str);
if let Some(mod_cache) = self.mod_cache.as_mut() {
match &name[..] {
let __name__ = enum_unwrap!(lit.value.clone(), ValueObj::Str);
if let Some(mod_cache) = self.mod_cache.as_ref() {
match &__name__[..] {
"importlib" => {
mod_cache.register(
var_name.clone(),
ModuleEntry::builtin(Self::init_py_importlib_mod()),
None,
Self::init_py_importlib_mod(),
);
}
"io" => {
mod_cache.register(
var_name.clone(),
ModuleEntry::builtin(Self::init_py_io_mod()),
);
mod_cache.register(var_name.clone(), None, Self::init_py_io_mod());
}
"math" => {
mod_cache.register(
var_name.clone(),
ModuleEntry::builtin(Self::init_py_math_mod()),
None,
Self::init_py_math_mod(),
);
}
"random" => {
mod_cache.register(
var_name.clone(),
ModuleEntry::builtin(Self::init_py_random_mod()),
None,
Self::init_py_random_mod(),
);
}
"socket" => {
mod_cache.register(
var_name.clone(),
ModuleEntry::builtin(Self::init_py_socket_mod()),
None,
Self::init_py_socket_mod(),
);
}
"sys" => {
mod_cache.register(
var_name.clone(),
ModuleEntry::builtin(Self::init_py_sys_mod()),
);
mod_cache.register(var_name.clone(), None, Self::init_py_sys_mod());
}
"time" => {
mod_cache.register(
var_name.clone(),
ModuleEntry::builtin(Self::init_py_time_mod()),
None,
Self::init_py_time_mod(),
);
}
other => todo!("importing {other}"),
_ => self.import_user_module(var_name, __name__, mod_cache),
}
} else {
// maybe unreachable
todo!("importing {name} in the builtin module")
todo!("importing {__name__} in the builtin module")
}
} else {
return Err(TyCheckError::type_mismatch_error(
@ -839,6 +841,17 @@ impl Context {
Ok(())
}
fn import_user_module(&self, var_name: &VarName, __name__: Str, mod_cache: &SharedModuleCache) {
let cfg = ErgConfig {
input: Input::File(format!("{__name__}.er")),
..ErgConfig::default()
};
let mut hir_builder = HIRBuilder::new(cfg, mod_cache.clone());
if let Err(errs) = hir_builder.build_and_cache(var_name.clone()) {
errs.fmt_all_stderr();
}
}
pub(crate) fn _push_subtype_bound(&mut self, sub: Type, sup: Type) {
self.bounds.push(TyBound::subtype_of(sub, sup));
}