Merge pull request #912 from AleoHQ/bug/909-const-vars-not-enforced

Bug 909 Fix const vars not enforced
This commit is contained in:
Alessandro Coglio 2021-05-05 14:33:46 -07:00 committed by GitHub
commit 7450e27de3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 80 additions and 47 deletions

View File

@ -172,6 +172,16 @@ impl AsgConvertError {
) )
} }
pub fn invalid_const_assign(name: &str, span: &Span) -> Self {
Self::new_from_span(
format!(
"failed to create const variable(s) '{}' with non constant values.",
name
),
span,
)
}
pub fn duplicate_function_definition(name: &str, span: &Span) -> Self { pub fn duplicate_function_definition(name: &str, span: &Span) -> Self {
Self::new_from_span( Self::new_from_span(
format!("a function named \"{}\" already exists in this scope", name), format!("a function named \"{}\" already exists in this scope", name),

View File

@ -75,6 +75,17 @@ impl<'a> FromAst<'a, leo_ast::DefinitionStatement> for &'a Statement<'a> {
let value = <&Expression<'a>>::from_ast(scope, &statement.value, type_.clone().map(Into::into))?; let value = <&Expression<'a>>::from_ast(scope, &statement.value, type_.clone().map(Into::into))?;
if matches!(statement.declaration_type, leo_ast::Declare::Const) && !value.is_consty() {
let var_names = statement
.variable_names
.iter()
.map(ToString::to_string)
.collect::<Vec<String>>()
.join(" ,");
return Err(AsgConvertError::invalid_const_assign(&var_names, &statement.span));
}
let type_ = type_.or_else(|| value.get_type()); let type_ = type_.or_else(|| value.get_type());
let mut output_types = vec![]; let mut output_types = vec![];

View File

@ -2,7 +2,7 @@ function main(s: bool, c: address) {
const a = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8; const a = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
const b = aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r; const b = aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r;
const r = s? a: b; let r = s ? a: b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,4 +1,4 @@
function main () { function main () {
let b = false; const b = false;
const a = !b; const a = !b;
} }

View File

@ -1,14 +1,14 @@
circuit PedersenHash { circuit PedersenHash {
parameters: [u32; 512] parameters: [u32; 512]
function new(parameters: [u32; 512]) -> Self { function new(const parameters: [u32; 512]) -> Self {
return Self { parameters: parameters }; return Self { parameters: parameters };
} }
function hash(self, bits: [bool; 512]) -> u32 { function hash(self, const bits: [bool; 512]) -> u32 {
let digest: u32 = 0; let digest: u32 = 0;
for i in 0..512 { for i in 0..512 {
const base = bits[i] ? self.parameters[i] : 0u32; let base = bits[i] ? self.parameters[i] : 0u32;
digest += base; digest += base;
} }
return digest; return digest;

View File

@ -1,7 +1,7 @@
import core.unstable.blake2s.Blake2s; import core.unstable.blake2s.Blake2s;
function main(seed: [u8; 32], message: [u8; 32], expected: [u8; 32]) { function main(seed: [u8; 32], message: [u8; 32], expected: [u8; 32]) {
const actual = Blake2s::hash(seed, message); let actual = Blake2s::hash(seed, message);
console.assert(expected == actual); console.assert(expected == actual);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: field, b: field, c: field) { function main(s: bool, a: field, b: field, c: field) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,3 +1,3 @@
function main(a: group) { function main(a: group) {
const b = a; let b = a;
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: group, b: group, c: group) { function main(s: bool, a: group, b: group, c: group) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i128, b: i128, c: i128) { function main(s: bool, a: i128, b: i128, c: i128) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i16, b: i16, c: i16) { function main(s: bool, a: i16, b: i16, c: i16) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i32, b: i32, c: i32) { function main(s: bool, a: i32, b: i32, c: i32) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i64, b: i64, c: i64) { function main(s: bool, a: i64, b: i64, c: i64) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i8, b: i8, c: i8) { function main(s: bool, a: i8, b: i8, c: i8) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u128, b: u128, c: u128) { function main(s: bool, a: u128, b: u128, c: u128) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u16, b: u16, c: u16) { function main(s: bool, a: u16, b: u16, c: u16) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u32, b: u32, c: u32) { function main(s: bool, a: u32, b: u32, c: u32) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u64, b: u64, c: u64) { function main(s: bool, a: u64, b: u64, c: u64) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u8, b: u8, c: u8) { function main(s: bool, a: u8, b: u8, c: u8) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main () { function main () {
let x = 2u8; let x = 2u8;
let y = x; let y = x;
const z = y / 2u8; let z = y / 2u8;
} }

View File

@ -1,6 +1,6 @@
// Swap two elements of an array. // Swap two elements of an array.
function swap(a: [u32; 2], const i: u32, const j: u32) -> [u32; 2] { function swap(a: [u32; 2], const i: u32, const j: u32) -> [u32; 2] {
const t = a[i]; let t = a[i];
a[i] = a[j]; a[i] = a[j];
a[j] = t; a[j] = t;
return a; return a;
@ -11,7 +11,7 @@ function main() {
const expected: [u32; 2] = [1, 0]; const expected: [u32; 2] = [1, 0];
// Do swap. // Do swap.
const actual = swap(arr, 0, 1); let actual = swap(arr, 0, 1);
// Check result. // Check result.
for i in 0..2 { for i in 0..2 {

View File

@ -7,7 +7,7 @@ function main(a: bool) {
} }
} }
const r: u32 = a ? 6 : 0; let r: u32 = a ? 6 : 0;
console.assert(r == b); console.assert(r == b);
} }

View File

@ -1,5 +1,5 @@
function main(a: bool, b: bool) { function main(a: bool, b: bool) {
const c = a ? true : false; let c = a ? true : false;
const d = c == b; let d = c == b;
} }

View File

@ -2,7 +2,7 @@ function main(s: bool, c: address) {
const a = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8; const a = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
const b = aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r; const b = aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r;
const r = s? a: b; let r = s ? a: b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,4 +1,4 @@
function main () { function main () {
let b = false; const b = false;
const a = !b; const a = !b;
} }

View File

@ -1,14 +1,14 @@
circuit PedersenHash { circuit PedersenHash {
parameters: [u32; 512] parameters: [u32; 512]
function new(parameters: [u32; 512]) -> Self { function new(const parameters: [u32; 512]) -> Self {
return Self { parameters: parameters }; return Self { parameters: parameters };
} }
function hash(self, bits: [bool; 512]) -> u32 { function hash(self, const bits: [bool; 512]) -> u32 {
let digest: u32 = 0; let digest: u32 = 0;
for i in 0..512 { for i in 0..512 {
const base = bits[i] ? self.parameters[i] : 0u32; let base = bits[i] ? self.parameters[i] : 0u32;
digest += base; digest += base;
} }
return digest; return digest;

View File

@ -1,7 +1,7 @@
import core.unstable.blake2s.Blake2s; import core.unstable.blake2s.Blake2s;
function main(seed: [u8; 32], message: [u8; 32], expected: [u8; 32]) { function main(seed: [u8; 32], message: [u8; 32], expected: [u8; 32]) {
const actual = Blake2s::hash(seed, message); let actual = Blake2s::hash(seed, message);
console.assert(expected == actual); console.assert(expected == actual);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i128, b: i128, c: i128) { function main(s: bool, a: i128, b: i128, c: i128) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i16, b: i16, c: i16) { function main(s: bool, a: i16, b: i16, c: i16) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i32, b: i32, c: i32) { function main(s: bool, a: i32, b: i32, c: i32) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i64, b: i64, c: i64) { function main(s: bool, a: i64, b: i64, c: i64) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: i8, b: i8, c: i8) { function main(s: bool, a: i8, b: i8, c: i8) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u128, b: u128, c: u128) { function main(s: bool, a: u128, b: u128, c: u128) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u16, b: u16, c: u16) { function main(s: bool, a: u16, b: u16, c: u16) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u32, b: u32, c: u32) { function main(s: bool, a: u32, b: u32, c: u32) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u64, b: u64, c: u64) { function main(s: bool, a: u64, b: u64, c: u64) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main(s: bool, a: u8, b: u8, c: u8) { function main(s: bool, a: u8, b: u8, c: u8) {
const r = s ? a : b; let r = s ? a : b;
console.assert(r == c); console.assert(r == c);
} }

View File

@ -1,5 +1,5 @@
function main () { function main () {
let x = 2u8; let x = 2u8;
let y = x; let y = x;
const z = y / 2u8; let z = y / 2u8;
} }

View File

@ -1,6 +1,6 @@
// Swap two elements of an array. // Swap two elements of an array.
function swap(a: [u32; 2], const i: u32, const j: u32) -> [u32; 2] { function swap(a: [u32; 2], const i: u32, const j: u32) -> [u32; 2] {
const t = a[i]; let t = a[i];
a[i] = a[j]; a[i] = a[j];
a[j] = t; a[j] = t;
return a; return a;
@ -11,7 +11,7 @@ function main() {
const expected: [u32; 2] = [1, 0]; const expected: [u32; 2] = [1, 0];
// Do swap. // Do swap.
const actual = swap(arr, 0, 1); let actual = swap(arr, 0, 1);
// Check result. // Check result.
for i in 0..2 { for i in 0..2 {

View File

@ -7,7 +7,7 @@ function main(a: bool) {
} }
} }
const r: u32 = a ? 6 : 0; let r: u32 = a ? 6 : 0;
console.assert(r == b); console.assert(r == b);
} }

View File

@ -47,6 +47,14 @@ fn test_ternary_basic() {
assert_satisfied(program); assert_satisfied(program);
} }
#[test]
fn test_ternary_non_const_conditional_fail() {
let program_string = include_str!("ternary_non_const_conditional_fail.leo");
let error = parse_program(program_string).err().unwrap();
expect_asg_error(error);
}
// Iteration for i {start}..{stop} { statements } // Iteration for i {start}..{stop} { statements }
#[test] #[test]

View File

@ -1,5 +1,5 @@
function main(a: bool, b: bool) { function main(a: bool, b: bool) {
const c = a ? true : false; let c = a ? true : false;
const d = c == b; let d = c == b;
} }

View File

@ -0,0 +1,4 @@
function main() {
let x = 3u8;
const y = x > 2u8? 1u8 : 2u8;
}