ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-09-20 18:31:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

update to lastest master, with FormatString rename

Browse Source
This commit is contained in:
gluax 2021-04-15 16:55:48 -04:00
commit 0016a1beaa
261 changed files with 1185 additions and 1359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.circleci/config.yml
View File

@ -171,18 +171,18 @@ jobs:
export LEO=/home/circleci/project/project/bin/leo
./project/.circleci/leo-login-logout.sh
leo-clone:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- attach_workspace:
at: /home/circleci/project/
- run:
name: leo clone
command: |
export LEO=/home/circleci/project/project/bin/leo
./project/.circleci/leo-clone.sh
# leo-clone:
# docker:
# - image: cimg/rust:1.51.0
# resource_class: xlarge
# steps:
# - attach_workspace:
# at: /home/circleci/project/
# - run:
# name: leo clone
# command: |
# export LEO=/home/circleci/project/project/bin/leo
# ./project/.circleci/leo-clone.sh
leo-publish:
docker:
@ -222,9 +222,9 @@ workflows:
- leo-login-logout:
requires:
- leo-executable
- leo-clone:
requires:
- leo-executable
# - leo-clone:
# requires:
# - leo-executable
- leo-publish:
requires:
- leo-executable

10
.circleci/leo-login-logout.sh
View File

@ -1,7 +1,15 @@
# leo login & logout
$LEO new my-app && cd my-app || exit 1
$LEO login -u "$ALEO_PM_USERNAME" -p "$ALEO_PM_PASSWORD"
$LEO new my-app && cd my-app || exit 1
cat Leo.toml
# verify that in Leo.toml there's no line with [AUTHOR];
# since CI does not allow showing credentials, we won't see it in the file;
# so the only way to test is to make sure that there's just no [AUTHOR] there
[[ $(cat Leo.toml | grep "\[AUTHOR\]" | wc -l) -eq 0 ]] || exit 1
$LEO add howard/silly-sudoku
$LEO remove silly-sudoku
$LEO logout

5
.circleci/leo-new.sh
View File

@ -1,4 +1,9 @@
$LEO new hello-world
ls -la
cd hello-world && ls -la
# verify that in Leo.toml there's a placeholder for author
# because at the time of calling `leo new` user is not logged in
[[ $(cat Leo.toml | grep "\[AUTHOR\]" | wc -l) -eq 1 ]] || exit 1
$LEO run

0
.circleci/r Normal file
View File

2
.resources/release-version
View File

@ -1 +1 @@
v1.3.0
v1.4.0

34
Cargo.lock generated
View File

