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

Update: add closure for error and, line and col

Browse source 
The length of the string is calculated as the rightmost
newline or 0, and that is the message of the error
This commit is contained in:
GreasySlug 2022-09-20 16:05:53 +09:00
parent beb10ef166
commit f1dd25e508
1 changed files with 71 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

75
compiler/erg_parser/lex.rs
View file

@ -690,17 +690,10 @@ impl Lexer /*<'a>*/ {
fn lex_multi_line_str(&mut self) -> LexResult<Token> { fn lex_multi_line_str(&mut self) -> LexResult<Token> {
let mut s = "\"\"\"".to_string(); let mut s = "\"\"\"".to_string();
while let Some(c) = self.peek_cur_ch() { let unclosed_error = |t: Token| -> LexResult<Token> {
match c { Err(LexError::syntax_error(
'"' => {
s.push(self.consume().unwrap());
let next_c = self.peek_cur_ch();
let aft_next_c = self.peek_next_ch();
if next_c.is_none() || aft_next_c.is_none() {
let token = self.emit_token(Illegal, &s);
return Err(LexError::syntax_error(
0, 0,
token.loc(), t.loc(),
switch_lang!( switch_lang!(
"japanese" => "文字列が\"\"\"によって閉じられていません", "japanese" => "文字列が\"\"\"によって閉じられていません",
"simplified_chinese" => "字符串没有被\"\"\"关闭", "simplified_chinese" => "字符串没有被\"\"\"关闭",
@ -708,30 +701,46 @@ impl Lexer /*<'a>*/ {
"english" => "the string is not closed by \"\"\"", "english" => "the string is not closed by \"\"\"",
), ),
None, None,
)); ))
};
while let Some(c) = self.peek_cur_ch() {
match c {
'"' => {
s.push(self.consume().unwrap());
let next_c = self.peek_cur_ch();
let aft_next_c = self.peek_next_ch();
if next_c.is_none() {
let col_end = s.rfind('\n').unwrap_or_default();
let error_s = &s[col_end..s.len()];
let token = self.emit_token(Illegal, error_s);
return unclosed_error(token);
}
if aft_next_c.is_none() {
s.push(self.consume().unwrap());
let col_end = s.rfind('\n').unwrap_or_default();
let error_s = &s[col_end..s.len()];
let token = self.emit_token(Illegal, error_s);
return unclosed_error(token);
} }
let next_c = self.consume().unwrap(); let next_c = self.consume().unwrap();
let aft_next_c = self.consume().unwrap(); let aft_next_c = self.consume().unwrap();
if next_c == '"' && aft_next_c == '"' { if next_c == '"' && aft_next_c == '"' {
s.push_str("\"\"");
let token = self.emit_token(StrLit, &s); let token = self.emit_token(StrLit, &s);
return Ok(token); return Ok(token);
} }
s.push(self.consume().unwrap());
} }
_ => { _ => {
let c = self.consume().unwrap(); let c = self.consume().unwrap();
if c == '\\' { match c {
'\\' => {
let next_c = self.consume().unwrap(); let next_c = self.consume().unwrap();
match next_c { match next_c {
'0' => s.push('\0'), '0' => s.push('\0'),
'r' => s.push('\r'), 'r' => s.push('\r'),
'\'' => { '\'' => s.push('\''),
s.push('\'');
if self.peek_next_ch().is_some()
&& self.peek_next_ch().unwrap() == '\n'
{
continue; // Escaping a line break if only '\' comes at the end
}
}
'"' => s.push('"'), '"' => s.push('"'),
't' => s.push_str(" "), // tab is invalid, so changed into 4 whitespace 't' => s.push_str(" "), // tab is invalid, so changed into 4 whitespace
'\\' => s.push('\\'), '\\' => s.push('\\'),
@ -739,6 +748,7 @@ impl Lexer /*<'a>*/ {
'\n' => { '\n' => {
self.lineno_token_starts += 1; self.lineno_token_starts += 1;
self.col_token_starts = 0; self.col_token_starts = 0;
continue;
} }
_ => { _ => {
let token = self.emit_token(Illegal, &format!("\\{next_c}")); let token = self.emit_token(Illegal, &format!("\\{next_c}"));
@ -755,7 +765,13 @@ impl Lexer /*<'a>*/ {
)); ));
} }
} }
} else { }
'\n' => {
self.lineno_token_starts += 1;
self.col_token_starts = 0;
s.push('\n')
}
_ => {
s.push(c); s.push(c);
if Self::is_bidi(c) { if Self::is_bidi(c) {
return Err(self._invalid_unicode_character(&s)); return Err(self._invalid_unicode_character(&s));
@ -764,18 +780,11 @@ impl Lexer /*<'a>*/ {
} }
} }
} }
let token = self.emit_token(Illegal, &s); }
Err(LexError::syntax_error( let col_end = s.rfind('\n').unwrap_or_default();
0, let error_s = &s[col_end..s.len()];
token.loc(), let token = self.emit_token(Illegal, error_s);
switch_lang!( unclosed_error(token)
"japanese" => "文字列が\"\"\"によって閉じられていません",
"simplified_chinese" => "字符串没有被\"\"\"关闭",
"traditional_chinese" => "字符串没有被\"\"\"关闭",
"english" => "the string is not closed by \"\"\"",
),
None,
))
} }
// for single strings and multi strings // for single strings and multi strings