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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Seeds for failure cases proptest has generated in the past. It is
# automatically read and these particular cases re-run before any
# novel cases are generated.
#
# It is recommended to check this file in to source control so that
# everyone who runs the test benefits from these saved cases.
cc 658af2bccf8d12d4c30396c9efbe63f8cb0992355943516aacdcd41221a399ed # shrinks to sign = 'i', width = 1
2 changes: 2 additions & 0 deletions compiler/noirc_frontend/src/ast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@ impl UnresolvedTypeData {
Signed(num_bits) => {
if num_bits == 128 {
Err(InvalidIntegerBitSizeError(128))
} else if num_bits == 1 {
Err(InvalidIntegerBitSizeError(1))
} else {
Ok(Integer(Signedness::Signed, IntegerBitSize::try_from(num_bits)?))
}
Expand Down
58 changes: 38 additions & 20 deletions compiler/noirc_frontend/src/parser/parser/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@ impl Parser<'_> {

#[cfg(test)]
mod tests {
use std::collections::BTreeMap;

use proptest::prelude::*;
use strum::IntoEnumIterator;

use crate::{
Expand Down Expand Up @@ -513,26 +516,41 @@ mod tests {
));
}

#[test]
fn errors_on_invalid_bit_size() {
let src = "u31";
let mut parser = Parser::for_str_with_dummy_file(src);
let typ = parser.parse_type_or_error();
assert_eq!(typ.typ, UnresolvedTypeData::Error);
assert_eq!(parser.errors.len(), 1);
let error = &parser.errors[0];
assert!(matches!(error.reason(), Some(ParserErrorReason::InvalidBitSize(..))));
}

#[test]
fn errors_on_i128() {
let src = "i128";
let mut parser = Parser::for_str_with_dummy_file(src);
let typ = parser.parse_type_or_error();
assert_eq!(typ.typ, UnresolvedTypeData::Error);
assert_eq!(parser.errors.len(), 1);
let error = &parser.errors[0];
assert!(matches!(error.reason(), Some(ParserErrorReason::InvalidBitSize(..))));
proptest! {
#[test]
fn parses_only_expected_types(sign in proptest::prop_oneof![Just('u'), Just('i')], width: u8) {
let accepted_types = BTreeMap::from([
("u1", UnresolvedTypeData::Integer(Signedness::Unsigned, IntegerBitSize::One)),
("u8", UnresolvedTypeData::Integer(Signedness::Unsigned, IntegerBitSize::Eight)),
("u16", UnresolvedTypeData::Integer(Signedness::Unsigned, IntegerBitSize::Sixteen)),
("u32", UnresolvedTypeData::Integer(Signedness::Unsigned, IntegerBitSize::ThirtyTwo)),
("u64", UnresolvedTypeData::Integer(Signedness::Unsigned, IntegerBitSize::SixtyFour)),
(
"u128",
UnresolvedTypeData::Integer(
Signedness::Unsigned,
IntegerBitSize::HundredTwentyEight,
),
),
("i8", UnresolvedTypeData::Integer(Signedness::Signed, IntegerBitSize::Eight)),
("i16", UnresolvedTypeData::Integer(Signedness::Signed, IntegerBitSize::Sixteen)),
("i32", UnresolvedTypeData::Integer(Signedness::Signed, IntegerBitSize::ThirtyTwo)),
("i64", UnresolvedTypeData::Integer(Signedness::Signed, IntegerBitSize::SixtyFour)),
]);

let src = format!("{sign}{width}");
let mut parser = Parser::for_str_with_dummy_file(&src);
let typ = parser.parse_type_or_error();

if let Some(expected_typ) = accepted_types.get(&src.as_str()) {
assert_eq!(&typ.typ, expected_typ);
} else {
assert_eq!(typ.typ, UnresolvedTypeData::Error);
assert_eq!(parser.errors.len(), 1);
let error = &parser.errors[0];
assert!(matches!(error.reason(), Some(ParserErrorReason::InvalidBitSize(..))));
}
}
}

#[test]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fn main(b: [[i1; 1]; 1]) -> pub [[i1; 1]; 1] {
fn main(b: [[u1; 1]; 1]) -> pub [[u1; 1]; 1] {
if (b[0][0] == b[0][0]) {
b
} else {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading