bump versions fix conflicts

This commit is contained in:
collin 2020-11-11 12:04:48 -08:00
commit 05a83950e5
35 changed files with 494 additions and 342 deletions

15
.resources/license_header Normal file
View File

@ -0,0 +1,15 @@
// Copyright (C) 2019-2020 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/>.

View File

@ -9,6 +9,7 @@ use_try_shorthand = true
# Nightly configurations
imports_layout = "HorizontalVertical"
license_template_path = ".resources/license_header"
merge_imports = true
overflow_delimited_expr = true
reorder_impl_items = true

590
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
[package]
name = "leo-lang"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "The Leo programming language"
homepage = "https://aleo.org"
@ -42,35 +42,35 @@ members = [
[dependencies.leo-ast]
path = "./ast"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-compiler]
path = "./compiler"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-gadgets]
path = "./gadgets"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-imports]
path = "./imports"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-input]
path = "./input"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-package]
path = "./package"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-state]
path = "./state"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-symbol-table]
path = "./symbol-table"
version = "1.0.3"
version = "1.0.4"
[dependencies.snarkos-algorithms]
version = "1.1.3"

View File

@ -1,6 +1,6 @@
[package]
name = "leo-ast"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Core AST of the Leo programming language"
homepage = "https://aleo.org"
@ -28,11 +28,11 @@ harness = false
[dependencies.leo-grammar]
path = "../grammar"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-input]
path = "../input"
version = "1.0.3"
version = "1.0.4"
[dependencies.snarkos-errors]
version = "1.1.3"

View File

@ -1,6 +1,6 @@
[package]
name = "leo-compiler"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Compiler of the Leo programming language"
homepage = "https://aleo.org"
@ -19,43 +19,43 @@ edition = "2018"
[dependencies.leo-ast]
path = "../ast"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-core]
path = "../core"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-gadgets]
path = "../gadgets"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-grammar]
path = "../grammar"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-imports]
path = "../imports"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-input]
path = "../input"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-package]
path = "../package"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-state]
path = "../state"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-symbol-table]
path = "../symbol-table"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-type-inference]
path = "../type-inference"
version = "1.0.3"
version = "1.0.4"
[dependencies.snarkos-curves]
version = "1.1.3"

View File

@ -1,6 +1,6 @@
[package]
name = "leo-core"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Core package dependencies of the Leo programming language"
homepage = "https://aleo.org"
@ -19,11 +19,11 @@ edition = "2018"
[dependencies.leo-ast]
path = "../ast"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-gadgets]
path = "../gadgets"
version = "1.0.3"
version = "1.0.4"
[dependencies.snarkos-errors]
version = "1.1.3"

View File

@ -1,2 +0,0 @@
outputs/
/.leo

View File

@ -1,8 +0,0 @@
[project]
name = "fibonacci"
version = "0.1.0"
description = "Returns a fibonnaci sequence"
license = "LICENSE-MIT"
[remote]
author = "aleo"

View File

@ -1 +0,0 @@
# fibonacci

View File

@ -1,2 +0,0 @@
[registers]
r0: u32 = 0;

View File

@ -1,16 +0,0 @@
function fibonacci() -> u32 {
let mut a = 0u32;
let mut b = 1u32;
for i in 0..10 {
a = b;
b = a + b;
}
return a
}
// The 'fibonacci' main function.
function main() -> u32 {
return fibonacci()
}

View File

@ -1,2 +0,0 @@
outputs/
/.leo

View File

@ -1,8 +0,0 @@
[project]
name = "square-root"
version = "0.1.0"
description = "prove knowledge of the square root `a` of a number `b`"
license = "LICENSE-MIT"
[remote]
author = "aleo"

View File

@ -1 +0,0 @@
# square-root

View File

@ -1,7 +0,0 @@
// The program input for square_root/src/main.leo
[main]
a: u32 = 337;
b: u32 = 113569;
[registers]
r0: bool = false;

View File

