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 #3730 from ethereum/docstringBug

Browse Source 
DocStringParser: Fix error message for empty parameter description.
This commit is contained in:
chriseth 2018-03-14 16:21:29 +01:00 committed by GitHub
commit c3f07b5294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -6,6 +6,7 @@ Bugfixes:
* Code Generator: Properly skip unneeded storgae array cleanup when not reducing length. * Code Generator: Properly skip unneeded storgae array cleanup when not reducing length.
* Commandline interface: Support ``--evm-version constantinople`` properly. * Commandline interface: Support ``--evm-version constantinople`` properly.
* Standard JSON: Support ``constantinople`` as ``evmVersion`` properly. * Standard JSON: Support ``constantinople`` as ``evmVersion`` properly.
* DocString Parser: Fix error message for empty descriptions.
### 0.4.21 (2018-03-07) ### 0.4.21 (2018-03-07)

10
libsolidity/parsing/DocStringParser.cpp
View File

@ -119,21 +119,17 @@ DocStringParser::iter DocStringParser::parseDocTagParam(iter _pos, iter _end)
return _end; return _end;
} }
auto nameEndPos = firstSpaceOrTab(nameStartPos, _end); auto nameEndPos = firstSpaceOrTab(nameStartPos, _end);
if (nameEndPos == _end)
{
appendError("End of param name not found: " + string(nameStartPos, _end));
return _end;
}
auto paramName = string(nameStartPos, nameEndPos); auto paramName = string(nameStartPos, nameEndPos);
auto descStartPos = skipWhitespace(nameEndPos, _end); auto descStartPos = skipWhitespace(nameEndPos, _end);
if (descStartPos == _end) auto nlPos = find(descStartPos, _end, '\n');
if (descStartPos == nlPos)
{ {
appendError("No description given for param " + paramName); appendError("No description given for param " + paramName);
return _end; return _end;
} }
auto nlPos = find(descStartPos, _end, '\n');
auto paramDesc = string(descStartPos, nlPos); auto paramDesc = string(descStartPos, nlPos);
newTag("param"); newTag("param");
m_lastTag->paramName = paramName; m_lastTag->paramName = paramName;

6
test/libsolidity/syntaxTests/docstring_empty_description.sol Normal file
View File

@ -0,0 +1,6 @@
contract C {
/// @param id
function vote(uint id) public;
}
// ----
// DocstringParsingError: No description given for param id