language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-29 12:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update: use Span and const Theme in style.rs

Browse source
This commit is contained in:
GreasySlug 2022-11-12 18:03:10 +09:00
parent 2e8ac2848d
commit a16d46423f
6 changed files with 449 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/erg_parser/parse.rs
View file

@ -11,6 +11,7 @@ use erg_common::error::Location;
use erg_common::option_enum_unwrap;
use erg_common::set::Set as HashSet;
use erg_common::str::Str;
use erg_common::style::THEME;
use erg_common::traits::Runnable;
use erg_common::traits::{Locational, Stream};
use erg_common::{
@ -206,16 +207,16 @@ impl ParserRunner {
pub fn parse_token_stream(&mut self, ts: TokenStream) -> Result<Module, ParserRunnerErrors> {
Parser::new(ts)
.parse()
.map_err(|errs| ParserRunnerErrors::convert(self.input(), errs))
.map_err(|errs| ParserRunnerErrors::convert(self.input(), errs, THEME))
}
pub fn parse(&mut self, src: String) -> Result<Module, ParserRunnerErrors> {
let ts = Lexer::new(Input::Str(src))
.lex()
.map_err(|errs| ParserRunnerErrors::convert(self.input(), errs))?;
.map_err(|errs| ParserRunnerErrors::convert(self.input(), errs, THEME))?;
Parser::new(ts)
.parse()
.map_err(|errs| ParserRunnerErrors::convert(self.input(), errs))
.map_err(|errs| ParserRunnerErrors::convert(self.input(), errs, THEME))
}
}