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

some more binops

Browse source
This commit is contained in:
nora 2022-07-02 21:20:46 +02:00
parent 94229110cc
commit d90e21e06c
3 changed files with 65 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
parser/src/ast.rs
View file

@ -29,11 +29,38 @@ pub enum UnaryOp {
}
#[derive(Debug, DebugPls)]
pub enum BinaryOp {
pub enum ArithOpKind {
Mul,
Div,
Mod,
Add,
Sub,
Shl,
Shr,
BitAnd,
BitXor,
BitOr,
}
#[derive(Debug, DebugPls)]
pub enum ComparisonKind {
Lt,
Gt,
LtEq,
GtEq,
Eq,
Neq,
}
#[derive(Debug, DebugPls)]
pub enum BinaryOp {
Arith(ArithOpKind),
LogicalAnd,
LogicalOr,
Comparison(ComparisonKind),
Comma,
Index, // lhs[rhs]
Assign(Option<ArithOpKind>),
}
#[derive(Debug, DebugPls)]

37
parser/src/parser/expr.rs
View file

@ -3,7 +3,7 @@
//! For more information, see https://matklad.github.io/2020/04/13/simple-but-powerful-pratt-parsing.html
use crate::{
ast::{Atom, BinaryOp, Expr, ExprBinary, ExprUnary, UnaryOp},
ast::{ArithOpKind, Atom, BinaryOp, ComparisonKind, Expr, ExprBinary, ExprUnary, UnaryOp},
parser::{expect, Parser, ParserError, Result},
pre::Punctuator as P,
token::{Constant, Token as Tok},
@ -133,8 +133,39 @@ fn unary_op_from_token(tok: &Tok<'_>) -> Option<UnaryOp> {
}
fn binary_op_from_token(tok: &Tok<'_>) -> Option<BinaryOp> {
match tok {
Tok::Punct(P::Plus) => Some(BinaryOp::Add),
Tok::Punct(P::Minus) => Some(BinaryOp::Sub),
// arithmetic operators
Tok::Punct(P::Plus) => Some(BinaryOp::Arith(ArithOpKind::Add)),
Tok::Punct(P::Minus) => Some(BinaryOp::Arith(ArithOpKind::Sub)),
Tok::Punct(P::Asterisk) => Some(BinaryOp::Arith(ArithOpKind::Mul)),
Tok::Punct(P::Slash) => Some(BinaryOp::Arith(ArithOpKind::Div)),
Tok::Punct(P::Percent) => Some(BinaryOp::Arith(ArithOpKind::Mod)),
Tok::Punct(P::LeftLeftChevron) => Some(BinaryOp::Arith(ArithOpKind::Shl)),
Tok::Punct(P::RightRightChevron) => Some(BinaryOp::Arith(ArithOpKind::Shr)),
Tok::Punct(P::Ampersand) => Some(BinaryOp::Arith(ArithOpKind::BitAnd)),
Tok::Punct(P::Caret) => Some(BinaryOp::Arith(ArithOpKind::BitXor)),
Tok::Punct(P::Pipe) => Some(BinaryOp::Arith(ArithOpKind::BitOr)),
// logical operators
Tok::Punct(P::AmpersandAmpersand) => Some(BinaryOp::LogicalAnd),
Tok::Punct(P::PipePipe) => Some(BinaryOp::LogicalOr),
// assignment
Tok::Punct(P::Eq) => Some(BinaryOp::Assign(None)),
Tok::Punct(P::PlusEq) => Some(BinaryOp::Assign(Some(ArithOpKind::Add))),
Tok::Punct(P::MinusEq) => Some(BinaryOp::Assign(Some(ArithOpKind::Sub))),
Tok::Punct(P::AsteriskEq) => Some(BinaryOp::Assign(Some(ArithOpKind::Mul))),
Tok::Punct(P::SlashEq) => Some(BinaryOp::Assign(Some(ArithOpKind::Div))),
Tok::Punct(P::PercentEq) => Some(BinaryOp::Assign(Some(ArithOpKind::Mod))),
Tok::Punct(P::LeftLeftChevronEq) => Some(BinaryOp::Assign(Some(ArithOpKind::Shl))),
Tok::Punct(P::RightRightChevronEq) => Some(BinaryOp::Assign(Some(ArithOpKind::Shr))),
Tok::Punct(P::AmpersandEq) => Some(BinaryOp::Assign(Some(ArithOpKind::BitAnd))),
Tok::Punct(P::CaretEq) => Some(BinaryOp::Assign(Some(ArithOpKind::BitXor))),
Tok::Punct(P::PipeEq) => Some(BinaryOp::Assign(Some(ArithOpKind::BitOr))),
// comparison
Tok::Punct(P::LeftChevron) => Some(BinaryOp::Comparison(ComparisonKind::Lt)),
Tok::Punct(P::RightChevron) => Some(BinaryOp::Comparison(ComparisonKind::Gt)),
Tok::Punct(P::LeftChevronEq) => Some(BinaryOp::Comparison(ComparisonKind::LtEq)),
Tok::Punct(P::RightChevronEq) => Some(BinaryOp::Comparison(ComparisonKind::GtEq)),
Tok::Punct(P::EqEq) => Some(BinaryOp::Comparison(ComparisonKind::Eq)),
Tok::Punct(P::BangEq) => Some(BinaryOp::Comparison(ComparisonKind::Neq)),
_ => None,
}
}

6
parser/src/pre/lexer.rs
View file

@ -108,7 +108,7 @@ pub enum Punctuator {
/// >>=
RightRightChevronEq,
/// &=
AmspersandEq,
AmpersandEq,
/// ^=
CaretEq,
/// |=
@ -166,7 +166,7 @@ impl Display for Punctuator {
Punctuator::MinusEq => f.write_str("-="),
Punctuator::LeftLeftChevronEq => f.write_str("<<="),
Punctuator::RightRightChevronEq => f.write_str(">>="),
Punctuator::AmspersandEq => f.write_str("&="),
Punctuator::AmpersandEq => f.write_str("&="),
Punctuator::CaretEq => f.write_str("^="),
Punctuator::PipeEq => f.write_str("|="),
Punctuator::Comma => f.write_str(","),
@ -372,7 +372,7 @@ where
(b'%', Some(b'='), _) => double_punct!(self, PercentEq),
(b'+', Some(b'='), _) => double_punct!(self, PlusEq),
(b'-', Some(b'='), _) => double_punct!(self, MinusEq),
(b'&', Some(b'='), _) => double_punct!(self, AmspersandEq),
(b'&', Some(b'='), _) => double_punct!(self, AmpersandEq),
(b'^', Some(b'='), _) => double_punct!(self, CaretEq),
(b'|', Some(b'='), _) => double_punct!(self, PipeEq),
// SINGLE CHARACTER PUNCTUATION