Commit Graph

3510 Commits

Author SHA1 Message Date
gluaxspeed
8a8b5ab757 resolve merge conflicts 2021-09-07 02:59:35 -07:00
gluax
ba306a15ca
Merge pull request #1328 from AleoHQ/bug/shadowing-fixes
[Bugfix] shadowing fixes, import fixes
2021-09-07 02:42:39 -07:00
gluaxspeed
2e51e81be1 mere conflicts, try to fix duplicate definition fail test 2021-09-07 02:05:15 -07:00
gluaxspeed
dac71a8001 Merge branch 'master' of github.com:AleoHQ/leo into bug/shadowing-fixes 2021-09-07 01:57:39 -07:00
gluax
d2f63432f8
Merge pull request #1296 from AleoHQ/bug/canonicalization-Self-fixes
[Bugfix] Big Self Canonicalization Fixes
2021-09-07 01:51:38 -07:00
gluaxspeed
b39eab953d regen test after merge 2021-09-07 01:50:41 -07:00
gluaxspeed
589c0623f2 resolve conflicts 2021-09-06 23:04:26 -07:00
gluax
81271c918f
Merge pull request #1327 from AleoHQ/abnf-ast-changes
[ABNF] CircuitOrAlias changed to Identifier
2021-09-06 22:23:52 -07:00
Alessandro Coglio
fe77354db7 [ABNF] Re-generate markdown file. 2021-09-06 13:17:19 -07:00
Alessandro Coglio
20c5fb8e2a [ABNF] Merge. 2021-09-06 13:15:44 -07:00
Alessandro Coglio
e9d61ab519 [ABNF] Regenerate markdown. 2021-09-06 13:13:26 -07:00
Alessandro Coglio
593aac5636 [ABNF] Incorporate change for unspecified array sizes.
That change was made on master concurrently with this PR. This commit integrates
the concurrent changes.
2021-09-06 13:10:55 -07:00
Alessandro Coglio
dab6f494b1 [ABNF] Improve formulation of rule for types.
As discussed on GitHub, list identifiers separately from Self.

Also adapt and improve some of the documentation comments.
2021-09-06 13:08:31 -07:00
Alessandro Coglio
b45a722d6b [ABNF] Move two rules within file.
No content change, just layout change.

