Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • llvm/hercules
1 result
Show changes
......@@ -27,6 +27,10 @@ Stmt -> Stmt
{ Stmt::ExprStmt { span: $span, exp: $1 } }
| 'fixpoint' FixpointLimit '{' Schedule '}'
{ Stmt::Fixpoint { span: $span, limit: $2, body: Box::new($4) } }
| 'if' Expr '{' Schedule '}'
{ Stmt::IfThenElse { span: $span, cond: $2, thn: Box::new($4), els: None } }
| 'if' Expr '{' Schedule '}' 'else' '{' Schedule '}'
{ Stmt::IfThenElse { span: $span, cond: $2, thn: Box::new($4), els: Some(Box::new($8)) } }
| MacroDecl
{ Stmt::MacroDecl { span: $span, def: $1 } }
;
......@@ -163,6 +167,7 @@ pub enum Stmt {
AssignStmt { span: Span, var: Span, rhs: Expr },
ExprStmt { span: Span, exp: Expr },
Fixpoint { span: Span, limit: FixpointLimit, body: Box<OperationList> },
IfThenElse { span: Span, cond: Expr, thn: Box<OperationList>, els: Option<Box<OperationList>> },
MacroDecl { span: Span, def: MacroDecl },
}
......
......@@ -16,6 +16,7 @@ use juno_utils::stringtab::StringTable;
use std::cell::RefCell;
use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
use std::env;
use std::fmt;
use std::fs::File;
use std::io::Write;
......@@ -1199,6 +1200,23 @@ fn schedule_interpret(
// were made
Ok(i > 1)
}
ScheduleStmt::IfThenElse { cond, thn, els } => {
let (cond, modified) = interp_expr(pm, cond, stringtab, env, functions)?;
let Value::Boolean { val: cond } = cond else {
return Err(SchedulerError::SemanticError(
"Condition must be a boolean value".to_string(),
));
};
let changed = schedule_interpret(
pm,
if cond { &*thn } else { &*els },
stringtab,
env,
functions,
)?;
Ok(modified || changed)
}
ScheduleStmt::Block { body } => {
let mut modified = false;
env.open_scope();
......@@ -1339,7 +1357,10 @@ fn interp_expr(
}
}
Value::Record { fields } => match fields.get(field) {
None => Err(SchedulerError::UndefinedField(field.clone())),
None => Err(SchedulerError::UndefinedField(format!(
"{} not in {:?}",
field, fields
))),
Some(v) => Ok((v.clone(), changed)),
},
}
......@@ -1443,6 +1464,23 @@ fn interp_expr(
changed,
))
}
ScheduleExp::Feature { feature } => {
let (feature, modified) = interp_expr(pm, &*feature, stringtab, env, functions)?;
let Value::String { val } = feature else {
return Err(SchedulerError::SemanticError(
"Feature expects a single string argument (instead of a selection)".to_string(),
));
};
// To test for features, the scheduler needs to be invoked from a build script so that
// Cargo provides the enabled features via environment variables
let key = "CARGO_FEATURE_".to_string() + &val.to_uppercase().replace("-", "_");
Ok((
Value::Boolean {
val: env::var(key).is_ok(),
},
modified,
))
}
ScheduleExp::Record { fields } => {
let mut result = HashMap::new();
let mut changed = false;
......