ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-26 11:45:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #654 from AleoHQ/field-group-fix

Browse Source 
Fix field/group addition
This commit is contained in:
Collin Chin 2021-02-11 17:43:32 -08:00 committed by GitHub
commit 29fa7cf19e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asg/src/expression/binary.rs
View File

@ -134,10 +134,12 @@ impl FromAst<leo_ast::BinaryExpression> for BinaryExpression {
},
BinaryOperationClass::Numeric => match expected_type {
Some(x @ PartialType::Integer(_, _)) => Some(x),
Some(x @ PartialType::Type(Type::Field)) => Some(x),
Some(x @ PartialType::Type(Type::Group)) => Some(x),
Some(x) => {
return Err(AsgConvertError::unexpected_type(
&x.to_string(),
Some("integer"),
Some("integer, field, or group"),
&value.span,
));
}

10
asg/tests/pass/field/mod.rs
View File

@ -28,6 +28,16 @@ fn test_add() {
load_asg(program_string).unwrap();
}
#[test]
fn test_add_explicit() {
let program_string = r#"
function main() {
let c: field = 0field + 1field;
}
"#;
load_asg(program_string).unwrap();
}
#[test]
fn test_sub() {
let program_string = include_str!("sub.leo");

10
asg/tests/pass/group/mod.rs
View File

@ -104,6 +104,16 @@ fn test_add() {
load_asg(program_string).unwrap();
}
#[test]
fn test_add_explicit() {
let program_string = r#"
function main() {
let c: group = 0group + 1group;
}
"#;
load_asg(program_string).unwrap();
}
#[test]
fn test_sub() {
let program_string = include_str!("sub.leo");