Prepares for next change to the file.
2021-09-06 13:02:20 -07:00
gluaxspeed
9c29f21775 document new function, remove old comments 2021-09-06 08:14:24 -07:00
gluaxspeed
dcdb234637 fix imported circuit return from function in import 2021-09-06 06:12:58 -07:00
damirka
857ab9a2b6 change CircuitOrAlias to Identifier 2021-09-06 14:10:06 +03:00
gluaxspeed
cfb8720af7 fix scope shadowing, and importing global consts 2021-09-06 03:53:02 -07:00
dependabot[bot]
4e33780c12
Bump thiserror from 1.0.28 to 1.0.29 (#1325)
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.28 to 1.0.29.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.28...1.0.29)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-06 13:48:16 +03:00
dependabot[bot]
79777e6701
Bump num-bigint from 0.4.1 to 0.4.2 (#1326)
Bumps [num-bigint](https://github.com/rust-num/num-bigint) from 0.4.1 to 0.4.2.
- [Release notes](https://github.com/rust-num/num-bigint/releases)
- [Changelog](https://github.com/rust-num/num-bigint/blob/master/RELEASES.md)
- [Commits](https://github.com/rust-num/num-bigint/compare/num-bigint-0.4.1...num-bigint-0.4.2)

---
updated-dependencies:
- dependency-name: num-bigint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-06 13:47:46 +03:00
gluaxspeed
a1f3108512 Merge branch 'master' of github.com:AleoHQ/leo into bug/shadowing-fixes 2021-09-06 00:07:44 -07:00
Alessandro Coglio
866066a8cf
Merge pull request #1313 from AleoHQ/arrays-without-size
[Implementation] Arrays without size
2021-09-03 09:21:07 -07:00
damirka
ab50d81473 changes abnf grammar 2021-09-03 14:36:55 +03:00
Alessandro Coglio
2426fada7d [ABNF] Re-generate markdown. 2021-09-02 22:05:44 -07:00
Alessandro Coglio
1c18f4c56d [ABNF] Improve nomenclature.
Replace 'circuit-or-alias-type' with 'identifier-or-self-type'.

This makes the nomenclature for types more clear and extensible:

- A type may be an identifier, which may be the name of a circuit type or the
  name of a type alias.

- In the future, an identifier used as a type could refer to other kinds of
  types that we may add, such as enumerations.

- While both 'alias type' and 'type alias' could be acceptable terms, it seems
  best to standardize on 'type alias': the latter describes an alias of a type
  (which is the right concept), while the former suggests a type of the "alias"
  kind (cf. 'circuit type', 'field type', 'integer type', etc.). Type aliases
  are not another kind of types like the other: they are aliases of (any of)
  those kinds of types. So by not having 'circuit-or-alias-type' we avoid
  suggesting a notion of 'alias type'.

This does not change the language described by the grammar, it merely changes
some nomenclature in the grammar. Thus, no change to the parser is
needed. Aligning the nomenclature in the abstract syntax and parser to the ABNF
would be good, but entirely optional at this point.
2021-09-02 21:54:42 -07:00
damirka
9bef8611e8 custom serializer for Type::Array 2021-09-02 18:27:20 +03:00
damirka
041faa28db adds tests 2021-09-02 15:53:54 +03:00
damirka
97981b43f4 adds arraywithoutsize type 2021-08-31 21:01:41 +03:00
damirka
e03d5c23b8 includes ast and asg changes 2021-08-31 20:18:21 +03:00
damirka
9951627c8c pulling parser changes from prev branch 2021-08-31 19:18:31 +03:00
Alessandro Coglio
a0cf3a0f58
Merge pull request #1310 from AleoHQ/dependabot/cargo/structopt-0.3.23
Bump structopt from 0.3.22 to 0.3.23
2021-08-31 08:42:01 -07:00
dependabot[bot]
80a5028afa
Bump structopt from 0.3.22 to 0.3.23
Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.22 to 0.3.23.
- [Release notes](https://github.com/TeXitoi/structopt/releases)
- [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.22...v0.3.23)

---
updated-dependencies:
- dependency-name: structopt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-31 10:18:27 +00:00
Alessandro Coglio
24e5c4d69e
Merge pull request #1306 from AleoHQ/dependabot/cargo/serde-1.0.130
Bump serde from 1.0.128 to 1.0.130
2021-08-30 14:38:17 -07:00
dependabot[bot]
87cc6edfc9
Bump serde from 1.0.128 to 1.0.130
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.128 to 1.0.130.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.128...v1.0.130)

---
updated-dependencies:
- dependency-name: serde
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-30 20:46:33 +00:00
Alessandro Coglio
64b9c34654
Merge pull request #1300 from AleoHQ/dependabot/cargo/serde_yaml-0.8.20
Bump serde_yaml from 0.8.19 to 0.8.20
2021-08-30 13:45:04 -07:00
Alessandro Coglio
8a753eaa64
Merge pull request #1305 from AleoHQ/dependabot/cargo/thiserror-1.0.28
Bump thiserror from 1.0.26 to 1.0.28
2021-08-30 10:31:57 -07:00
Alessandro Coglio
ae244bda76
Merge pull request #1307 from AleoHQ/dependabot/cargo/sha2-0.9.6
Bump sha2 from 0.9.5 to 0.9.6
2021-08-30 10:15:49 -07:00
Alessandro Coglio
e90c125c52
Merge pull request #1308 from AleoHQ/dependabot/cargo/num-bigint-0.4.1
Bump num-bigint from 0.4.0 to 0.4.1
2021-08-30 10:08:42 -07:00
dependabot[bot]
bd23781a94
Bump num-bigint from 0.4.0 to 0.4.1
Bumps [num-bigint](https://github.com/rust-num/num-bigint) from 0.4.0 to 0.4.1.
- [Release notes](https://github.com/rust-num/num-bigint/releases)
- [Changelog](https://github.com/rust-num/num-bigint/blob/master/RELEASES.md)
- [Commits](https://github.com/rust-num/num-bigint/compare/num-bigint-0.4.0...num-bigint-0.4.1)

---
updated-dependencies:
- dependency-name: num-bigint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-30 10:18:22 +00:00
dependabot[bot]
3b72441230
Bump sha2 from 0.9.5 to 0.9.6
Bumps [sha2](https://github.com/RustCrypto/hashes) from 0.9.5 to 0.9.6.
- [Release notes](https://github.com/RustCrypto/hashes/releases)
- [Commits](https://github.com/RustCrypto/hashes/compare/sha2-v0.9.5...sha2-v0.9.6)

---
updated-dependencies:
- dependency-name: sha2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-30 10:18:14 +00:00
dependabot[bot]
09d60932eb
Bump thiserror from 1.0.26 to 1.0.28
Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.26 to 1.0.28.
- [Release notes](https://github.com/dtolnay/thiserror/releases)
- [Commits](https://github.com/dtolnay/thiserror/compare/1.0.26...1.0.28)

---
updated-dependencies:
- dependency-name: thiserror
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-30 10:17:53 +00:00
Alessandro Coglio
4ad9de07e8
Merge pull request #1302 from AleoHQ/true-false-fix
Re-remove `true` and `false` from the keywords
2021-08-28 10:44:57 -07:00
Alessandro Coglio
cbd52cea71
Merge pull request #1301 from AleoHQ/feature/test-ast-generation-standardized
[Implementation] Test AST Generation Standardized
2021-08-28 10:43:20 -07:00
gluaxspeed
aacbb991c0 regen test 2021-08-27 22:16:08 -07:00
gluaxspeed
8827bcdf05 add a inputfile so possible no constraints error doesn't happen 2021-08-27 22:08:48 -07:00
gluaxspeed
78e3b333e1 forgot to re-populate tests 2021-08-27 21:51:59 -07:00
gluaxspeed
48d3a445a0 type inference tgc hack 2021-08-27 21:49:17 -07:00
gluaxspeed
3b26e61050 refactor global consts should no longer allow shadowing 2021-08-27 11:42:20 -07:00
Alessandro Coglio
a42b7f35c2 [RFC] Update an ABNF rule fragment.
This was referring to a previous version of the rule, and presumably it is the
reason why 'true' and 'false' were accidentally re-added to the keyword rule.
2021-08-27 11:28:24 -07:00
Alessandro Coglio
f984a47b87 [ABNF] Re-generate markdown. 2021-08-27 11:19:50 -07:00