github
/
boa
mirror of https://github.com/boa-dev/boa.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Replace error throwing with panic in "Lexer::next()" (#229)

pull/232/head
croraf 5 years ago committed by Jason Williams
parent
ce9af33620
commit
dd5ecddc55
1 changed files with 24 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      src/lib/syntax/lexer.rs

49
src/lib/syntax/lexer.rs
Unescape View File

@ -18,7 +18,7 @@ macro_rules! vop {
let preview = $this.preview_next().unwrap();
match preview {
'=' => {
$this.next()?;
$this.next();
$assign_op
}
_ => $op,
@ -28,11 +28,11 @@ macro_rules! vop {
let preview = $this.preview_next().unwrap();
match preview {
'=' => {
$this.next()?;
$this.next();
$assign_op
},
$($case => {
$this.next()?;
$this.next();
$block
})+,
_ => $op
@ -143,10 +143,10 @@ impl<'a> Lexer<'a> {
}
/// next fetches the next token and return it, or a LexerError if there are no more.
fn next(&mut self) -> Result<char, LexerError> {
fn next(&mut self) -> char {
match self.buffer.next() {
Some(ch) => Ok(ch),
None => Err(LexerError::new("finished")),
Some(ch) => ch,
None => panic!("No more more characters to consume from input stream, use preview_next() first to check before calling next()"),
}
}
@ -154,7 +154,7 @@ impl<'a> Lexer<'a> {
fn read_line(&mut self) -> Result<String, LexerError> {
let mut buf = String::new();
while self.preview_next().is_some() {
let ch = self.next()?;
let ch = self.next();
match ch {
_ if ch.is_ascii_control() => {
break;
@ -164,7 +164,6 @@ impl<'a> Lexer<'a> {
}
}
}
Ok(buf)
}
@ -183,7 +182,7 @@ impl<'a> Lexer<'a> {
while self.buffer.peek().is_some()
&& f(self.preview_next().expect("Could not preview next value"))
{
s.push(self.next()?);
s.push(self.next());
}
Ok(s)
@ -205,12 +204,12 @@ impl<'a> Lexer<'a> {
return Ok(());
}
self.column_number += 1;
let ch = self.next()?;
let ch = self.next();
match ch {
'"' | '\'' => {
let mut buf = String::new();
loop {
match self.next()? {
match self.next() {
'\'' if ch == '\'' => {
break;
}
@ -218,7 +217,7 @@ impl<'a> Lexer<'a> {
break;
}
'\\' => {
let escape = self.next()?;
let escape = self.next();
if escape != '\n' {
let escaped_ch = match escape {
'n' => '\n',
@ -230,7 +229,7 @@ impl<'a> Lexer<'a> {
'x' => {
let mut nums = String::with_capacity(2);
for _ in 0_u8..2 {
nums.push(self.next()?);
nums.push(self.next());
}
self.column_number += 2;
let as_num = match u64::from_str_radix(&nums, 16) {
@ -265,7 +264,7 @@ impl<'a> Lexer<'a> {
let c = from_u32(as_num)
.expect("Invalid Unicode escape sequence");
self.next()?; // '}'
self.next(); // '}'
self.column_number +=
(s.len() as u64).wrapping_add(3);
c
@ -326,7 +325,7 @@ impl<'a> Lexer<'a> {
let num = if self.next_is('x') {
while let Some(ch) = self.preview_next() {
if ch.is_digit(16) {
buf.push(self.next()?);
buf.push(self.next());
} else {
break;
}
@ -335,7 +334,7 @@ impl<'a> Lexer<'a> {
} else if self.next_is('b') {
while let Some(ch) = self.preview_next() {
if ch.is_digit(2) {
buf.push(self.next()?);
buf.push(self.next());
} else {
break;
}
@ -348,15 +347,15 @@ impl<'a> Lexer<'a> {
match next_ch {
c if next_ch.is_digit(8) => {
buf.push(c);
self.next()?;
self.next();
}
'O' | 'o' => {
self.next()?;
self.next();
}
'8' | '9' | '.' => {
gone_decimal = true;
buf.push(next_ch);
self.next()?;
self.next();
}
_ => break,
}
@ -376,7 +375,7 @@ impl<'a> Lexer<'a> {
'digitloop: while let Some(ch) = self.preview_next() {
match ch {
'.' => loop {
buf.push(self.next()?);
buf.push(self.next());
let c = match self.preview_next() {
Some(ch) => ch,
@ -388,10 +387,10 @@ impl<'a> Lexer<'a> {
}
},
'e' | '+' | '-' => {
buf.push(self.next()?);
buf.push(self.next());
}
_ if ch.is_digit(10) => {
buf.push(self.next()?);
buf.push(self.next());
}
_ => break,
}
@ -405,7 +404,7 @@ impl<'a> Lexer<'a> {
let mut buf = ch.to_string();
while let Some(ch) = self.preview_next() {
if ch.is_alphabetic() || ch.is_digit(10) || ch == '_' {
buf.push(self.next()?);
buf.push(self.next());
} else {
break;
}
@ -463,7 +462,7 @@ impl<'a> Lexer<'a> {
'*' => {
let mut buf = String::new();
loop {
match self.next()? {
match self.next() {
'*' => {
if self.next_is('/') {
break;
@ -497,7 +496,7 @@ impl<'a> Lexer<'a> {
// escape sequence
Some('\\') => {
body.push('\\');
match self.next()? {
match self.next() {
// newline not allowed in regex literal
'\n' | '\r' | '\u{2028}' | '\u{2029}' => break,
ch => body.push(ch),

Write Preview
Loading…
Cancel
Save