@ -4,9 +4,9 @@ version = 3
[[package]]
name = "abnf"
version = "0.10.2"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd8863e7db43447ad50376e19b0549343b72ad45cbd394b3fc8fe3ede961facc"
checksum = "96e669320c520d87931e752d603dd442b4709c73b1b8b1fcba838f9c5acc1791"
dependencies = [
"abnf-core",
"nom 6.1.2",
@ -1246,7 +1246,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "leo-abnf"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"abnf",
"anyhow",
@ -1254,7 +1254,7 @@ dependencies = [
[[package]]
name = "leo-asg"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"criterion",
"indexmap",
@ -1270,14 +1270,14 @@ dependencies = [
[[package]]
name = "leo-asg-passes"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"leo-asg",
]
[[package]]
name = "leo-ast"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"anyhow",
"criterion",
@ -1292,7 +1292,7 @@ dependencies = [
[[package]]
name = "leo-compiler"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"bincode",
"hex",
@ -1327,7 +1327,7 @@ dependencies = [
[[package]]
name = "leo-imports"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"indexmap",
"leo-asg",
@ -1339,7 +1339,7 @@ dependencies = [
[[package]]
name = "leo-input"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"from-pest",
"pest",
@ -1351,7 +1351,7 @@ dependencies = [
[[package]]
name = "leo-lang"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"ansi_term 0.12.1",
"anyhow",
@ -1391,11 +1391,11 @@ dependencies = [
[[package]]
name = "leo-linter"
version = "1.3.0"
version = "1.4.0"
[[package]]
name = "leo-package"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"lazy_static",
"serde",
@ -1408,7 +1408,7 @@ dependencies = [
[[package]]
name = "leo-parser"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"criterion",
"indexmap",
@ -1424,7 +1424,7 @@ dependencies = [
[[package]]
name = "leo-state"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"indexmap",
"leo-ast",
@ -1442,7 +1442,7 @@ dependencies = [
[[package]]
name = "leo-synthesizer"
version = "1.3.0"
version = "1.4.0"
dependencies = [
"num-bigint",
"serde",
@ -1739,9 +1739,9 @@ dependencies = [
[[package]]
name = "notify"
version = "4.0.15"
version = "4.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
checksum = "2599080e87c9bd051ddb11b10074f4da7b1223298df65d4c2ec5bcf309af1533"
dependencies = [
"bitflags",
"filetime",

21
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "leo-lang"
version = "1.3.0"
version = "1.4.0"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "The Leo programming language"
homepage = "https://aleo.org"
@ -42,31 +42,31 @@ members = [
[dependencies.leo-ast]
path = "./ast"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-compiler]
path = "./compiler"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-imports]
path = "./imports"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-input]
path = "./input"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-package]
path = "./package"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-state]
path = "./state"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-synthesizer]
path = "./synthesizer"
version = "1.3.0"
version = "1.4.0"
[dependencies.snarkvm-algorithms]
version = "0.2.2"
@ -111,7 +111,7 @@ version = "0.3.1"
version = "1.4.0"
[dependencies.notify]
version = "4.0.15"
version = "4.0.16"
[dependencies.rand]
version = "0.8"
@ -150,8 +150,7 @@ features = [ "fmt" ]
[dependencies.zip]
version = "0.5"
# add ansi support for Windows builds
[target.'cfg(windows)'.dependencies.ansi_term]
[target."cfg(windows)".dependencies.ansi_term]
version = "0.12.1"
[dev-dependencies.rusty-hook]

4
asg-passes/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "leo-asg-passes"
version = "1.3.0"
version = "1.4.0"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "The Leo programming language"
homepage = "https://aleo.org"
@ -22,4 +22,4 @@ path = "src/lib.rs"
[dependencies.leo-asg]
path = "../asg"
version = "1.3.0"
version = "1.4.0"

6
asg/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "leo-asg"
version = "1.3.0"
version = "1.4.0"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "ASG of the Leo programming language"
homepage = "https://aleo.org"
@ -30,11 +30,11 @@ version = "1.6"
version = "1.0"
[dependencies.leo-ast]
version = "1.3.0"
version = "1.4.0"
path = "../ast"
[dependencies.leo-parser]
version = "1.3.0"
version = "1.4.0"
path = "../parser"
[dependencies.num-bigint]

2
asg/src/checks/return_path.rs
View File

@ -92,7 +92,7 @@ impl<'a> MonoidalReducerStatement<'a, BoolAnd> for ReturnPathReducer {
if_true.append(if_false.unwrap_or(BoolAnd(false)))
}
fn reduce_formatted_string(&mut self, input: &FormattedString, parameters: Vec<BoolAnd>) -> BoolAnd {
fn reduce_formatted_string(&mut self, input: &FormatString, parameters: Vec<BoolAnd>) -> BoolAnd {
BoolAnd(false)
}

2
asg/src/expression/call.rs
View File

@ -71,7 +71,7 @@ impl<'a> ExpressionNode<'a> for CallExpression<'a> {
}
fn is_mut_ref(&self) -> bool {
false
true
}
fn const_value(&self) -> Option<ConstValue> {

7
asg/src/expression/variable_ref.rs
View File

@ -137,13 +137,6 @@ impl<'a> FromAst<'a, leo_ast::Identifier> for &'a Expression<'a> {
expected_type: Option<PartialType<'a>>,
) -> Result<&'a Expression<'a>, AsgConvertError> {
let variable = if value.name.as_ref() == "input" {
if let Some(function) = scope.resolve_current_function() {
if !function.has_input {
return Err(AsgConvertError::unresolved_reference(&value.name, &value.span));
}
} else {
return Err(AsgConvertError::unresolved_reference(&value.name, &value.span));
}
if let Some(input) = scope.resolve_input() {
input.container
} else {

2
asg/src/prelude.rs
View File

@ -29,7 +29,7 @@ pub fn resolve_core_module<'a>(context: AsgContext<'a>, module: &str) -> Result<
r#"
circuit Blake2s {
function hash(seed: [u8; 32], message: [u8; 32]) -> [u8; 32] {
return [0; 32]
return [0; 32];
}
}
"#,

6
asg/src/program/function.rs
View File

@ -47,7 +47,6 @@ pub struct Function<'a> {
pub id: u32,
pub name: RefCell<Identifier>,
pub output: Type<'a>,
pub has_input: bool,
pub arguments: IndexMap<String, Cell<&'a Variable<'a>>>,
pub circuit: Cell<Option<&'a Circuit<'a>>>,
pub span: Option<Span>,
@ -77,16 +76,12 @@ impl<'a> Function<'a> {
.transpose()?
.unwrap_or_else(|| Type::Tuple(vec![]));
let mut qualifier = FunctionQualifier::Static;
let mut has_input = false;
let new_scope = scope.make_subscope();
let mut arguments = IndexMap::new();
{
for input in value.input.iter() {
match input {
FunctionInput::InputKeyword(_) => {
has_input = true;
}
FunctionInput::SelfKeyword(_) => {
qualifier = FunctionQualifier::SelfRef;
}
@ -125,7 +120,6 @@ impl<'a> Function<'a> {
id: scope.context.get_id(),
name: RefCell::new(value.identifier.clone()),
output,
has_input,
arguments,
circuit: Cell::new(None),
body: Cell::new(None),

2
asg/src/reducer/monoidal_director.rs
View File

@ -225,7 +225,7 @@ impl<'a, T: Monoid, R: MonoidalReducerStatement<'a, T>> MonoidalDirector<'a, T,
.reduce_conditional_statement(input, condition, if_true, if_false)
}
pub fn reduce_formatted_string(&mut self, input: &FormattedString<'a>) -> T {
pub fn reduce_formatted_string(&mut self, input: &FormatString<'a>) -> T {
let parameters = input
.parameters
.iter()

2
asg/src/reducer/monoidal_reducer.rs
View File

@ -118,7 +118,7 @@ pub trait MonoidalReducerStatement<'a, T: Monoid>: MonoidalReducerExpression<'a,
condition.append(if_true).append_option(if_false)
}
fn reduce_formatted_string(&mut self, input: &FormattedString<'a>, parameters: Vec<T>) -> T {
fn reduce_formatted_string(&mut self, input: &FormatString<'a>, parameters: Vec<T>) -> T {
T::default().append_all(parameters.into_iter())
}

2
asg/src/reducer/reconstructing_director.rs
View File

@ -243,7 +243,7 @@ impl<'a, R: ReconstructingReducerStatement<'a>> ReconstructingDirector<'a, R> {
.reduce_conditional_statement(input, condition, if_true, if_false)
}
pub fn reduce_formatted_string(&mut self, input: FormattedString<'a>) -> FormattedString<'a> {
pub fn reduce_formatted_string(&mut self, input: FormatString<'a>) -> FormatString<'a> {
let parameters = input
.parameters
.iter()

8
asg/src/reducer/reconstructing_reducer.rs
View File

@ -274,10 +274,10 @@ pub trait ReconstructingReducerStatement<'a>: ReconstructingReducerExpression<'a
fn reduce_formatted_string(
&mut self,
input: FormattedString<'a>,
input: FormatString<'a>,
parameters: Vec<&'a Expression<'a>>,
) -> FormattedString<'a> {
FormattedString {
) -> FormatString<'a> {
FormatString {
span: input.span,
parts: input.parts,
parameters: parameters.into_iter().map(Cell::new).collect(),
@ -293,7 +293,7 @@ pub trait ReconstructingReducerStatement<'a>: ReconstructingReducerExpression<'a
})
}
fn reduce_console_log(&mut self, input: ConsoleStatement<'a>, argument: FormattedString<'a>) -> Statement<'a> {
fn reduce_console_log(&mut self, input: ConsoleStatement<'a>, argument: FormatString<'a>) -> Statement<'a> {
assert!(!matches!(input.function, ConsoleFunction::Assert(_)));
Statement::Console(ConsoleStatement {
parent: input.parent,

2
asg/src/reducer/visitor.rs
View File

@ -120,7 +120,7 @@ pub trait StatementVisitor<'a>: ExpressionVisitor<'a> {
Default::default()
}
fn visit_formatted_string(&mut self, input: &FormattedString<'a>) -> VisitResult {
fn visit_formatted_string(&mut self, input: &FormatString<'a>) -> VisitResult {
Default::default()
}

2
asg/src/reducer/visitor_director.rs
View File

@ -319,7 +319,7 @@ impl<'a, R: StatementVisitor<'a>> VisitorDirector<'a, R> {
}
}
pub fn visit_formatted_string(&mut self, input: &FormattedString<'a>) -> ConcreteVisitResult {
pub fn visit_formatted_string(&mut self, input: &FormatString<'a>) -> ConcreteVisitResult {
match self.visitor.visit_formatted_string(input) {
VisitResult::VisitChildren => {
for parameter in input.parameters.iter() {

7
asg/src/statement/assign.rs
View File

@ -70,13 +70,6 @@ impl<'a> FromAst<'a, leo_ast::AssignStatement> for &'a Statement<'a> {
let (name, span) = (&statement.assignee.identifier.name, &statement.assignee.identifier.span);
let variable = if name.as_ref() == "input" {
if let Some(function) = scope.resolve_current_function() {
if !function.has_input {
return Err(AsgConvertError::unresolved_reference(name, &span));
}
} else {
return Err(AsgConvertError::unresolved_reference(name, &span));
}
if let Some(input) = scope.resolve_input() {
input.container
} else {

32
asg/src/statement/console.rs
View File

@ -15,14 +15,14 @@
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
use crate::{AsgConvertError, Expression, FromAst, Node, PartialType, Scope, Span, Statement, Type};
use leo_ast::{ConsoleFunction as AstConsoleFunction, FormattedStringPart};
use leo_ast::{ConsoleFunction as AstConsoleFunction, FormatStringPart};
use std::cell::Cell;
// TODO (protryon): Refactor to not require/depend on span
#[derive(Clone)]
pub struct FormattedString<'a> {
pub parts: Vec<FormattedStringPart>,
pub struct FormatString<'a> {
pub parts: Vec<FormatStringPart>,
pub parameters: Vec<Cell<&'a Expression<'a>>>,
pub span: Span,
}
@ -30,9 +30,9 @@ pub struct FormattedString<'a> {
#[derive(Clone)]
pub enum ConsoleFunction<'a> {
Assert(Cell<&'a Expression<'a>>),
Debug(FormattedString<'a>),
Error(FormattedString<'a>),
Log(FormattedString<'a>),
Debug(FormatString<'a>),
Error(FormatString<'a>),
Log(FormatString<'a>),
}
#[derive(Clone)]
@ -48,16 +48,16 @@ impl<'a> Node for ConsoleStatement<'a> {
}
}
impl<'a> FromAst<'a, leo_ast::FormattedString> for FormattedString<'a> {
impl<'a> FromAst<'a, leo_ast::FormatString> for FormatString<'a> {
fn from_ast(
scope: &'a Scope<'a>,
value: &leo_ast::FormattedString,
value: &leo_ast::FormatString,
_expected_type: Option<PartialType<'a>>,
) -> Result<Self, AsgConvertError> {
let expected_param_len = value
.parts
.iter()
.filter(|x| matches!(x, FormattedStringPart::Container))
.filter(|x| matches!(x, FormatStringPart::Container))
.count();
if value.parameters.len() != expected_param_len {
// + 1 for formatting string as to not confuse user
@ -71,7 +71,7 @@ impl<'a> FromAst<'a, leo_ast::FormattedString> for FormattedString<'a> {
for parameter in value.parameters.iter() {
parameters.push(Cell::new(<&Expression<'a>>::from_ast(scope, parameter, None)?));
}
Ok(FormattedString {
Ok(FormatString {
parts: value.parts.clone(),
parameters,
span: value.span.clone(),
@ -79,9 +79,9 @@ impl<'a> FromAst<'a, leo_ast::FormattedString> for FormattedString<'a> {
}
}
impl<'a> Into<leo_ast::FormattedString> for &FormattedString<'a> {
fn into(self) -> leo_ast::FormattedString {
leo_ast::FormattedString {
impl<'a> Into<leo_ast::FormatString> for &FormatString<'a> {
fn into(self) -> leo_ast::FormatString {
leo_ast::FormatString {
parts: self.parts.clone(),
parameters: self.parameters.iter().map(|e| e.get().into()).collect(),
span: self.span.clone(),
@ -103,13 +103,13 @@ impl<'a> FromAst<'a, leo_ast::ConsoleStatement> for ConsoleStatement<'a> {
<&Expression<'a>>::from_ast(scope, expression, Some(Type::Boolean.into()))?,
)),
AstConsoleFunction::Debug(formatted_string) => {
ConsoleFunction::Debug(FormattedString::from_ast(scope, formatted_string, None)?)
ConsoleFunction::Debug(FormatString::from_ast(scope, formatted_string, None)?)
}
AstConsoleFunction::Error(formatted_string) => {
ConsoleFunction::Error(FormattedString::from_ast(scope, formatted_string, None)?)
ConsoleFunction::Error(FormatString::from_ast(scope, formatted_string, None)?)
}
AstConsoleFunction::Log(formatted_string) => {
ConsoleFunction::Log(FormattedString::from_ast(scope, formatted_string, None)?)
ConsoleFunction::Log(FormatString::from_ast(scope, formatted_string, None)?)
}
},
})

2
asg/src/statement/iteration.rs
View File

@ -54,7 +54,7 @@ impl<'a> FromAst<'a, leo_ast::IterationStatement> for &'a Statement<'a> {
statement: &leo_ast::IterationStatement,
_expected_type: Option<PartialType<'a>>,
) -> Result<Self, AsgConvertError> {
let expected_index_type = Some(PartialType::Integer(None, Some(IntegerType::U32)));
let expected_index_type = Some(PartialType::Integer(Some(IntegerType::U32), None));
let start = <&Expression<'a>>::from_ast(scope, &statement.start, expected_index_type.clone())?;
let stop = <&Expression<'a>>::from_ast(scope, &statement.stop, expected_index_type)?;

2
asg/tests/fail/circuits/member_function_fail.leo
View File

@ -1,6 +1,6 @@
circuit Foo {
function echo(x: u32) -> u32 {
return x
return x;
}
}

2
asg/tests/fail/circuits/member_function_invalid.leo
View File

@ -1,6 +1,6 @@
circuit Foo {
function echo(x: u32) -> u32 {
return x
return x;
}
}

2
asg/tests/fail/circuits/member_static_function_invalid.leo
View File

@ -1,6 +1,6 @@
circuit Foo {
function echo(x: u32) -> u32 {
return x
return x;
}
}

2
asg/tests/fail/circuits/member_static_function_undefined.leo
View File

@ -1,6 +1,6 @@
circuit Foo {
function echo(x: u32) -> u32 {
return x
return x;
}
}

2
asg/tests/fail/circuits/mod.rs
View File

@ -55,7 +55,7 @@ fn test_mut_member_function_fail() {
let program_string = r#"
circuit Foo {
function echo(mut self, x: u32) -> u32 {
return x
return x;
}
}

2
asg/tests/fail/circuits/self_member_invalid.leo
View File

@ -2,7 +2,7 @@ circuit Foo {
f: u32,
function bar() -> u32 {
return f
return f;
}
}

2
asg/tests/fail/circuits/self_member_undefined.leo
View File

@ -1,6 +1,6 @@
circuit Foo {
function bar() -> u32 {
return self.f
return self.f;
}
}

6
asg/tests/fail/function/multiple_returns_fail.leo
View File

@ -1,7 +1,7 @@
function main () -> i8 {
if true {
return 1i8 //ignored
return 1i8; //ignored
}
return 2i8 //ignored
return 3i8 //returns
return 2i8; //ignored
return 3i8; //returns
}

4
asg/tests/fail/function/multiple_returns_fail_conditional.leo
View File

@ -2,8 +2,8 @@ function main () -> u16 {
if false {
const a = 1u16;
const b = a + 1u16;
return b
return b;
} else if false {
return 0u16
return 0u16;
}
}

4
asg/tests/fail/function/multiple_returns_input_ambiguous.leo
View File

@ -1,7 +1,7 @@
function main(input) -> u32 {
if input.registers.a == 0 {
return 0u32
return 0u32;
} else {
return 1u32
return 1u32;
}
}

2
asg/tests/fail/function/scope_fail.leo
View File

@ -1,5 +1,5 @@
function foo() -> field {
return myGlobal
return myGlobal;
}
function main() {

2
asg/tests/fail/statements/num_returns_fail.leo
View File

@ -1,3 +1,3 @@
function main() -> (bool, bool) {
return true
return true;
}

4
asg/tests/pass/address/console_assert_pass.leo
View File

@ -1,6 +1,6 @@
function main() {
const address_1 = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const address_2 = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const address_1 = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
const address_2 = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
console.assert(address_1 == address_2);
}

2
asg/tests/pass/address/input.leo
View File

@ -1,5 +1,5 @@
function main(owner: address) {
const sender = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const sender = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
console.assert(owner == sender);
}

4
asg/tests/pass/address/ternary.leo
View File

@ -1,6 +1,6 @@
function main(s: bool, c: address) {
const a = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const b = address(aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r);
const a = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
const b = aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r;
const r = s? a: b;

2
asg/tests/pass/address/valid.leo
View File

@ -1,3 +1,3 @@
function main() {
const public_key_string = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const public_key_string = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
}

6
asg/tests/pass/array/registers.leo
View File

@ -1,3 +1,3 @@
function main(input) -> [u8; 3] {
return input.registers.r
}
function main() -> [u8; 3] {
return input.registers.r;
}

6
asg/tests/pass/boolean/output_register.leo
View File

@ -1,3 +1,3 @@
function main(input) -> bool {
return input.registers.r
}
function main() -> bool {
return input.registers.r;
}

2
asg/tests/pass/circuits/member_function.leo
View File

@ -1,6 +1,6 @@
circuit Foo {
function echo(self, x: u32) -> u32 {
return x
return x;
}
}

4
asg/tests/pass/circuits/member_function_nested.leo
View File

@ -2,11 +2,11 @@ circuit Foo {
x: u32,
function add_x(self, y: u32) -> u32 {
return self.x + y
return self.x + y;
}
function call_add_x(self, y: u32) -> u32 {
return self.add_x(y)
return self.add_x(y);
}
}

2
asg/tests/pass/circuits/member_static_function.leo
View File

@ -1,6 +1,6 @@
circuit Foo {
function echo(x: u32) -> u32 {
return x
return x;
}
}

2
asg/tests/pass/circuits/member_variable_and_function.leo
View File

@ -2,7 +2,7 @@ circuit Foo {
foo: u32,
function bar() -> u32 {
return 1u32
return 1u32;
}
}

2
asg/tests/pass/circuits/mod.rs
View File

@ -49,7 +49,7 @@ fn test_mut_member_function() {
let program_string = r#"
circuit Foo {
function echo(mut self, x: u32) -> u32 {
return x
return x;
}
}

4
asg/tests/pass/circuits/pedersen_mock.leo
View File

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

2
asg/tests/pass/circuits/self_circuit.leo
View File

@ -1,6 +1,6 @@
circuit Foo {
static function new() -> Self {
return Self { }
return Self { };
}
}

2
asg/tests/pass/circuits/self_member.leo
View File

@ -2,7 +2,7 @@ circuit Foo {
f: u32,
function bar(self) -> u32 {
return self.f
return self.f;
}
}

2
asg/tests/pass/core/blake2s_input.leo
View File

@ -1,5 +1,5 @@
import core.unstable.blake2s.Blake2s;
function main(seed: [u8; 32], message: [u8; 32]) -> [u8; 32] {
return Blake2s::hash(seed, message)
return Blake2s::hash(seed, message);
}

4
asg/tests/pass/form_ast.rs
View File

@ -36,7 +36,7 @@ fn test_function_rename() {
a += 1;
}
return a
return a;
}
function main() {
@ -63,7 +63,7 @@ fn test_imports() {
}
function foo() -> u32 {
return 1u32
return 1u32;
}
"#;
imports

2
asg/tests/pass/function/iteration.leo
View File

@ -1,5 +1,5 @@
function one() -> u32 {
return 1u32
return 1u32;
}
function main() {

2
asg/tests/pass/function/iteration_repeated.leo
View File

@ -5,7 +5,7 @@ function iteration() -> u32 {
a += 1;
}
return a
return a;
}
function main() {

6
asg/tests/pass/function/mod.rs
View File

@ -32,7 +32,7 @@ fn test_iteration() {
fn test_const_args() {
let program_string = r#"
function one(const value: u32) -> u32 {
return value + 1
return value + 1;
}
function main() {
@ -52,7 +52,7 @@ fn test_const_args() {
fn test_const_args_used() {
let program_string = r#"
function index(arr: [u8; 3], const value: u32) -> u8 {
return arr[value]
return arr[value];
}
function main() {
@ -73,7 +73,7 @@ fn test_const_args_used() {
fn test_const_args_fail() {
let program_string = r#"
function index(arr: [u8; 3], const value: u32) -> u8 {
return arr[value]
return arr[value];
}
function main(x_value: u32) {

2
asg/tests/pass/function/multiple_returns.leo
View File

@ -1,5 +1,5 @@
function tuple() -> (bool, bool) {
return (true, false)
return (true, false);
}
function main() {

6
asg/tests/pass/function/multiple_returns_main.leo
View File

@ -1,3 +1,3 @@
function main(input) -> (bool, bool) {
return (input.registers.a, input.registers.b)
}
function main() -> (bool, bool) {
return (input.registers.a, input.registers.b);
}

2
asg/tests/pass/function/newlines.leo
View File

@ -5,5 +5,5 @@ function main(
u32,
u32,
) {
return (a, b)
return (a, b);
}

2
asg/tests/pass/function/repeated.leo
View File

@ -1,5 +1,5 @@
function one() -> bool {
return true
return true;
}
function main() {

2
asg/tests/pass/function/return.leo
View File

@ -1,5 +1,5 @@
function one() -> u32 {
return 1u32
return 1u32;
}
function main() {

4
asg/tests/pass/function/return_array_nested_pass.leo
View File

@ -1,9 +1,9 @@
function array_3x2_nested() -> [[u8; 2]; 3] {
return [[0u8; 2]; 3]
return [[0u8; 2]; 3];
}
function array_3x2_tuple() -> [[u8; 2]; 3] {
return [0u8; (3, 2)]
return [0u8; (3, 2)];
}
function main() {

4
asg/tests/pass/function/return_array_tuple_pass.leo
View File

@ -1,9 +1,9 @@
function array_3x2_nested() -> [u8; (3, 2)] {
return [[0u8; 2]; 3]
return [[0u8; 2]; 3];
}
function array_3x2_tuple() -> [u8; (3, 2)] {
return [0u8; (3, 2)]
return [0u8; (3, 2)];
}
function main() {

2
asg/tests/pass/function/return_tuple.leo
View File

@ -3,7 +3,7 @@ function tuples() -> ((u8, u8), u32) {
const a: (u8, u8) = (1, 2);
const b: u32 = 3;
return (a, b)
return (a, b);
}
function main() {

4
asg/tests/pass/function/return_tuple_conditional.leo
View File

@ -4,9 +4,9 @@ function tuple_conditional () -> (
i64
) {
if true {
return (1, 1)
return (1, 1);
} else {
return (2, 2)
return (2, 2);
}
}

2
asg/tests/pass/import/src/test-import.leo
View File

@ -4,5 +4,5 @@ circuit Point {
}
function foo() -> u32 {
return 1u32
return 1u32;
}

2
asg/tests/pass/input_files/program_input_and_program_state/access.leo
View File

@ -1,4 +1,4 @@
function main(input, data: [u8; 32]) {
function main(data: [u8; 32]) {
console.assert(input.registers.value_balance == 0u64);
console.assert(input.state.leaf_index == 0u32);

2
asg/tests/pass/input_files/program_state/access_all.leo
View File

@ -1,4 +1,4 @@
function main(input) {
function main() {
console.assert(input.state.root == [0u8; 32]);
const expected: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;

2
asg/tests/pass/input_files/program_state/access_state.leo
View File

@ -1,3 +1,3 @@
function main(input) {
function main() {
console.assert(input.state.root == [0u8; 32]);
}

2
asg/tests/pass/mutability/swap.leo
View File

@ -3,7 +3,7 @@ function swap(a: [u32; 2], const i: u32, const j: u32) -> [u32; 2] {
const t = a[i];
a[i] = a[j];
a[j] = t;
return a
return a;
}
function main() {

6
asg/tests/pass/statements/conditional/multiple_returns.leo
View File

@ -1,7 +1,7 @@
function main(input) -> u32 {
function main() -> u32 {
if input.registers.a == 0u32 {
return 0u32
return 0u32;
} else {
return 1u32
return 1u32;
}
}

2
asg/tests/pass/tuples/function.leo
View File

@ -1,5 +1,5 @@
function foo() -> (bool, bool) {
return (true, false)
return (true, false);
}
function main() {

2
asg/tests/pass/tuples/function_multiple.leo
View File

@ -1,5 +1,5 @@
function foo() -> (bool, bool) {
return (true, false)
return (true, false);
}
function main() {

2
asg/tests/pass/tuples/function_typed.leo
View File

@ -1,5 +1,5 @@
function foo() -> (bool, bool) {
return (true, false)
return (true, false);
}
function main() {

4
ast/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "leo-ast"
version = "1.3.0"
version = "1.4.0"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Core AST of the Leo programming language"
homepage = "https://aleo.org"
@ -19,7 +19,7 @@ edition = "2018"
[dependencies.leo-input]
path = "../input"
version = "1.3.0"
version = "1.4.0"
[dependencies.indexmap]
version = "1.6.2"

44
ast/src/common/input_keyword.rs
View File

@ -1,44 +0,0 @@
// Copyright (C) 2019-2021 Aleo Systems Inc.
// This file is part of the Leo library.
// The Leo library is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// The Leo library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
use crate::{Identifier, Node, Span};
use serde::{Deserialize, Serialize};
use std::fmt;
/// The `input` keyword can view program register, record, and state values.
/// Values cannot be modified. The `input` keyword cannot be made mutable.
#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
#[serde(transparent)]
pub struct InputKeyword {
pub identifier: Identifier,
}
impl fmt::Display for InputKeyword {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "input")
}
}
impl Node for InputKeyword {
fn span(&self) -> &Span {
&self.identifier.span
}
fn set_span(&mut self, span: Span) {
self.identifier.span = span;
}
}

3
ast/src/common/mod.rs
View File

@ -23,9 +23,6 @@ pub use const_self_keyword::*;
pub mod identifier;
pub use identifier::*;
pub mod input_keyword;
pub use input_keyword::*;
pub mod mut_self_keyword;
pub use mut_self_keyword::*;

4
ast/src/errors/error.rs
View File

@ -79,7 +79,7 @@ impl fmt::Display for FormattedError {
write!(
f,
"{indent }--> {path}: {line_start}:{start}\n\
"{indent }--> {path}:{line_start}:{start}\n\
{indent } |\n",
indent = INDENT,
path = &*self.path,
@ -130,7 +130,7 @@ fn test_error() {
assert_eq!(
err.to_string(),
vec![
" --> file.leo: 2:9",
" --> file.leo:2:9",
" |",
" 2 | let a = x;",
" | ^",

10
ast/src/functions/input/input_variable.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
use crate::{ConstSelfKeyword, FunctionInputVariable, InputKeyword, MutSelfKeyword, Node, SelfKeyword, Span};
use crate::{ConstSelfKeyword, FunctionInputVariable, MutSelfKeyword, Node, SelfKeyword, Span};
use serde::{Deserialize, Serialize};
use std::fmt;
@ -22,7 +22,6 @@ use std::fmt;
/// Enumerates the possible inputs to a function.
#[derive(Clone, Serialize, Deserialize)]
pub enum FunctionInput {
InputKeyword(InputKeyword),
SelfKeyword(SelfKeyword),
ConstSelfKeyword(ConstSelfKeyword),
MutSelfKeyword(MutSelfKeyword),
@ -36,7 +35,6 @@ impl FunctionInput {
///
pub fn is_self(&self) -> bool {
match self {
FunctionInput::InputKeyword(_) => false,
FunctionInput::SelfKeyword(_) => true,
FunctionInput::ConstSelfKeyword(_) => true,
FunctionInput::MutSelfKeyword(_) => true,
@ -50,7 +48,6 @@ impl FunctionInput {
///
pub fn is_const_self(&self) -> bool {
match self {
FunctionInput::InputKeyword(_) => false,
FunctionInput::SelfKeyword(_) => false,
FunctionInput::ConstSelfKeyword(_) => true,
FunctionInput::MutSelfKeyword(_) => false,
@ -64,7 +61,6 @@ impl FunctionInput {
///
pub fn is_mut_self(&self) -> bool {
match self {
FunctionInput::InputKeyword(_) => false,
FunctionInput::SelfKeyword(_) => false,
FunctionInput::ConstSelfKeyword(_) => false,
FunctionInput::MutSelfKeyword(_) => true,
@ -74,7 +70,6 @@ impl FunctionInput {
fn format(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
FunctionInput::InputKeyword(keyword) => write!(f, "{}", keyword),
FunctionInput::SelfKeyword(keyword) => write!(f, "{}", keyword),
FunctionInput::ConstSelfKeyword(keyword) => write!(f, "{}", keyword),
FunctionInput::MutSelfKeyword(keyword) => write!(f, "{}", keyword),
@ -99,7 +94,6 @@ impl PartialEq for FunctionInput {
/// Returns true if `self == other`. Does not compare spans.
fn eq(&self, other: &Self) -> bool {
match (self, other) {
(FunctionInput::InputKeyword(_), FunctionInput::InputKeyword(_)) => true,
(FunctionInput::SelfKeyword(_), FunctionInput::SelfKeyword(_)) => true,
(FunctionInput::ConstSelfKeyword(_), FunctionInput::ConstSelfKeyword(_)) => true,
(FunctionInput::MutSelfKeyword(_), FunctionInput::MutSelfKeyword(_)) => true,
@ -115,7 +109,6 @@ impl Node for FunctionInput {
fn span(&self) -> &Span {
use FunctionInput::*;
match self {
InputKeyword(keyword) => &keyword.identifier.span,
SelfKeyword(keyword) => &keyword.identifier.span,
ConstSelfKeyword(keyword) => &keyword.identifier.span,
MutSelfKeyword(keyword) => &keyword.identifier.span,
@ -126,7 +119,6 @@ impl Node for FunctionInput {
fn set_span(&mut self, span: Span) {
use FunctionInput::*;
match self {
InputKeyword(keyword) => keyword.identifier.span = span,
SelfKeyword(keyword) => keyword.identifier.span = span,
ConstSelfKeyword(keyword) => keyword.identifier.span = span,
MutSelfKeyword(keyword) => keyword.identifier.span = span,

2
ast/src/reducer/canonicalization.rs
View File

@ -392,7 +392,7 @@ impl Canonicalizer {
.map(|parameter| self.canonicalize_expression(parameter))
.collect();
let formatted = FormattedString {
let formatted = FormatString {
parts: format.parts.clone(),
parameters,
span: format.span.clone(),

2
ast/src/reducer/reconstructing_director.rs
View File

@ -391,7 +391,7 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
parameters.push(self.reduce_expression(parameter)?);
}
let formatted = FormattedString {
let formatted = FormatString {
parts: format.parts.clone(),
parameters,
span: format.span.clone(),

8
ast/src/statements/console/console_function.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
use crate::{Expression, FormattedString, Node, Span};
use crate::{Expression, FormatString, Node, Span};
use serde::{Deserialize, Serialize};
use std::fmt;
@ -22,9 +22,9 @@ use std::fmt;
#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
pub enum ConsoleFunction {
Assert(Expression),
Debug(FormattedString),
Error(FormattedString),
Log(FormattedString),
Debug(FormatString),
Error(FormatString),
Log(FormatString),
}
impl fmt::Display for ConsoleFunction {

14
ast/src/statements/console/formatted_string.rs
View File

@ -21,19 +21,19 @@ use std::fmt;
use tendril::StrTendril;
#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
pub enum FormattedStringPart {
pub enum FormatStringPart {
Const(#[serde(with = "crate::common::tendril_json")] StrTendril),
Container,
}
#[derive(Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
pub struct FormattedString {
pub parts: Vec<FormattedStringPart>,
pub struct FormatString {
pub parts: Vec<FormatStringPart>,
pub parameters: Vec<Expression>,
pub span: Span,
}
impl fmt::Display for FormattedString {
impl fmt::Display for FormatString {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(
f,
@ -41,8 +41,8 @@ impl fmt::Display for FormattedString {
self.parts
.iter()
.map(|x| match x {
FormattedStringPart::Const(x) => x,
FormattedStringPart::Container => "{}",
FormatStringPart::Const(x) => x,
FormatStringPart::Container => "{}",
})
.collect::<Vec<_>>()
.join("")
@ -50,7 +50,7 @@ impl fmt::Display for FormattedString {
}
}
impl Node for FormattedString {
impl Node for FormatString {
fn span(&self) -> &Span {
&self.span
}

18
compiler/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "leo-compiler"
version = "1.3.0"
version = "1.4.0"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Compiler of the Leo programming language"
homepage = "https://aleo.org"
@ -19,35 +19,35 @@ edition = "2018"
[dependencies.leo-ast]
path = "../ast"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-imports]
path = "../imports"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-input]
path = "../input"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-package]
path = "../package"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-state]
path = "../state"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-asg]
path = "../asg"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-parser]
path = "../parser"
version = "1.3.0"
version = "1.4.0"
[dependencies.leo-asg-passes]
path = "../asg-passes"
version = "1.3.0"
version = "1.4.0"
[dependencies.tendril]
version = "0.4"

12
compiler/src/console/format.rs
View File

@ -17,8 +17,8 @@
//! Evaluates a formatted string in a compiled Leo program.
use crate::{errors::ConsoleError, program::ConstrainedProgram, GroupType};
use leo_asg::FormattedString;
use leo_ast::FormattedStringPart;
use leo_asg::FormatString;
use leo_ast::FormatStringPart;
use snarkvm_fields::PrimeField;
use snarkvm_r1cs::ConstraintSystem;
@ -26,13 +26,13 @@ impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
pub fn format<CS: ConstraintSystem<F>>(
&mut self,
cs: &mut CS,
formatted: &FormattedString<'a>,
formatted: &FormatString<'a>,
) -> Result<String, ConsoleError> {
// Check that containers and parameters match
let container_count = formatted
.parts
.iter()
.filter(|x| matches!(x, FormattedStringPart::Container))
.filter(|x| matches!(x, FormatStringPart::Container))
.count();
if container_count != formatted.parameters.len() {
return Err(ConsoleError::length(
@ -51,8 +51,8 @@ impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
let mut parameters = executed_containers.iter();
for part in formatted.parts.iter() {
match part {
FormattedStringPart::Const(c) => out.push(&**c),
FormattedStringPart::Container => out.push(&**parameters.next().unwrap()),
FormatStringPart::Const(c) => out.push(&**c),
FormatStringPart::Container => out.push(&**parameters.next().unwrap()),
}
}

8
compiler/src/function/main_function.rs
View File

@ -35,13 +35,9 @@ impl<'a, F: PrimeField, G: GroupType<F>> ConstrainedProgram<'a, F, G> {
let registers = input.get_registers();
// Iterate over main function input variables and allocate new values
if function.has_input {
// let input_var = function.scope.
let asg_input = function
.scope
.resolve_input()
.expect("no input variable in scope when function is qualified");
let asg_input = function.scope.resolve_input();
if let Some(asg_input) = asg_input {
let value =
self.allocate_input_keyword(cs, &function.name.borrow().span, &asg_input.container_circuit, input)?;

4
compiler/src/stages/reducing_director.rs
View File

@ -78,7 +78,7 @@ use leo_ast::{
DefinitionStatement as AstDefinitionStatement,
Expression as AstExpression,
ExpressionStatement as AstExpressionStatement,
FormattedString,
FormatString,
Function as AstFunction,
GroupTuple,
GroupValue as AstGroupValue,
@ -592,7 +592,7 @@ impl<R: ReconstructingReducer, O: CombinerOptions> CombineAstAsgDirector<R, O> {
parameters.push(self.reduce_expression(&ast_parameter, asg_parameter.get())?);
}
let formatted = FormattedString {
let formatted = FormatString {
parts: ast_format.parts.clone(),
parameters,
span: ast_format.span.clone(),

4
compiler/tests/address/console_assert_fail.leo
View File

@ -1,6 +1,6 @@
function main() {
const address_1 = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const address_2 = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j9);
const address_1 = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
const address_2 = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j9;
console.assert(address_1 == address_2);
}

4
compiler/tests/address/console_assert_pass.leo
View File

@ -1,6 +1,6 @@
function main() {
const address_1 = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const address_2 = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const address_1 = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
const address_2 = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
console.assert(address_1 == address_2);
}

2
compiler/tests/address/input.leo
View File

@ -1,5 +1,5 @@
function main(owner: address) {
const sender = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const sender = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
console.assert(owner == sender);
}

2
compiler/tests/address/invalid_length.leo
View File

@ -1,3 +1,3 @@
function main() {
const public_key_string = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j88);
const public_key_string = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j88;
}

4
compiler/tests/address/ternary.leo
View File

@ -1,6 +1,6 @@
function main(s: bool, c: address) {
const a = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const b = address(aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r);
const a = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
const b = aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r;
const r = s? a: b;

2
compiler/tests/address/valid.leo
View File

@ -1,3 +1,3 @@
function main() {
const public_key_string = address(aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8);
const public_key_string = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;
}

6
compiler/tests/array/registers.leo
View File

@ -1,3 +1,3 @@
function main(input) -> [u8; 3] {
return input.registers.r
}
function main() -> [u8; 3] {
return input.registers.r;
}

6
compiler/tests/boolean/output_register.leo
View File

@ -1,3 +1,3 @@
function main(input) -> bool {
return input.registers.r
}
function main() -> bool {
return input.registers.r;
}

2
compiler/tests/canonicalization/big_self_in_circuit_replacement.leo
View File

@ -6,7 +6,7 @@ circuit Foo {
x: 1u32
};
return new
return new;
}
}

2
compiler/tests/canonicalization/big_self_outside_circuit_fail.leo
View File

@ -6,7 +6,7 @@ circuit Foo {
x: 1u32
};
return new
return new;
}
}

2
compiler/tests/canonicalization/compound_assignment.leo
View File

@ -4,7 +4,7 @@ circuit Foo {
function z (mut self) -> u16 {
self.y.0 += 1u8;
return 1u16
return 1u16;
}
}
function main() {

2
compiler/tests/circuits/const_self_variable.leo
View File

@ -2,7 +2,7 @@ circuit Foo {
a: u8,
function use_a(const self) -> u8 {
return self.a + 1
return self.a + 1;
}
}

2
compiler/tests/circuits/duplicate_name_context.leo
View File

@ -2,7 +2,7 @@ circuit Bar {
b2: u32
function add_five(z:u32) -> u32 {
return z+5u32
return z+5u32;
}
}

2
compiler/tests/circuits/inline_member_pass.leo
View File

@ -2,7 +2,7 @@ circuit Foo {
x: u8
function new(x: u8) -> Self {
return Self { x }
return Self { x };
}
}

2
compiler/tests/circuits/member_function.leo
View File

@ -2,7 +2,7 @@ circuit Foo {
x: u32,
function echo(self) -> u32 {
return self.x
return self.x;
}
}

Some files were not shown because too many files have changed in this diff Show More