Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Op-Assign Statements Like x += 1u32 #137

Merged
merged 2 commits into from
Aug 14, 2024
Merged

Implement Op-Assign Statements Like x += 1u32 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfc8b54
Implement op-assign statements like `x += 1u32`
fkettelhoit Aug 13, 2024
4f33462
Fix clippy warnings
fkettelhoit Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,48 @@ impl Parser {
self.expect(&TokenEnum::Semicolon)?;
}
Stmt::new(StmtEnum::VarAssign(identifier, value), meta)
} else if let Some(Token(next, _)) = self.tokens.peek() {
let op = match next {
TokenEnum::AddAssign => Some(Op::Add),
TokenEnum::SubAssign => Some(Op::Sub),
TokenEnum::MulAssign => Some(Op::Mul),
TokenEnum::DivAssign => Some(Op::Div),
TokenEnum::RemAssign => Some(Op::Mod),
TokenEnum::BitXorAssign => Some(Op::BitXor),
TokenEnum::BitAndAssign => Some(Op::BitAnd),
TokenEnum::BitOrAssign => Some(Op::BitOr),
TokenEnum::ShrAssign => Some(Op::ShiftRight),
TokenEnum::ShlAssign => Some(Op::ShiftLeft),
_ => None,
};
println!("next: {next:?}");
if let Some(op) = op {
self.advance();
let value = self.parse_expr()?;
let identifier_meta = meta;
let meta = join_meta(meta, value.meta);
if !self.peek(&TokenEnum::RightBrace) && !self.peek(&TokenEnum::Comma) {
self.expect(&TokenEnum::Semicolon)?;
}
let binary_op = Expr::untyped(
ExprEnum::Op(
op,
Box::new(Expr::untyped(
ExprEnum::Identifier(identifier.clone()),
identifier_meta,
)),
Box::new(value),
),
meta,
);
Stmt::new(StmtEnum::VarAssign(identifier, binary_op), meta)
} else {
let expr = Expr::untyped(ExprEnum::Identifier(identifier), meta);
if !self.peek(&TokenEnum::RightBrace) && !self.peek(&TokenEnum::Comma) {
self.expect(&TokenEnum::Semicolon)?;
}
Stmt::new(StmtEnum::Expr(expr), meta)
}
} else {
let expr = Expr::untyped(ExprEnum::Identifier(identifier), meta);
if !self.peek(&TokenEnum::RightBrace) && !self.peek(&TokenEnum::Comma) {
Expand Down
56 changes: 48 additions & 8 deletions src/scan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ impl<'a> Scanner<'a> {
']' => self.push_token(TokenEnum::RightBracket),
',' => self.push_token(TokenEnum::Comma),
';' => self.push_token(TokenEnum::Semicolon),
'%' => self.push_token(TokenEnum::Percent),
'^' => self.push_token(TokenEnum::Caret),
'*' => self.push_token(TokenEnum::Star),
'+' => self.push_token(TokenEnum::Plus),
'.' => {
if self.next_matches('.') {
if self.next_matches('=') {
Expand All @@ -93,16 +89,27 @@ impl<'a> Scanner<'a> {
self.push_token(TokenEnum::Dot);
}
}
'^' => {
if self.next_matches('=') {
self.push_token(TokenEnum::BitXorAssign);
} else {
self.push_token(TokenEnum::Caret)
}
}
'&' => {
if self.next_matches('&') {
self.push_token(TokenEnum::DoubleAmpersand);
} else if self.next_matches('=') {
self.push_token(TokenEnum::BitAndAssign);
} else {
self.push_token(TokenEnum::Ampersand);
}
}
'|' => {
if self.next_matches('|') {
self.push_token(TokenEnum::DoubleBar);
} else if self.next_matches('=') {
self.push_token(TokenEnum::BitOrAssign);
} else {
self.push_token(TokenEnum::Bar);
}
Expand Down Expand Up @@ -132,7 +139,11 @@ impl<'a> Scanner<'a> {
}
'>' => {
if self.next_matches('>') {
self.push_token(TokenEnum::DoubleGreaterThan);
if self.next_matches('=') {
self.push_token(TokenEnum::ShrAssign);
} else {
self.push_token(TokenEnum::DoubleGreaterThan);
}
} else if self.next_matches('=') {
self.push_token(TokenEnum::GreaterThanEquals);
} else {
Expand All @@ -141,15 +152,42 @@ impl<'a> Scanner<'a> {
}
'<' => {
if self.next_matches('<') {
self.push_token(TokenEnum::DoubleLessThan);
if self.next_matches('=') {
self.push_token(TokenEnum::ShlAssign);
} else {
self.push_token(TokenEnum::DoubleLessThan);
}
} else if self.next_matches('=') {
self.push_token(TokenEnum::LessThanEquals);
} else {
self.push_token(TokenEnum::LessThan);
}
}
'%' => {
if self.next_matches('=') {
self.push_token(TokenEnum::RemAssign);
} else {
self.push_token(TokenEnum::Percent)
}
}
'*' => {
if self.next_matches('=') {
self.push_token(TokenEnum::MulAssign);
} else {
self.push_token(TokenEnum::Star);
}
}
'+' => {
if self.next_matches('=') {
self.push_token(TokenEnum::AddAssign);
} else {
self.push_token(TokenEnum::Plus);
}
}
'/' => {
if self.next_matches('/') {
if self.next_matches('=') {
self.push_token(TokenEnum::DivAssign);
} else if self.next_matches('/') {
while !(self.peek('\n') || self.is_empty()) {
self.advance();
}
Expand All @@ -175,7 +213,9 @@ impl<'a> Scanner<'a> {
}
}
'-' => {
if self.next_matches('>') {
if self.next_matches('=') {
self.push_token(TokenEnum::SubAssign);
} else if self.next_matches('>') {
self.push_token(TokenEnum::Arrow);
} else {
let mut digits = vec!['-'];
Expand Down
30 changes: 30 additions & 0 deletions src/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,26 @@ pub enum TokenEnum {
DoubleGreaterThan,
/// `<<`.
DoubleLessThan,
/// `+=`.
AddAssign,
/// `-=`.
SubAssign,
/// `*=`.
MulAssign,
/// `/=`.
DivAssign,
/// `%=`.
RemAssign,
/// `^=`.
BitXorAssign,
/// `&=`.
BitAndAssign,
/// `|=`.
BitOrAssign,
/// `>>=`.
ShrAssign,
/// `<<=`.
ShlAssign,
}

impl std::fmt::Display for TokenEnum {
Expand Down Expand Up @@ -171,6 +191,16 @@ impl std::fmt::Display for TokenEnum {
TokenEnum::LessThanEquals => f.write_str("<="),
TokenEnum::DoubleGreaterThan => f.write_str(">>"),
TokenEnum::DoubleLessThan => f.write_str("<<"),
TokenEnum::AddAssign => f.write_str("+="),
TokenEnum::SubAssign => f.write_str("-="),
TokenEnum::MulAssign => f.write_str("*="),
TokenEnum::DivAssign => f.write_str("/="),
TokenEnum::RemAssign => f.write_str("%="),
TokenEnum::BitXorAssign => f.write_str("^="),
TokenEnum::BitAndAssign => f.write_str("&="),
TokenEnum::BitOrAssign => f.write_str("|="),
TokenEnum::ShrAssign => f.write_str(">>="),
TokenEnum::ShlAssign => f.write_str("<<="),
}
}
}
Expand Down
64 changes: 55 additions & 9 deletions tests/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ pub fn main(mode: bool, x: i16, y: u8) -> i16 {
}
";
let compiled = compile(prg).map_err(|e| pretty_print(e, prg))?;
let test_values = (-20..20).chain(vec![i16::MAX, i16::MIN].into_iter());
let test_values = (-20..20).chain(vec![i16::MAX, i16::MIN]);
for x in test_values {
for mode in [true, false] {
for y in 0..20 {
Expand Down Expand Up @@ -1036,14 +1036,8 @@ pub fn main(x: bool) -> {t} {{
0 => assert_eq!(i32::try_from(output).map_err(|e| pretty_print(e, prg))?, -3),
1 => assert_eq!(i16::try_from(output).map_err(|e| pretty_print(e, prg))?, -2),
2 => assert_eq!(i8::try_from(output).map_err(|e| pretty_print(e, prg))?, -1),
3 => assert_eq!(
bool::try_from(output).map_err(|e| pretty_print(e, prg))?,
true
),
4 => assert_eq!(
bool::try_from(output).map_err(|e| pretty_print(e, prg))?,
false
),
3 => assert!(bool::try_from(output).map_err(|e| pretty_print(e, prg))?),
4 => assert!(!(bool::try_from(output).map_err(|e| pretty_print(e, prg))?)),
_ => unreachable!(),
}
}
Expand Down Expand Up @@ -2197,3 +2191,55 @@ pub fn main(rows1: [(u8, u16); {a}], rows2: [(u8, u16, u16); {b}]) -> u16 {{
}
Ok(())
}

#[test]
fn compile_add_assign() -> Result<(), Error> {
let prg = "
pub fn main(a: u32) -> u32 {
let mut x = 3u32;
x += a;
x += 2u32;
x
}";
let compiled = compile(prg).map_err(|e| pretty_print(e, prg))?;
let mut eval = compiled.evaluator();
eval.set_u32(10);
let output = eval.run().map_err(|e| pretty_print(e, prg))?;
let r = output.into_literal().map_err(|e| pretty_print(e, prg))?;
assert_eq!(r.to_string(), "15u32");
Ok(())
}

#[test]
fn compile_operator_assignment_examples() -> Result<(), Error> {
let prg = "
pub fn main(_a: i32, _b: i32) -> () {
let mut x = 0i32;
x += 5i32;
x -= 3i32;
x *= 3i32;
x /= 2i32;
x %= 1i32;

let mut x = 0u32;
x ^= 4u32;
x &= 3u32;
x |= 2u32;
x <<= 1u8;
x >>= 1u8;

let mut b = true;
b ^= true;
b &= true;
b |= true;
}
";
let compiled = compile(prg).map_err(|e| pretty_print(e, prg))?;
let mut eval = compiled.evaluator();
eval.set_i32(0);
eval.set_i32(0);
let output = eval.run().map_err(|e| pretty_print(e, prg))?;
let r = output.into_literal().map_err(|e| pretty_print(e, prg))?;
assert_eq!(r.to_string(), "()");
Ok(())
}
4 changes: 2 additions & 2 deletions tests/panic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ pub fn main(b: bool) -> bool {
let output = eval.run()?;
let output = bool::try_from(output);
assert!(output.is_ok());
assert_eq!(output.unwrap(), false);
assert!(!output.unwrap());

let prg = "
pub fn main(b: bool) -> bool {
Expand Down Expand Up @@ -289,7 +289,7 @@ pub fn main(b: bool) -> bool {
let output = eval.run()?;
let output = bool::try_from(output);
assert!(output.is_ok());
assert_eq!(output.unwrap(), true);
assert!(output.unwrap());

let mut eval = prg.evaluator();
eval.set_bool(false);
Expand Down
2 changes: 1 addition & 1 deletion tests/smart_cookie_example.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fn smart_cookie_simple_interaction() -> Result<(), Error> {
"Luxury",
["Politics"; 20]
.into_iter()
.chain(["Luxury"; 40].into_iter())
.chain(["Luxury"; 40])
.collect::<Vec<_>>(),
);

Expand Down
Loading