@ -1,5 +0,0 @@
// The 'square-root' main function.
// prove knowledge of the square root `a` of a number `b`
function main(a: u32, b: u32) -> bool {
return a * a == b
}

View File

@ -1,6 +1,6 @@
[package]
name = "leo-gadgets"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Gadgets of the Leo programming language"
homepage = "https://aleo.org"

View File

@ -1,8 +1,8 @@
[package]
name = "leo-grammar"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "AST of the Leo programming language"
description = "AST generated by pest from the Leo grammar rules"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = [

View File

@ -114,7 +114,7 @@ operation_gt = { ">" }
operation_le = { "<=" }
operation_lt = { "<" }
operation_add = { "+" }
operation_sub = { "- " }
operation_sub = { "-" }
operation_mul = { "*" }
operation_div = { "/" }
operation_pow = { "**" }

View File

@ -1,3 +1,19 @@
// Copyright (C) 2019-2020 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 leo_grammar::ast::{LanguageParser, Rule};
use pest::*;

View File

@ -1,3 +1,19 @@
// Copyright (C) 2019-2020 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 leo_grammar::ast::{LanguageParser, Rule};
use pest::*;

View File

@ -1,3 +1,19 @@
// Copyright (C) 2019-2020 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 leo_grammar::ast::{LanguageParser, Rule};
use pest::*;

View File

@ -1,6 +1,6 @@
[package]
name = "leo-imports"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>"]
description = "Import parser for Leo program package dependencies"
homepage = "https://aleo.org"
@ -19,11 +19,11 @@ edition = "2018"
[dependencies.leo-ast]
path = "../ast"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-grammar]
path = "../grammar"
version = "1.0.3"
version = "1.0.4"
[dependencies.thiserror]
version = "1.0"

View File

@ -1,6 +1,6 @@
[package]
name = "leo-input"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Input parser of the Leo programming language"
homepage = "https://aleo.org"

View File

@ -1 +1 @@
v1.0.3
v1.0.4

View File

@ -1,3 +1,18 @@
// Copyright (C) 2019-2020 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::config::Config;
use colored::Colorize;

View File

@ -2,7 +2,7 @@ dependencies = { }
[package]
name = "leo-linter"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Linter of the Leo programming language"
homepage = "https://aleo.org"

View File

@ -1,6 +1,6 @@
[package]
name = "leo-package"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Package parser of the Leo programming language"
homepage = "https://aleo.org"

View File

@ -1,3 +1,18 @@
// Copyright (C) 2019-2020 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 std::{ffi::OsString, io};
#[derive(Debug, Error)]

View File

@ -1,6 +1,6 @@
[package]
name = "leo-state"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "State parser of the Leo programming language"
homepage = "https://aleo.org"
@ -19,11 +19,11 @@ edition = "2018"
[dependencies.leo-input]
path = "../input"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-ast]
path = "../ast"
version = "1.0.3"
version = "1.0.4"
[dependencies.snarkos-algorithms]
version = "1.1.3"

View File

@ -1,6 +1,6 @@
[package]
name = "leo-symbol-table"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Stores user-defined variables during type resolution"
homepage = "https://aleo.org"
@ -19,19 +19,19 @@ edition = "2018"
[dependencies.leo-ast]
path = "../ast"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-core]
path = "../core"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-grammar]
path = "../grammar"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-imports]
path = "../imports"
version = "1.0.3"
version = "1.0.4"
[dependencies.serde]
version = "1.0"

View File

@ -1,6 +1,6 @@
[package]
name = "leo-type-inference"
version = "1.0.3"
version = "1.0.4"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Checks that a program is correct using type inference"
homepage = "https://aleo.org"
@ -19,19 +19,19 @@ edition = "2018"
[dependencies.leo-ast]
path = "../ast"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-imports]
path = "../imports"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-grammar]
path = "../grammar"
version = "1.0.3"
version = "1.0.4"
[dependencies.leo-symbol-table]
path = "../symbol-table"
version = "1.0.3"
version = "1.0.4"
[dependencies.serde_json]
version = "1.0"