Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions compiler/noirc_evaluator/src/ssa/parser/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,13 @@ pub(crate) enum ParsedInstruction {
EnableSideEffectsIf {
condition: ParsedValue,
},
IfElse {
target: Identifier,
then_condition: ParsedValue,
then_value: ParsedValue,
else_condition: ParsedValue,
else_value: ParsedValue,
},
IncrementRc {
value: ParsedValue,
},
Expand Down
16 changes: 16 additions & 0 deletions compiler/noirc_evaluator/src/ssa/parser/into_ssa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,22 @@ impl Translator {
let condition = self.translate_value(condition)?;
self.builder.insert_enable_side_effects_if(condition);
}
ParsedInstruction::IfElse {
target,
then_condition,
then_value,
else_condition,
else_value,
} => {
let then_condition = self.translate_value(then_condition)?;
let then_value = self.translate_value(then_value)?;
let else_condition = self.translate_value(else_condition)?;
let else_value = self.translate_value(else_value)?;
let instruction =
Instruction::IfElse { then_condition, then_value, else_condition, else_value };
let value_id = self.builder.insert_instruction(instruction, None).first();
self.define_variable(target, value_id)?;
}
ParsedInstruction::IncrementRc { value } => {
let value = self.translate_value(value)?;
self.builder.increment_array_reference_count(value);
Expand Down
19 changes: 19 additions & 0 deletions compiler/noirc_evaluator/src/ssa/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,25 @@ impl<'a> Parser<'a> {
return Ok(ParsedInstruction::Truncate { target, value, bit_size, max_bit_size });
}

if self.eat_keyword(Keyword::If)? {
let then_condition = self.parse_value_or_error()?;
self.eat_or_error(Token::Keyword(Keyword::Then))?;
let then_value = self.parse_value_or_error()?;
self.eat_or_error(Token::Keyword(Keyword::Else))?;
self.eat_or_error(Token::LeftParen)?;
self.eat_or_error(Token::Keyword(Keyword::If))?;
let else_condition = self.parse_value_or_error()?;
self.eat_or_error(Token::RightParen)?;
let else_value = self.parse_value_or_error()?;
return Ok(ParsedInstruction::IfElse {
target,
then_condition,
then_value,
else_condition,
else_value,
});
}

if let Some(op) = self.eat_binary_op()? {
let lhs = self.parse_value_or_error()?;
self.eat_or_error(Token::Comma)?;
Expand Down
12 changes: 12 additions & 0 deletions compiler/noirc_evaluator/src/ssa/parser/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -610,3 +610,15 @@ fn parses_purity() {
";
assert_ssa_roundtrip(src);
}

#[test]
fn test_parses_if_else() {
let src = "
acir(inline) fn main f0 {
b0(v0: u1, v1: u1):
v4 = if v0 then Field 1 else (if v1) Field 2
return v4
}
";
assert_ssa_roundtrip(src);
}
3 changes: 3 additions & 0 deletions compiler/noirc_evaluator/src/ssa/parser/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ pub(crate) enum Keyword {
Fold,
Fn,
Function,
If,
Impure,
IncRc,
Index,
Expand Down Expand Up @@ -196,6 +197,7 @@ impl Keyword {
"else" => Keyword::Else,
"enable_side_effects" => Keyword::EnableSideEffects,
"eq" => Keyword::Eq,
"if" => Keyword::If,
"impure" => Keyword::Impure,
"inline" => Keyword::Inline,
"inline_always" => Keyword::InlineAlways,
Expand Down Expand Up @@ -267,6 +269,7 @@ impl Display for Keyword {
Keyword::Fold => write!(f, "fold"),
Keyword::Fn => write!(f, "fn"),
Keyword::Function => write!(f, "function"),
Keyword::If => write!(f, "if"),
Keyword::Impure => write!(f, "impure"),
Keyword::IncRc => write!(f, "inc_rc"),
Keyword::Index => write!(f, "index"),
Expand Down
Loading