Merge branch 'testnet3' of https://github.com/AleoHQ/leo into code-gen

This commit is contained in:
collin 2022-07-11 15:19:14 -07:00
commit c5849f26af
3 changed files with 12 additions and 4 deletions

View File

@ -46,11 +46,11 @@ path = "../../tests/test-framework"
version = "1.4.0"
[dev-dependencies.serde]
version = "1.0.138"
version = "1.0.139"
features = ["derive"]
[dev-dependencies.serde_yaml]
version = "0.8.24"
version = "0.8.25"
[features]
default = []

View File

@ -235,7 +235,9 @@ primitive-type = boolean-type / arithmetic-type / address-type / string-type
named-type = primitive-type / identifier
type = named-type
tuple-type = "(" [ type 1*( "," type ) [ "," ] ] ")"
type = named-type / tuple-type
group-coordinate = ( [ "-" ] numeral ) / "+" / "-" / "_"
@ -251,6 +253,7 @@ primary-expression = literal
/ "(" expression ")"
/ free-function-call
/ static-function-call
/ tuple-expression
/ circuit-expression
variable-or-free-constant = identifier
@ -263,6 +266,8 @@ static-function-call = named-type "::" identifier function-arguments
function-arguments = "(" [ expression *( "," expression ) [ "," ] ] ")"
tuple-expression = "(" [ expression 1*( "," expression ) [ "," ] ] ")"
circuit-expression = identifier "{" circuit-component-initializer
*( "," circuit-component-initializer )
[ "," ] "}"
@ -271,9 +276,12 @@ circuit-component-initializer = identifier
/ identifier ":" expression
postfix-expression = primary-expression
/ tuple-component-expression
/ circuit-component-expression
/ operator-call
tuple-component-expression = postfix-expression "." numeral
circuit-component-expression = postfix-expression "." identifier
operator-call = unary-operator-call / binary-operator-call

View File

@ -35,7 +35,7 @@ version = "0.5.1"
version = "2.2.0"
[dependencies.serde]
version = "1.0.138"
version = "1.0.139"
features = [ "derive", "rc" ]
[dependencies.thiserror]