language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-03 10:23:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: add Token::col_end

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-08-27 15:33:29 +09:00
parent f6763fcfdf
commit 06c14c35e5
11 changed files with 272 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/erg_compiler/codegen.rs
View file

@ -3156,7 +3156,7 @@ impl PyCodeGenerator {
}
None => {}
}
let none = Token::new(TokenKind::NoneLit, "None", line, 0);
let none = Token::new(TokenKind::NoneLit, "None", line, 0, 0);
attrs.push(Expr::Lit(Literal::new(ValueObj::None, none)));
let block = Block::new(attrs);
let body = DefBody::new(EQUAL, block, DefId(0));

4
crates/erg_compiler/context/instantiate_spec.rs
View file

@ -1483,7 +1483,7 @@ impl Context {
}
TypeSpec::Dict(dict) => {
let mut inst_tys = dict! {};
for (k, v) in dict {
for (k, v) in dict.kvs.iter() {
inst_tys.insert(
self.instantiate_typespec_full(
k,
@ -1505,7 +1505,7 @@ impl Context {
}
TypeSpec::Record(rec) => {
let mut inst_tys = dict! {};
for (k, v) in rec {
for (k, v) in rec.attrs.iter() {
inst_tys.insert(
self.instantiate_field(k)?,
self.instantiate_typespec_full(

1
crates/erg_compiler/link_hir.rs
View file

@ -480,6 +480,7 @@ impl<'a> HIRLinker<'a> {
path,
mod_name_lit.ln_begin().unwrap(),
mod_name_lit.col_begin().unwrap(),
mod_name_lit.col_end().unwrap(),
);
let mod_name = Expr::Lit(Literal::try_from(token).unwrap());
args.insert_pos(0, PosArg::new(mod_name));

3
crates/erg_compiler/lower.rs
View file

@ -1099,12 +1099,14 @@ impl ASTLowerer {
Str::ever("."),
pack.connector.ln_begin().unwrap(),
pack.connector.col_begin().unwrap(),
pack.connector.col_end().unwrap(),
)),
ast::VarName::new(Token::new(
TokenKind::Symbol,
Str::ever("new"),
pack.connector.ln_begin().unwrap(),
pack.connector.col_begin().unwrap(),
pack.connector.col_end().unwrap(),
)),
);
let vi = match self.module.context.get_call_t(
@ -1911,6 +1913,7 @@ impl ASTLowerer {
".",
def.sig.ln_begin().unwrap(),
def.sig.col_begin().unwrap(),
def.sig.col_end().unwrap(),
));
}
self.module