diff --git a/.gitmodules b/.gitmodules index 05a2491880..8bf6a590c2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -854,6 +854,9 @@ [submodule "vendor/grammars/latex.tmbundle"] path = vendor/grammars/latex.tmbundle url = https://github.com/textmate/latex.tmbundle +[submodule "vendor/grammars/leo-linguist"] + path = vendor/grammars/leo-linguist + url = https://github.com/ProvableHQ/leo-linguist.git [submodule "vendor/grammars/linter-lilypond"] path = vendor/grammars/linter-lilypond url = https://github.com/nwhetsell/linter-lilypond diff --git a/grammars.yml b/grammars.yml index 23c95ad2f7..f95a6722f0 100644 --- a/grammars.yml +++ b/grammars.yml @@ -813,6 +813,8 @@ vendor/grammars/latex.tmbundle: - text.tex.latex - text.tex.latex.beamer - text.tex.latex.memoir +vendor/grammars/leo-linguist: +- source.leo vendor/grammars/linter-lilypond: - source.lilypond vendor/grammars/liquid-tm-grammar: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index aae547bd83..dfe9c8c0be 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -3784,6 +3784,15 @@ Lean 4: tm_scope: source.lean4 ace_mode: text language_id: 455147478 +Leo: + type: programming + color: "#6814EC" + extensions: + - ".leo" + tm_scope: source.leo + ace_mode: text + wrap: true + language_id: 916034822 Less: type: markup color: "#1d365d" diff --git a/samples/Leo/fibonacci.leo b/samples/Leo/fibonacci.leo new file mode 100644 index 0000000000..c704ce3873 --- /dev/null +++ b/samples/Leo/fibonacci.leo @@ -0,0 +1,50 @@ +// This program follows the license outlined, here: https://github.com/ProvableHQ/leo/blob/mainnet/LICENSE.md + +program fibonacci.aleo { + // This calculates the n-th fibonacci number (up to 64th) + transition fibonacci(public n: u8) -> u128 { + assert(n <= 64u8); + + let f0: u128 = 0u128; + let f1: u128 = 1u128; + let c: u8 = 0u8; + + let z: u8 = reverse_bits(n); + + for i:u8 in 0u8..8u8 { + if n > 0u8 { + let f2i1: u128 = f1 * f1 + f0 * f0; + let f2i: u128 = f0 * (2u128 * f1 - f0); + if z & 1u8.shl(c) == 0u8 { + f0 = f2i; + f1 = f2i1; + } else { + f0 = f2i1; + f1 = f2i + f2i1; + } + c = c + 1u8; + n = n >> 1u8; + } + } + + return f0; + } + + function reverse_bits(n: u8) -> u8 { + let reverse: u8 = 0u8; + + for i:u8 in 0u8..8u8 { + if n > 0u8 { + reverse = reverse << 1u8; + + if n & 1u8 == 1u8 { + reverse ^= 1u8; + } + + n = n >> 1u8; + } + } + + return reverse; + } +} diff --git a/samples/Leo/groups.leo b/samples/Leo/groups.leo new file mode 100644 index 0000000000..43968c9de5 --- /dev/null +++ b/samples/Leo/groups.leo @@ -0,0 +1,20 @@ +// This program follows the license outlined, here: https://github.com/ProvableHQ/leo/blob/mainnet/LICENSE.md + +program groups.aleo { + // This function takes a group coordinate as input `a` and performs several operations which should output the `0group`. + // Note that the operations can be called as associated functions on the `a` variable. + + transition main(a: group) -> group { + // unary + let b: group = a.double(); // 2a + let c: group = b.neg(); // -2a + + // binary + let d: group = (a * 2scalar).add(c); + + // generator + let e: group = group::GEN; + + return d + e; + } +} diff --git a/samples/Leo/twoadicity.leo b/samples/Leo/twoadicity.leo new file mode 100644 index 0000000000..4063490dce --- /dev/null +++ b/samples/Leo/twoadicity.leo @@ -0,0 +1,30 @@ +// This program follows the license outlined, here: https://github.com/AleoHQ/leo/blob/mainnet/LICENSE.md + +program twoadicity.aleo { + // This function calculates the number of powers of two ("twoadicity") + // in the prime factorization of the input number `n`. + transition main(public n: field) -> u8 { + let remaining_n: field = n; + let powers_of_two: u8 = 0u8; + // Since field ints are 253 bits or fewer, any number in the field + // will have at most 252 powers of two in its prime factoring. + for i:u8 in 0u8..252u8 { + if is_even_and_nonzero(remaining_n) { + remaining_n = remaining_n / 2field; + powers_of_two = powers_of_two + 1u8; + } + } + return powers_of_two; + } + + /* We define the is_even predicate on fields as follows. + If n is even and nonzero, clearly n/2 < n. + If n is odd, n-p is a field-equivalent negative number that is even, and + (n-p)/2 is a field-equivalent negative number closer to 0, greater than n-p. + If we add p to both of these negative numbers, we have + n/2 = (n-p)/2 + p = (n+p)/2 is greater than n and still less than p. + */ + function is_even_and_nonzero (n: field) -> bool { + return n / 2field < n; + } +} diff --git a/samples/Leo/vote.leo b/samples/Leo/vote.leo new file mode 100644 index 0000000000..11bac2fa5b --- /dev/null +++ b/samples/Leo/vote.leo @@ -0,0 +1,88 @@ +// This program follows the license outlined, here: https://github.com/AleoHQ/leo/blob/mainnet/LICENSE.md + +program vote.aleo { + // Proposal details + struct ProposalInfo { + title: field, + content: field, + proposer: address, + } + + // Proposal record records proposal info publicly + record Proposal { + owner: address, + id: field, + info: ProposalInfo, + } + + // Save proposal info in public storage. + mapping proposals: field => ProposalInfo; + + // Privacy tickets to vote + record Ticket { + owner: address, + pid: field, + } + + // Count the total tickets issued for each proposal + mapping tickets: field => u64; + + mapping agree_votes: field => u64; + + mapping disagree_votes: field => u64; + + // Propose a new proposal to vote on. + async transition propose(public info: ProposalInfo) -> (Proposal, Future) { + // Authenticate proposer. + assert_eq(self.caller, info.proposer); + + // Generate a new proposal id. + let id: field = BHP256::hash_to_field(info.title); + + + // Return a new record for the proposal. + // Finalize the proposal id. + return (Proposal { owner: self.caller, id, info }, finalize_propose(id)); + } + // Create a new proposal in the "tickets" mapping. + async function finalize_propose(public id: field) { + Mapping::set(tickets, id, 0u64); + } + + // Create a new ticket to vote with. + async transition new_ticket( + public pid: field, + public voter: address, + ) -> (Ticket, Future) { + + // Finalize the proposal id for the ticket. + return (Ticket { owner: voter, pid }, finalize_new_ticket(pid)); + } + // Create a new ticket on a proposal in the "tickets" mapping. + async function finalize_new_ticket(public pid: field) { + let current: u64 = Mapping::get_or_use(tickets, pid, 0u64); + Mapping::set(tickets, pid, current + 1u64); + } + + // Vote privately to agree with a proposal. + async transition agree(ticket: Ticket) -> Future { + // Finalize this vote. + return finalize_agree(ticket.pid); + } + async function finalize_agree(public pid: field) { + // Publicly increment the number of agree votes. + let current: u64 = Mapping::get_or_use(agree_votes, pid, 0u64); + Mapping::set(agree_votes, pid, current + 1u64); + } + + // Vote privately to disagree with a proposal. + async transition disagree(ticket: Ticket) -> Future { + // Finalize this vote. + return finalize_disagree(ticket.pid); + } + async function finalize_disagree(pid: field) { + // Publicly increment the number of disagree votes. + let current: u64 = Mapping::get_or_use(disagree_votes, pid, 0u64); + Mapping::set(disagree_votes, pid, current + 1u64); + } +} diff --git a/vendor/README.md b/vendor/README.md index bb42a892d3..3855757eba 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -310,6 +310,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Latte:** [textmate/php-smarty.tmbundle](https://github.com/textmate/php-smarty.tmbundle) - **Lean:** [leanprover/vscode-lean](https://github.com/leanprover/vscode-lean) - **Lean 4:** [leanprover/vscode-lean4](https://github.com/leanprover/vscode-lean4) +- **Leo:** [ProvableHQ/leo-linguist](https://github.com/ProvableHQ/leo-linguist) - **Less:** [atom/language-less](https://github.com/atom/language-less) - **Lex:** [Alhadis/language-grammars](https://github.com/Alhadis/language-grammars) - **LigoLANG:** [pewulfman/Ligo-grammar](https://github.com/pewulfman/Ligo-grammar) diff --git a/vendor/grammars/leo-linguist b/vendor/grammars/leo-linguist new file mode 160000 index 0000000000..4f4d7d3ad2 --- /dev/null +++ b/vendor/grammars/leo-linguist @@ -0,0 +1 @@ +Subproject commit 4f4d7d3ad241b6c17ea7ed5e79d9bc375338e9ee diff --git a/vendor/licenses/git_submodule/leo-linguist.dep.yml b/vendor/licenses/git_submodule/leo-linguist.dep.yml new file mode 100644 index 0000000000..402fc49866 --- /dev/null +++ b/vendor/licenses/git_submodule/leo-linguist.dep.yml @@ -0,0 +1,211 @@ +--- +name: leo-linguist +version: 4f4d7d3ad241b6c17ea7ed5e79d9bc375338e9ee +type: git_submodule +homepage: https://github.com/ProvableHQ/leo-linguist.git +license: apache-2.0 +licenses: +- sources: LICENSE + text: |2 + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +notices: []