aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-12-18 04:23:11 +0800
committerGitHub <noreply@github.com>2018-12-18 04:23:11 +0800
commit95977fdaf2525ed2c30bd6beb02300f135a09f2b (patch)
treeb14817b4fe52ba0ca25b5bb89b21bc935bb5d6ee
parent8570bee20bb4ed8720f9f774244797379c2b1d50 (diff)
parent7f41487ff6cad5c5230d0d2fe22c2e58c6bc3cbe (diff)
downloaddexon-solidity-95977fdaf2525ed2c30bd6beb02300f135a09f2b.tar.gz
dexon-solidity-95977fdaf2525ed2c30bd6beb02300f135a09f2b.tar.zst
dexon-solidity-95977fdaf2525ed2c30bd6beb02300f135a09f2b.zip
Merge pull request #5672 from ethereum/sort_includes_parsing
Sort includes in libsolidity/parsing
-rw-r--r--libsolidity/parsing/DocStringParser.cpp20
-rw-r--r--libsolidity/parsing/DocStringParser.h2
-rw-r--r--libsolidity/parsing/Parser.cpp7
3 files changed, 23 insertions, 6 deletions
diff --git a/libsolidity/parsing/DocStringParser.cpp b/libsolidity/parsing/DocStringParser.cpp
index d8927fea..d1d45150 100644
--- a/libsolidity/parsing/DocStringParser.cpp
+++ b/libsolidity/parsing/DocStringParser.cpp
@@ -1,17 +1,33 @@
+/*
+ This file is part of solidity.
+
+ solidity is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ solidity is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with solidity. If not, see <http://www.gnu.org/licenses/>.
+*/
#include <libsolidity/parsing/DocStringParser.h>
+
#include <liblangutil/ErrorReporter.h>
#include <liblangutil/Exceptions.h>
-#include <boost/range/irange.hpp>
#include <boost/range/algorithm.hpp>
+#include <boost/range/irange.hpp>
using namespace std;
using namespace dev;
using namespace langutil;
using namespace dev::solidity;
-
namespace
{
diff --git a/libsolidity/parsing/DocStringParser.h b/libsolidity/parsing/DocStringParser.h
index c83b416d..671a2f34 100644
--- a/libsolidity/parsing/DocStringParser.h
+++ b/libsolidity/parsing/DocStringParser.h
@@ -22,8 +22,8 @@
#pragma once
-#include <string>
#include <libsolidity/ast/ASTAnnotations.h>
+#include <string>
namespace langutil
{
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 26f13f93..9de2146e 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -20,14 +20,15 @@
* Solidity parser.
*/
-#include <cctype>
-#include <vector>
#include <libsolidity/parsing/Parser.h>
+
#include <libyul/AsmParser.h>
#include <libyul/backends/evm/EVMDialect.h>
-#include <liblangutil/SourceLocation.h>
#include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h>
+#include <liblangutil/SourceLocation.h>
+#include <cctype>
+#include <vector>
using namespace std;
using namespace langutil;