cerc-io/solidity
10
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

Merge pull request #9613 from ethereum/yul-function-arrow

Browse Source 
Add/Update tests for Yul function definition
This commit is contained in:
Alex Beregszaszi 2020-08-13 00:30:00 +01:00 committed by GitHub
commit ce501d6740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 96 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
test/liblangutil/Scanner.cpp
View File

@ -771,6 +771,74 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_strings)
}
}
BOOST_AUTO_TEST_CASE(yul_function)
{
string sig = "function f(a, b) -> x, y";
Scanner scanner(CharStream(sig, ""));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::RParen);
BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
BOOST_CHECK_EQUAL(scanner.next(), Token::GreaterThan);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
scanner.reset(CharStream(sig, ""));
scanner.setScannerMode(ScannerKind::Yul);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::RParen);
BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
BOOST_CHECK_EQUAL(scanner.next(), Token::GreaterThan);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
BOOST_AUTO_TEST_CASE(yul_function_with_whitespace)
{
string sig = "function f (a, b) - > x, y";
Scanner scanner(CharStream(sig, ""));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::RParen);
BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
BOOST_CHECK_EQUAL(scanner.next(), Token::GreaterThan);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
scanner.reset(CharStream(sig, ""));
scanner.setScannerMode(ScannerKind::Yul);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::LParen);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::RParen);
BOOST_CHECK_EQUAL(scanner.next(), Token::Sub);
BOOST_CHECK_EQUAL(scanner.next(), Token::GreaterThan);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Comma);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
BOOST_AUTO_TEST_SUITE_END()
} // end namespaces

2
test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
View File

@ -3,7 +3,7 @@ contract C {
assembly {
let d:= 0x10
function asmfun(a, b, c) - > x, y, z {
function asmfun(a, b, c) -> x, y, z {
x := g(a)
function g(r) - > s {
s := mul(r, r)

2
test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
View File

@ -1,7 +1,7 @@
contract C {
function f() public {
assembly {
function asmfun(a, b, c) - > x, y, z {
function asmfun(a, b, c) -> x, y, z {
x := a
y := b
z := 7

2
test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
View File

@ -3,7 +3,7 @@ contract C {
assembly {
let d := 0x10
function asmfun(a, b, c) - > x, y, z {
function asmfun(a, b, c) -> x, y, z {
x := a
y := b
z := 7

2
test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
View File

@ -3,7 +3,7 @@ contract C {
assembly {
let a1, b1, c1
function asmfun(a, b, c) - > x, y, z {
function asmfun(a, b, c) -> x, y, z {
x := a
y := b
z := 7

8
test/libsolidity/syntaxTests/inlineAssembly/function_definition.sol Normal file
View File

@ -0,0 +1,8 @@
contract C {
function f() pure public {
assembly {
function f (a, b , c ) -> y,x,z {
}
}
}
}

8
test/libsolidity/syntaxTests/inlineAssembly/function_definition_whitespace.sol Normal file
View File

@ -0,0 +1,8 @@
contract C {
function f() pure public {
assembly {
function f (a, b , c ) - > y,x,z {
}
}
}
}

4
test/libyul/yulSyntaxTests/function_definition.yul Normal file
View File

@ -0,0 +1,4 @@
{
function f (a, b , c ) -> y,x,z {
}
}

4
test/libyul/yulSyntaxTests/function_definition_whitespace.yul Normal file
View File

@ -0,0 +1,4 @@
{
function f (a, b , c ) - > y,x,z {
}
}