aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLefteris Karapetsas <lefteris@refu.co>2016-12-01 17:14:19 +0800
committerLefteris Karapetsas <lefteris@refu.co>2017-01-25 18:01:52 +0800
commit9ca0fde853735d183c3db5c77c83de7c70c4ec98 (patch)
tree2af967b1e9a6e405197a28453d8423355a8637c4
parent5738e865d5375751332d8f884f2b00b006d76945 (diff)
downloaddexon-solidity-9ca0fde853735d183c3db5c77c83de7c70c4ec98.tar.gz
dexon-solidity-9ca0fde853735d183c3db5c77c83de7c70c4ec98.tar.zst
dexon-solidity-9ca0fde853735d183c3db5c77c83de7c70c4ec98.zip
Fix and better output for tests
-rw-r--r--libsolidity/parsing/DocStringParser.cpp6
-rw-r--r--test/libsolidity/SolidityNatspecJSON.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/libsolidity/parsing/DocStringParser.cpp b/libsolidity/parsing/DocStringParser.cpp
index 4c59c47c..5d9a75ef 100644
--- a/libsolidity/parsing/DocStringParser.cpp
+++ b/libsolidity/parsing/DocStringParser.cpp
@@ -99,7 +99,13 @@ DocStringParser::iter DocStringParser::parseDocTagLine(iter _pos, iter _end, boo
solAssert(!!m_lastTag, "");
auto nlPos = find(_pos, _end, '\n');
if (_appending && _pos < _end && *_pos != ' ' && *_pos != '\t')
+ {
m_lastTag->content += " ";
+ }
+ else if (!_appending)
+ {
+ _pos = skipWhitespace(_pos, _end);
+ }
copy(_pos, nlPos, back_inserter(m_lastTag->content));
return skipLineOrEOS(nlPos, _end);
}
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index c59b30c3..0657c321 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -56,7 +56,7 @@ public:
m_reader.parse(_expectedDocumentationString, expectedDocumentation);
BOOST_CHECK_MESSAGE(
expectedDocumentation == generatedDocumentation,
- "Expected " << expectedDocumentation.toStyledString() <<
+ "Expected:\n" << expectedDocumentation.toStyledString() <<
"\n but got:\n" << generatedDocumentation.toStyledString()
);
}