Commit Graph

209 Commits

Author SHA1 Message Date
gluaxspeed
8a8b5ab757 resolve merge conflicts 2021-09-07 02:59:35 -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
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
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
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
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
1efd891a3f regen tests 2021-08-27 09:54:22 -07:00
gluaxspeed
a059e09ae2 merge master 2021-08-27 09:46:24 -07:00
gluaxspeed
a4652829df update conflicting tests 2021-08-27 04:50:42 -07:00
gluaxspeed
c56a54c62e Merge branch 'master' of github.com:AleoHQ/leo into bug/canonicalization-Self-fixes 2021-08-27 04:40:06 -07:00
Eric McCarthy
9d05b02ef3 update expectations based on results after merging master 2021-08-26 20:33:00 -07:00
Eric McCarthy
d7a948a5bd merge 2021-08-26 20:09:27 -07:00
Alessandro Coglio
062994e4fe
Merge pull request #1284 from AleoHQ/dup-in32-patch-1
Update nonprinting.leo
2021-08-26 19:55:54 -07:00
Eric McCarthy
06f44ac0e6 merge 2021-08-26 09:56:08 -07:00
gluaxspeed
a5b6780c3b big self canonicalization fixes 2021-08-25 08:55:26 -07:00
gluaxspeed
d100db7396 aliases tests, and some bug fixes, errors 2021-08-25 07:30:17 -07:00
gluaxspeed
2ecb10730e turn off leo-debug for test generation 2021-08-24 23:59:33 -07:00
gluaxspeed
1628e19658 alias resolution done during type inference 2021-08-24 22:58:59 -07:00
damirka
034ef90e62 Revert "Squashed commit of the following:"
This reverts commit dfa15b1a4f.
2021-08-24 22:27:37 +03:00
damirka
dfa15b1a4f Squashed commit of the following:
commit 7a5979660b
Merge: 695a949c 88bd065d
Author: Alessandro Coglio <acoglio@aleo.org>
Date:   Mon Aug 23 08:50:41 2021 -0700

    Merge pull request #1272 from AleoHQ/feature/call-expressions-ast-store-type

    [Implmentation] Adds Type to Circuit Member Access Expressions

commit 695a949cff
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Aug 23 17:25:19 2021 +0300

    Bump serde from 1.0.127 to 1.0.128 (#1288)

    Bumps [serde](https://github.com/serde-rs/serde) from 1.0.127 to 1.0.128.
    - [Release notes](https://github.com/serde-rs/serde/releases)
    - [Commits](https://github.com/serde-rs/serde/compare/v1.0.127...v1.0.128)

    ---
    updated-dependencies:
    - dependency-name: serde
      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>

commit fd3d7d0624
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Aug 23 17:25:05 2021 +0300

    Bump serde_yaml from 0.8.18 to 0.8.19 (#1289)

    Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.8.18 to 0.8.19.
    - [Release notes](https://github.com/dtolnay/serde-yaml/releases)
    - [Commits](https://github.com/dtolnay/serde-yaml/compare/0.8.18...0.8.19)

    ---
    updated-dependencies:
    - dependency-name: serde_yaml
      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>

commit 84e972c9ad
Merge: d609bb28 fbc3dfb4
Author: Alessandro Coglio <acoglio@aleo.org>
Date:   Sat Aug 21 18:44:39 2021 -0700

    Merge pull request #1267 from AleoHQ/bug/implicit-ternary-type-inference

    [Bugfix] Ternary Implicit and Explicit Unkown Type

commit 88bd065d8a
Merge: 56c66fa4 235daa9e
Author: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date:   Wed Aug 18 16:25:23 2021 -0700

    merge master, regen tests

commit fbc3dfb4c9
Merge: 56996f98 235daa9e
Author: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date:   Wed Aug 18 16:14:14 2021 -0700

    merge master, regen tests

commit 56c66fa4ba
Author: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date:   Wed Aug 18 14:31:06 2021 -0700

    testing and clean up

commit a91c8b9e6a
Author: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date:   Wed Aug 18 13:38:50 2021 -0700

    Revert "type on call expression"

    This reverts commit cf5a23b38f.

commit cf5a23b38f
Author: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date:   Wed Aug 18 02:04:41 2021 -0700

    type on call expression

commit 56996f989e
Author: gluaxspeed <jonathan.t.pavlik@gmail.com>
Date:   Wed Aug 18 01:09:45 2021 -0700

    fix ternary bug
2021-08-24 22:21:40 +03:00
gluaxspeed
1576f776f3 resolve master conflicts 2021-08-24 03:00:08 -07:00
Eric McCarthy
d8c89f257d also update number of private variables and R1CS checksum expectations 2021-08-23 10:41:39 -07:00
Eric McCarthy
b516a8449d update ast checksum expectations 2021-08-23 10:32:21 -07:00
Eric McCarthy
2abc553d02 update ast checksum expectations 2021-08-23 10:26:06 -07:00
Alessandro Coglio
7a5979660b
Merge pull request #1272 from AleoHQ/feature/call-expressions-ast-store-type
[Implmentation] Adds Type to Circuit Member Access Expressions
2021-08-23 08:50:41 -07:00
Eric McCarthy
26cbb3ffcf
Update circuit.leo
Change the 2nd variable named `character` in scope to be `character2`.
2021-08-21 22:08:46 -07:00
Eric McCarthy
76cb8f6ed7
Update nonprinting.leo
Change duplicate 'in32' to 'in33'
2021-08-21 17:53:34 -07:00
gluaxspeed
93509bf5c1 alias node type 2021-08-19 09:16:50 -07:00
gluaxspeed
e90228b295 type aliases 2021-08-19 06:04:44 -07:00
gluaxspeed
4fc6c5f586 core function imports 2021-08-18 18:52:56 -07:00
gluaxspeed
88bd065d8a merge master, regen tests 2021-08-18 16:25:23 -07:00
gluaxspeed
fbc3dfb4c9 merge master, regen tests 2021-08-18 16:14:14 -07:00
gluaxspeed
56c66fa4ba testing and clean up 2021-08-18 14:31:06 -07:00
gluaxspeed
a91c8b9e6a Revert "type on call expression"
This reverts commit cf5a23b38f.
2021-08-18 13:38:50 -07:00
gluaxspeed
a75dbe38eb imports functioning, next is core imports 2021-08-18 06:23:23 -07:00
gluaxspeed
cf5a23b38f type on call expression 2021-08-18 02:04:41 -07:00
gluaxspeed
56996f989e fix ternary bug 2021-08-18 01:09:45 -07:00
gluaxspeed
c3aa1ce773 fix error message formatting in some instances 2021-08-16 17:46:50 -07:00
gluaxspeed
20b0f4f2f8 fix canonicalization function type return bugs 2021-08-16 15:12:36 -07:00
gluaxspeed
12fe626485 update readme, fix compiler error range 2021-08-13 20:02:43 -07:00
gluaxspeed
0702be2a18 regen error tests 2021-08-13 16:12:54 -07:00