status-im
/
nimplay
mirror of https://github.com/status-im/nimplay.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add check for payable default func.

This commit is contained in:
Jacques Wagener 2019-11-06 17:19:38 +02:00
parent c19069f244
commit 38629d4528
No known key found for this signature in database
GPG Key ID: C294D1025DA0E923
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/default_func.nim
View File

@ -3,5 +3,5 @@ import ../nimplay0_1
contract("Default"): contract("Default"):
proc default*() {.payable.} = proc default*() =
discard discard

2
examples/erc20.nim
View File

@ -7,7 +7,7 @@ contract("NimCoin"):
name*: bytes32 name*: bytes32
symbol*: bytes32 symbol*: bytes32
decimals*: uint256 decimals*: uint256
total_supply*: uint256 total_supply: uint256
minter*: address minter*: address
initialised: bool initialised: bool

10
nimplay/nimplay_macros.nim
View File

@ -62,7 +62,7 @@ proc get_local_output_type_conversion(tmp_result_name, tmp_result_converted_name
var ident_node = newIdentNode(tmp_result_converted_name) var ident_node = newIdentNode(tmp_result_converted_name)
var conversion_node = parseStmt(unindent(fmt""" var conversion_node = parseStmt(unindent(fmt"""
var {tmp_result_converted_name}: array[32, byte] var {tmp_result_converted_name}: array[32, byte]
if tmp_result_name: {tmp_result_converted_name}[31] = 1 if {tmp_result_name}: {tmp_result_converted_name}[31] = 1
""")) """))
return (ident_node, conversion_node) return (ident_node, conversion_node)
of "uint256": of "uint256":
@ -550,7 +550,13 @@ proc handle_contract_interface(in_stmts: NimNode): NimNode =
# Add default function. # Add default function.
var default_func_node: NimNode var default_func_node: NimNode
if global_ctx.has_default_func: if global_ctx.has_default_func:
default_func_node = parseStmt(unindent(""" var
default_fsig = filter(
function_signatures, proc(x: FunctionSignature): bool = x.name == "default"
)[0]
assert_payable_str = if default_fsig.payable: "assertNotPayable()" else: ""
default_func_node = parseStmt(unindent(fmt"""
{assert_payable_str}
default() default()
finish(nil, 0) finish(nil, 0)
""")) """))