QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

EXIT op

Browse Source
This commit is contained in:
radrow 2022-06-28 21:00:41 +02:00
parent 7b8957b46a
commit 397f809c00
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/aeso_ast_infer_types.erl
View File

@ -539,8 +539,9 @@ global_env() ->
%% TTL constructors %% TTL constructors
{"RelativeTTL", Fun1(Int, TTL)}, {"RelativeTTL", Fun1(Int, TTL)},
{"FixedTTL", Fun1(Int, TTL)}, {"FixedTTL", Fun1(Int, TTL)},
%% Abort %% Abort/exit
{"abort", Fun1(String, A)}, {"abort", Fun1(String, A)},
{"exit", Fun1(String, A)},
{"require", Fun([Bool, String], Unit)}]) {"require", Fun([Bool, String], Unit)}])
, types = MkDefs( , types = MkDefs(
[{"int", 0}, {"bool", 0}, {"char", 0}, {"string", 0}, {"address", 0}, [{"int", 0}, {"bool", 0}, {"char", 0}, {"string", 0}, {"address", 0},

2
src/aeso_ast_to_fcode.erl
View File

@ -242,7 +242,7 @@ builtins() ->
MkName = fun(NS, Fun) -> MkName = fun(NS, Fun) ->
list_to_atom(string:to_lower(string:join(NS ++ [Fun], "_"))) list_to_atom(string:to_lower(string:join(NS ++ [Fun], "_")))
end, end,
Scopes = [{[], [{"abort", 1}, {"require", 2}]}, Scopes = [{[], [{"abort", 1}, {"require", 2}, {"exit", 1}]},
{["Chain"], [{"spend", 2}, {"balance", 1}, {"block_hash", 1}, {"coinbase", none}, {["Chain"], [{"spend", 2}, {"balance", 1}, {"block_hash", 1}, {"coinbase", none},
{"timestamp", none}, {"block_height", none}, {"difficulty", none}, {"timestamp", none}, {"block_height", none}, {"difficulty", none},
{"gas_limit", none}, {"bytecode_hash", 1}, {"create", variable}, {"clone", variable}]}, {"gas_limit", none}, {"bytecode_hash", 1}, {"create", variable}, {"clone", variable}]},

3
src/aeso_fcode_to_fate.erl
View File

@ -507,6 +507,8 @@ builtin_to_scode(Env, bytes_split, [_, _] = Args) ->
call_to_scode(Env, aeb_fate_ops:bytes_split(?a, ?a, ?a), Args); call_to_scode(Env, aeb_fate_ops:bytes_split(?a, ?a, ?a), Args);
builtin_to_scode(Env, abort, [_] = Args) -> builtin_to_scode(Env, abort, [_] = Args) ->
call_to_scode(Env, aeb_fate_ops:abort(?a), Args); call_to_scode(Env, aeb_fate_ops:abort(?a), Args);
builtin_to_scode(Env, exit, [_] = Args) ->
call_to_scode(Env, aeb_fate_ops:exit(?a), Args);
builtin_to_scode(Env, chain_spend, [_, _] = Args) -> builtin_to_scode(Env, chain_spend, [_, _] = Args) ->
call_to_scode(Env, [aeb_fate_ops:spend(?a, ?a), call_to_scode(Env, [aeb_fate_ops:spend(?a, ?a),
tuple(0)], Args); tuple(0)], Args);
@ -1486,6 +1488,7 @@ r_write_to_dead_var({i, Ann, I}, Code) ->
r_write_to_dead_var(_, _) -> false. r_write_to_dead_var(_, _) -> false.
op_view({'ABORT', R}) -> {'ABORT', none, [R]}; op_view({'ABORT', R}) -> {'ABORT', none, [R]};
op_view({'EXIT', R}) -> {'EXIT', none, [R]};
op_view(T) when is_tuple(T) -> op_view(T) when is_tuple(T) ->
[Op, R | As] = tuple_to_list(T), [Op, R | As] = tuple_to_list(T),
CheckReads = fun(Rs, X) -> case [] == Rs -- [dst, src] of true -> X; false -> false end end, CheckReads = fun(Rs, X) -> case [] == Rs -- [dst, src] of true -> X; false -> false end end,

1
test/contracts/all_syntax.aes
View File

@ -80,3 +80,4 @@ contract AllSyntax =
let sh : shakespeare(shakespeare(int)) = let sh : shakespeare(shakespeare(int)) =
{wolfgang = state} {wolfgang = state}
sh{wolfgang.wolfgang = sh.wolfgang} // comment sh{wolfgang.wolfgang = sh.wolfgang} // comment
exit("hope you had fun reading this")