From b4712773d329269b2d6f732a3236f3685aea41fc Mon Sep 17 00:00:00 2001
From: Lefteris Karapetsas <lefteris@refu.co>
Date: Mon, 5 Jan 2015 16:37:43 +0100
Subject: Fix for sol scanner where empty multiline comment became Natspec
 comment

---
 Scanner.cpp | 23 ++++++++++++++++-------
 Scanner.h   |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Scanner.cpp b/Scanner.cpp
index f22e69bc..1f700d8b 100644
--- a/Scanner.cpp
+++ b/Scanner.cpp
@@ -285,8 +285,6 @@ Token::Value Scanner::scanMultiLineDocComment()
 	bool endFound = false;
 	bool charsAdded = false;
 
-	advance(); //consume the last '*' at /**
-	skipWhitespaceExceptLF();
 	while (!isSourcePastEndOfInput())
 	{
 		//handle newlines in multline comments
@@ -354,11 +352,22 @@ Token::Value Scanner::scanSlash()
 			return Token::WHITESPACE;
 		else if (m_char == '*')
 		{
-			Token::Value comment;
-			m_nextSkippedComment.location.start = firstSlashPosition;
-			comment = scanMultiLineDocComment();
-			m_nextSkippedComment.location.end = getSourcePos();
-			m_nextSkippedComment.token = comment;
+			advance(); //consume the last '*' at /**
+			skipWhitespaceExceptLF();
+
+			// special case of a closed normal multiline comment
+			if (!m_source.isPastEndOfInput() && m_source.get(0) == '/')
+			{
+				advance(); //skip the closing slash
+			}
+			else // we actually have a multiline documentation comment
+			{
+				Token::Value comment;
+				m_nextSkippedComment.location.start = firstSlashPosition;
+				comment = scanMultiLineDocComment();
+				m_nextSkippedComment.location.end = getSourcePos();
+				m_nextSkippedComment.token = comment;
+			}
 			return Token::WHITESPACE;
 		}
 		else
diff --git a/Scanner.h b/Scanner.h
index 5b90a94e..d93b79df 100644
--- a/Scanner.h
+++ b/Scanner.h
@@ -119,6 +119,7 @@ public:
 	{
 		return m_currentToken.token;
 	}
+
 	Location getCurrentLocation() const { return m_currentToken.location; }
 	std::string const& getCurrentLiteral() const { return m_currentToken.literal; }
 	///@}
-- 
cgit v1.2.3