From 3c412ed2f63a58b27eeb00fe584b9378311b099f Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Fri, 19 Aug 2016 19:57:21 +0200
Subject: Version pragma.

---
 libsolidity/analysis/SyntaxChecker.cpp | 53 ++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

(limited to 'libsolidity/analysis/SyntaxChecker.cpp')

diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index 593f2f69..d44fceb4 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -15,9 +15,11 @@
 	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <libsolidity/analysis/SyntaxChecker.h>
 #include <memory>
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/analysis/SyntaxChecker.h>
+#include <libsolidity/analysis/SemVerHandler.h>
+#include <libsolidity/interface/Version.h>
 
 using namespace std;
 using namespace dev;
@@ -27,7 +29,7 @@ using namespace dev::solidity;
 bool SyntaxChecker::checkSyntax(SourceUnit const& _sourceUnit)
 {
 	_sourceUnit.accept(*this);
-	return m_errors.empty();
+	return Error::containsOnlyWarnings(m_errors);
 }
 
 void SyntaxChecker::syntaxError(SourceLocation const& _location, std::string const& _description)
@@ -40,6 +42,51 @@ void SyntaxChecker::syntaxError(SourceLocation const& _location, std::string con
 	m_errors.push_back(err);
 }
 
+bool SyntaxChecker::visit(SourceUnit const&)
+{
+	m_versionPragmaFound = false;
+	return true;
+}
+
+void SyntaxChecker::endVisit(SourceUnit const& _sourceUnit)
+{
+	if (!m_versionPragmaFound)
+	{
+		auto err = make_shared<Error>(Error::Type::Warning);
+		*err <<
+			errinfo_sourceLocation(_sourceUnit.location()) <<
+			errinfo_comment(
+				string("Source file does not specify required compiler version! ") +
+				string("Consider adding \"pragma solidity ^") + VersionNumber + string(";\".")
+			);
+		m_errors.push_back(err);
+	}
+}
+
+bool SyntaxChecker::visit(PragmaDirective const& _pragma)
+{
+	solAssert(!_pragma.tokens().empty(), "");
+	solAssert(_pragma.tokens().size() == _pragma.literals().size(), "");
+	if (_pragma.tokens()[0] != Token::Identifier && _pragma.literals()[0] != "solidity")
+		syntaxError(_pragma.location(), "Unknown pragma \"" + _pragma.literals()[0] + "\"");
+	else
+	{
+		vector<Token::Value> tokens(_pragma.tokens().begin() + 1, _pragma.tokens().end());
+		vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
+		SemVerMatchExpressionParser parser(tokens, literals);
+		auto matchExpression = parser.parse();
+		SemVerVersion currentVersion{string(VersionNumber)};
+		if (!matchExpression.matches(currentVersion))
+			syntaxError(
+				_pragma.location(),
+				"Source file requires different compiler version (current compiler is " +
+				string(VersionNumber) + ")."
+			);
+		m_versionPragmaFound = true;
+	}
+	return true;
+}
+
 bool SyntaxChecker::visit(ModifierDefinition const&)
 {
 	m_placeholderFound = false;
@@ -91,7 +138,7 @@ bool SyntaxChecker::visit(Break const& _breakStatement)
 	return true;
 }
 
-bool SyntaxChecker::visit(const PlaceholderStatement&)
+bool SyntaxChecker::visit(PlaceholderStatement const&)
 {
 	m_placeholderFound = true;
 	return true;
-- 
cgit v1.2.3


From d87450b9b2ba110b218c8f58224ca3af4e62993b Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Tue, 23 Aug 2016 17:03:23 +0200
Subject: Use version string (including prerelease) for pragma matching.

---
 libsolidity/analysis/SyntaxChecker.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libsolidity/analysis/SyntaxChecker.cpp')

diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index d44fceb4..a95b4879 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -75,12 +75,13 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 		vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
 		SemVerMatchExpressionParser parser(tokens, literals);
 		auto matchExpression = parser.parse();
-		SemVerVersion currentVersion{string(VersionNumber)};
+		SemVerVersion currentVersion{string(VersionString)};
 		if (!matchExpression.matches(currentVersion))
 			syntaxError(
 				_pragma.location(),
 				"Source file requires different compiler version (current compiler is " +
-				string(VersionNumber) + ")."
+				string(VersionString) + " - note that nightly builds are considered to be "
+				"strictly less than the released version"
 			);
 		m_versionPragmaFound = true;
 	}
-- 
cgit v1.2.3