language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-04 18:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf: reduce performing of .loc()

Browse source
This commit is contained in:
Shunsuke Shibayama 2023-02-15 02:33:28 +09:00
parent 5d90029f09
commit 5f6c8a3b2b
9 changed files with 83 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

60
crates/erg_common/traits.rs
View file

@ -1004,11 +1004,13 @@ macro_rules! impl_locational {
($T: ty, $begin: ident, $end: ident) => {
impl Locational for $T {
fn loc(&self) -> Location {
let begin_loc = self.$begin.loc();
let end_loc = self.$end.loc();
match (
self.$begin.ln_begin(),
self.$begin.col_begin(),
self.$end.ln_end(),
self.$end.col_end(),
begin_loc.ln_begin(),
begin_loc.col_begin(),
end_loc.ln_end(),
end_loc.col_end(),
) {
(Some(lb), Some(cb), Some(le), Some(ce)) => Location::range(lb, cb, le, ce),
(Some(lb), _, Some(le), _) => Location::LineRange(lb, le),
@ -1016,19 +1018,33 @@ macro_rules! impl_locational {
_ => Location::Unknown,
}
}
fn ln_begin(&self) -> Option<u32> {
self.$begin.ln_begin()
}
fn ln_end(&self) -> Option<u32> {
self.$end.ln_end()
}
fn col_begin(&self) -> Option<u32> {
self.$begin.col_begin()
}
fn col_end(&self) -> Option<u32> {
self.$end.col_end()
}
}
};
($T: ty, lossy $begin: ident, $end: ident) => {
impl Locational for $T {
fn loc(&self) -> Location {
if self.$begin.loc().is_unknown() {
return self.$end.loc();
let begin_loc = self.$begin.loc();
let end_loc = self.$end.loc();
if begin_loc.is_unknown() {
return end_loc;
}
match (
self.$begin.ln_begin(),
self.$begin.col_begin(),
self.$end.ln_end(),
self.$end.col_end(),
begin_loc.ln_begin(),
begin_loc.col_begin(),
end_loc.ln_end(),
end_loc.col_end(),
) {
(Some(lb), Some(cb), Some(le), Some(ce)) => Location::range(lb, cb, le, ce),
(Some(lb), _, Some(le), _) => Location::LineRange(lb, le),
@ -1041,14 +1057,16 @@ macro_rules! impl_locational {
($T: ty, $begin: ident, $middle: ident, $end: ident) => {
impl Locational for $T {
fn loc(&self) -> Location {
if self.$begin.loc().is_unknown() && self.$end.loc().is_unknown() {
let begin_loc = self.$begin.loc();
let end_loc = self.$end.loc();
if begin_loc.is_unknown() && end_loc.is_unknown() {
return self.$middle.loc();
}
match (
self.$begin.ln_begin(),
self.$begin.col_begin(),
self.$end.ln_end(),
self.$end.col_end(),
begin_loc.ln_begin(),
begin_loc.col_begin(),
end_loc.ln_end(),
end_loc.col_end(),
) {
(Some(lb), Some(cb), Some(le), Some(ce)) => Location::range(lb, cb, le, ce),
(Some(lb), _, Some(le), _) => Location::LineRange(lb, le),
@ -1056,6 +1074,18 @@ macro_rules! impl_locational {
_ => Location::Unknown,
}
}
fn ln_begin(&self) -> Option<u32> {
self.$begin.ln_begin()
}
fn ln_end(&self) -> Option<u32> {
self.$end.ln_end()
}
fn col_begin(&self) -> Option<u32> {
self.$begin.col_begin()
}
fn col_end(&self) -> Option<u32> {
self.$end.col_end()
}
}
};
($T: ty, $inner: ident) => {