github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-23 20:28:36 +00:00
Code Issues Projects Releases Wiki Activity

check return statement count is one

Browse source
This commit is contained in:
schaeff 2021-02-04 19:53:50 +01:00
parent 76f1c0742d
commit 53d9a37f69
3 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zokrates_cli/examples/compile_errors/no_return.zok Normal file
View file

@ -0,0 +1,4 @@
def foo():
def main():
return

3
zokrates_cli/examples/compile_errors/two_return.zok Normal file
View file

@ -0,0 +1,3 @@
def main():
return
return

25
zokrates_core/src/semantics.rs
View file

@ -651,6 +651,8 @@ impl<'ast> Checker<'ast> {
) -> Result<TypedFunction<'ast, T>, Vec<ErrorInner>> {
self.enter_scope();
let pos = funct_node.pos();
let mut errors = vec![];
let funct = funct_node.value;
let mut arguments_checked = vec![];
@ -672,19 +674,30 @@ impl<'ast> Checker<'ast> {
match self.check_signature(funct.signature, module_id, types) {
Ok(s) => {
let mut found_return = false;
for stat in funct.statements.into_iter() {
let pos = stat.pos();
let pos = Some(stat.pos());
match self.check_statement(stat, module_id, types) {
Ok(statement) => {
match &statement {
TypedStatement::Return(e) => {
if found_return {
errors.push(ErrorInner {
pos,
message: format!("Expected a single return statement",),
});
}
found_return = true;
match e.iter().map(|e| e.get_type()).collect::<Vec<_>>()
== s.outputs
{
true => {}
false => errors.push(ErrorInner {
pos: Some(pos),
pos,
message: format!(
"Expected ({}) in return statement, found ({})",
s.outputs
@ -710,6 +723,14 @@ impl<'ast> Checker<'ast> {
}
}
}
if !found_return {
errors.push(ErrorInner {
pos: Some(pos),
message: format!("Expected a return statement",),
});
}
signature = Some(s);
}
Err(e) => {