Noratrieb/dilaria
1
0
Fork 0
mirror of https://github.com/Noratrieb/dilaria.git synced 2026-01-15 01:45:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename comparison tokens

Browse source
This commit is contained in:
nora 2021-10-31 01:37:48 +02:00
parent ce9050e8a2
commit 06ac1bb2e7
2 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/lex.rs
View file

@ -86,13 +86,13 @@ pub enum TokenType<'code> {
/// !=
BangEqual,
/// >
GreaterThan,
Greater,
/// <
LessThan,
Less,
/// >=
GreaterThanEqual,
GreaterEqual,
/// <=
LessThanEqual,
LessEqual,
}
#[derive(Debug, Clone)]
@ -204,18 +204,13 @@ impl<'code> Iterator for Lexer<'code> {
'>' => {
break self.maybe_next_char(
'=',
TokenType::GreaterThanEqual,
TokenType::GreaterThan,
TokenType::GreaterEqual,
TokenType::Greater,
start,
);
}
'<' => {
break self.maybe_next_char(
'=',
TokenType::LessThanEqual,
TokenType::LessThan,
start,
);
break self.maybe_next_char('=', TokenType::LessEqual, TokenType::Less, start);
}
'"' => {
let mut buffer = String::new();
@ -426,10 +421,7 @@ mod test {
#[test]
fn smiley_face() {
lex_test(
">>.<<",
vec![GreaterThan, GreaterThan, Dot, LessThan, LessThan],
)
lex_test(">>.<<", vec![Greater, Greater, Dot, Less, Less])
}
#[test]
@ -437,12 +429,12 @@ mod test {
lex_test(
">= <= == < < >=",
vec![
GreaterThanEqual,
LessThanEqual,
GreaterEqual,
LessEqual,
EqualEqual,
LessThan,
LessThan,
GreaterThanEqual,
Less,
Less,
GreaterEqual,
],
)
}

20
src/parse.rs
View file

@ -86,22 +86,22 @@ impl<'code> Parser<'code> {
fn comparison(&mut self) -> ParseResult<'code, Expr> {
let lhs = self.term()?;
match self.peek().map(|token| &token.kind) {
Some(TokenType::GreaterThan) => {
Some(TokenType::Greater) => {
let _ = self.next();
let rhs = self.term()?;
self.binary_op(lhs, BinaryOpKind::Greater, rhs)
}
Some(TokenType::GreaterThanEqual) => {
Some(TokenType::GreaterEqual) => {
let _ = self.next();
let rhs = self.term()?;
self.binary_op(lhs, BinaryOpKind::GreaterEqual, rhs)
}
Some(TokenType::LessThan) => {
Some(TokenType::Less) => {
let _ = self.next();
let rhs = self.term()?;
self.binary_op(lhs, BinaryOpKind::Less, rhs)
}
Some(TokenType::LessThanEqual) => {
Some(TokenType::LessEqual) => {
let _ = self.next();
let rhs = self.term()?;
self.binary_op(lhs, BinaryOpKind::LessEqual, rhs)
@ -327,17 +327,13 @@ mod test {
#[test]
fn greater() {
test_literal_bin_op(
TokenType::GreaterThan,
BinaryOpKind::Greater,
parse_comparison,
);
test_literal_bin_op(TokenType::Greater, BinaryOpKind::Greater, parse_comparison);
}
#[test]
fn greater_equal() {
test_literal_bin_op(
TokenType::GreaterThanEqual,
TokenType::GreaterEqual,
BinaryOpKind::GreaterEqual,
parse_comparison,
);
@ -345,13 +341,13 @@ mod test {
#[test]
fn less() {
test_literal_bin_op(TokenType::LessThan, BinaryOpKind::Less, parse_comparison);
test_literal_bin_op(TokenType::Less, BinaryOpKind::Less, parse_comparison);
}
#[test]
fn less_equal() {
test_literal_bin_op(
TokenType::LessThanEqual,
TokenType::LessEqual,
BinaryOpKind::LessEqual,
parse_comparison,
);