balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Maps and sets defined by extension are now general expressions.

Browse Source 
They used to be allowed only as initial values in declarations.
This new syntax enables idioms like

if set ["John"; "Paul"] contains x then ... else
This commit is contained in:
Christian Rinderknecht 2019-03-26 19:15:46 +01:00
parent f9ffc7b8e7
commit 45a26826ca
No known key found for this signature in database
GPG Key ID: 9446816CFD267040
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Parser.mly
View File

@ -417,10 +417,6 @@ unqualified_decl(OP):
opt_type = $3}; opt_type = $3};
rpar = Region.ghost} rpar = Region.ghost}
in EConstr (NoneExpr {region; value}) in EConstr (NoneExpr {region; value})
| `EMap inj ->
EMap (MapInj inj)
| `ESet inj ->
ESet (SetInj inj)
in $1, $2, $3, $4, init, $6, stop in $1, $2, $3, $4, init, $6, stop
} }
@ -457,12 +453,9 @@ var_decl:
} }
extended_expr: extended_expr:
expr { {region = expr_to_region $1; expr { {region = expr_to_region $1; value = `Expr $1} }
value = `Expr $1} } | Nil { {region = $1; value = `EList $1} }
| Nil { {region = $1; value = `EList $1} } | C_None { {region = $1; value = `ENone $1} }
| C_None { {region = $1; value = `ENone $1} }
| map_injection { {region = $1.region; value = `EMap $1} }
| set_injection { {region = $1.region; value = `ESet $1} }
instruction: instruction:
single_instr { Single $1 } single_instr { Single $1 }
@ -924,20 +917,21 @@ unary_expr:
| core_expr { $1 } | core_expr { $1 }
core_expr: core_expr:
Int { EArith (Int $1) } Int { EArith (Int $1) }
| var { EVar $1 } | var { EVar $1 }
| String { EString (String $1) } | String { EString (String $1) }
| Bytes { EBytes $1 } | Bytes { EBytes $1 }
| C_False { ELogic (BoolExpr (False $1)) } | C_False { ELogic (BoolExpr (False $1)) }
| C_True { ELogic (BoolExpr (True $1)) } | C_True { ELogic (BoolExpr (True $1)) }
| C_Unit { EUnit $1 } | C_Unit { EUnit $1 }
| tuple_expr { ETuple $1 } | tuple_expr { ETuple $1 }
| list_expr { EList $1 } | list_expr { EList $1 }
| none_expr { EConstr (NoneExpr $1) } | none_expr { EConstr (NoneExpr $1) }
| fun_call { ECall $1 } | fun_call { ECall $1 }
| map_expr { EMap $1 } | map_expr { EMap $1 }
| record_expr { ERecord $1 } | set_expr { ESet $1 }
| projection { EProj $1 } | record_expr { ERecord $1 }
| projection { EProj $1 }
| Constr arguments { | Constr arguments {
let region = cover $1.region $2.region in let region = cover $1.region $2.region in
EConstr (ConstrApp {region; value = $1,$2}) EConstr (ConstrApp {region; value = $1,$2})
@ -947,8 +941,12 @@ core_expr:
EConstr (SomeApp {region; value = $1,$2}) EConstr (SomeApp {region; value = $1,$2})
} }
set_expr:
set_injection { SetInj $1 }
map_expr: map_expr:
map_lookup { MapLookUp $1 } map_lookup { MapLookUp $1 }
| map_injection { MapInj $1 }
map_lookup: map_lookup:
path brackets(expr) { path brackets(expr) {

1
Tests/crowdfunding.ligo
View File

@ -28,6 +28,7 @@ entrypoint withdraw (storage store : store; const sender : address)
: store * list (operation) is : store * list (operation) is
var operations : list (operation) := list end var operations : list (operation) := list end
begin begin
// if set ["a"; "b"] contains x then skip else skip;
if sender = owner then if sender = owner then
if now (Unit) >= store.deadline then if now (Unit) >= store.deadline then
if balance >= store.goal then { if balance >= store.goal then {