cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Force condition to be bool in iulia mode.

Browse Source
This commit is contained in:
chriseth 2017-11-23 18:52:04 +01:00
parent 9232cd2621
commit 1d91b65b72
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/julia.rst
View File

@ -252,7 +252,7 @@ We will use a destructuring notation for the AST nodes.
G, L, continue G, L, continue
E(G, L, <if condition body>: If) = E(G, L, <if condition body>: If) =
let G0, L0, v = E(G, L, condition) let G0, L0, v = E(G, L, condition)
if v is true or non-zero: if v is true:
E(G0, L0, body) E(G0, L0, body)
else: else:
G0, L0, regular G0, L0, regular

10
test/libjulia/Parser.cpp
View File

@ -271,15 +271,17 @@ BOOST_AUTO_TEST_CASE(multiple_assignment)
BOOST_AUTO_TEST_CASE(if_statement) BOOST_AUTO_TEST_CASE(if_statement)
{ {
BOOST_CHECK(successParse("{ if 42:u256 {} }")); BOOST_CHECK(successParse("{ if true:bool {} }"));
BOOST_CHECK(successParse("{ if 42:u256 { let x:u256 := 3:u256 } }")); BOOST_CHECK(successParse("{ if false:bool { let x:u256 := 3:u256 } }"));
BOOST_CHECK(successParse("{ function f() -> x:u256 {} if f() { let b:u256 := f() } }")); BOOST_CHECK(successParse("{ function f() -> x:bool {} if f() { let b:bool := f() } }"));
} }
BOOST_AUTO_TEST_CASE(if_statement_invalid) BOOST_AUTO_TEST_CASE(if_statement_invalid)
{ {
CHECK_ERROR("{ if let x:u256 {} }", ParserError, "Literal or identifier expected."); CHECK_ERROR("{ if let x:u256 {} }", ParserError, "Literal or identifier expected.");
CHECK_ERROR("{ if 32:u256 let x:u256 := 3:u256 }", ParserError, "Expected token LBrace"); CHECK_ERROR("{ if true:bool let x:u256 := 3:u256 }", ParserError, "Expected token LBrace");
// TODO change this to an error once we check types.
BOOST_CHECK(successParse("{ if 42:u256 { } }"));
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()