18 Commits

Author	SHA1	Message	Date
gluaxspeed	02416cde68	merge master and resolve conflicts	2021-09-10 02:27:37 -07:00
gluaxspeed	a9c81d6596	fix canoncialization of function inputs	2021-09-08 04:18:11 -07:00
gluaxspeed	8a8b5ab757	resolve merge conflicts	2021-09-07 02:59:35 -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	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	a1f3108512	Merge branch 'master' of github.com:AleoHQ/leo into bug/shadowing-fixes	2021-09-06 00:07:44 -07:00
damirka	e03d5c23b8	includes ast and asg changes	2021-08-31 20:18:21 +03:00
gluaxspeed	3b26e61050	refactor global consts should no longer allow shadowing	2021-08-27 11:42:20 -07:00
gluaxspeed	a059e09ae2	merge master	2021-08-27 09:46:24 -07:00
gluaxspeed	1628e19658	alias resolution done during type inference	2021-08-24 22:58:59 -07:00
gluaxspeed	1576f776f3	resolve master conflicts	2021-08-24 03:00:08 -07:00
gluaxspeed	4d89d122d5	turn back to identifiers, looked into inlining imports in asg	2021-08-24 02:39:09 -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