Skip to content

Commit 1736fe8

Browse files
committed
Merge pull request #95 from chriseth/styleCleanup
Style cleanup.
2 parents 59a2d62 + c49e58a commit 1736fe8

File tree

1 file changed

+95
-39
lines changed

1 file changed

+95
-39
lines changed

libsolidity/AST.h

Lines changed: 95 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,11 @@ class Declaration: public ASTNode
142142
/// Visibility ordered from restricted to unrestricted.
143143
enum class Visibility { Default, Private, Internal, Public, External };
144144

145-
Declaration(SourceLocation const& _location, ASTPointer<ASTString> const& _name,
146-
Visibility _visibility = Visibility::Default):
145+
Declaration(
146+
SourceLocation const& _location,
147+
ASTPointer<ASTString> const& _name,
148+
Visibility _visibility = Visibility::Default
149+
):
147150
ASTNode(_location), m_name(_name), m_visibility(_visibility), m_scope(nullptr) {}
148151

149152
/// @returns the declared name.
@@ -396,8 +399,10 @@ class EnumValue: public Declaration
396399
class ParameterList: public ASTNode
397400
{
398401
public:
399-
ParameterList(SourceLocation const& _location,
400-
std::vector<ASTPointer<VariableDeclaration>> const& _parameters):
402+
ParameterList(
403+
SourceLocation const& _location,
404+
std::vector<ASTPointer<VariableDeclaration>> const& _parameters
405+
):
401406
ASTNode(_location), m_parameters(_parameters) {}
402407
virtual void accept(ASTVisitor& _visitor) override;
403408
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -683,7 +688,7 @@ class TypeName: public ASTNode
683688
class ElementaryTypeName: public TypeName
684689
{
685690
public:
686-
explicit ElementaryTypeName(SourceLocation const& _location, Token::Value _type):
691+
ElementaryTypeName(SourceLocation const& _location, Token::Value _type):
687692
TypeName(_location), m_type(_type)
688693
{
689694
solAssert(Token::isElementaryTypeName(_type), "");
@@ -722,8 +727,11 @@ class UserDefinedTypeName: public TypeName
722727
class Mapping: public TypeName
723728
{
724729
public:
725-
Mapping(SourceLocation const& _location, ASTPointer<ElementaryTypeName> const& _keyType,
726-
ASTPointer<TypeName> const& _valueType):
730+
Mapping(
731+
SourceLocation const& _location,
732+
ASTPointer<ElementaryTypeName> const& _keyType,
733+
ASTPointer<TypeName> const& _valueType
734+
):
727735
TypeName(_location), m_keyType(_keyType), m_valueType(_valueType) {}
728736
virtual void accept(ASTVisitor& _visitor) override;
729737
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -742,8 +750,11 @@ class Mapping: public TypeName
742750
class ArrayTypeName: public TypeName
743751
{
744752
public:
745-
ArrayTypeName(SourceLocation const& _location, ASTPointer<TypeName> const& _baseType,
746-
ASTPointer<Expression> const& _length):
753+
ArrayTypeName(
754+
SourceLocation const& _location,
755+
ASTPointer<TypeName> const& _baseType,
756+
ASTPointer<Expression> const& _length
757+
):
747758
TypeName(_location), m_baseType(_baseType), m_length(_length) {}
748759
virtual void accept(ASTVisitor& _visitor) override;
749760
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -777,7 +788,10 @@ class Statement: public ASTNode
777788
class Block: public Statement
778789
{
779790
public:
780-
Block(SourceLocation const& _location, std::vector<ASTPointer<Statement>> const& _statements):
791+
Block(
792+
SourceLocation const& _location,
793+
std::vector<ASTPointer<Statement>> const& _statements
794+
):
781795
Statement(_location), m_statements(_statements) {}
782796
virtual void accept(ASTVisitor& _visitor) override;
783797
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -793,7 +807,7 @@ class Block: public Statement
793807
class PlaceholderStatement: public Statement
794808
{
795809
public:
796-
PlaceholderStatement(SourceLocation const& _location): Statement(_location) {}
810+
explicit PlaceholderStatement(SourceLocation const& _location): Statement(_location) {}
797811

798812
virtual void accept(ASTVisitor& _visitor) override;
799813
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -806,10 +820,17 @@ class PlaceholderStatement: public Statement
806820
class IfStatement: public Statement
807821
{
808822
public:
809-
IfStatement(SourceLocation const& _location, ASTPointer<Expression> const& _condition,
810-
ASTPointer<Statement> const& _trueBody, ASTPointer<Statement> const& _falseBody):
823+
IfStatement(
824+
SourceLocation const& _location,
825+
ASTPointer<Expression> const& _condition,
826+
ASTPointer<Statement> const& _trueBody,
827+
ASTPointer<Statement> const& _falseBody
828+
):
811829
Statement(_location),
812-
m_condition(_condition), m_trueBody(_trueBody), m_falseBody(_falseBody) {}
830+
m_condition(_condition),
831+
m_trueBody(_trueBody),
832+
m_falseBody(_falseBody)
833+
{}
813834
virtual void accept(ASTVisitor& _visitor) override;
814835
virtual void accept(ASTConstVisitor& _visitor) const override;
815836

@@ -830,14 +851,17 @@ class IfStatement: public Statement
830851
class BreakableStatement: public Statement
831852
{
832853
public:
833-
BreakableStatement(SourceLocation const& _location): Statement(_location) {}
854+
explicit BreakableStatement(SourceLocation const& _location): Statement(_location) {}
834855
};
835856

836857
class WhileStatement: public BreakableStatement
837858
{
838859
public:
839-
WhileStatement(SourceLocation const& _location, ASTPointer<Expression> const& _condition,
840-
ASTPointer<Statement> const& _body):
860+
WhileStatement(
861+
SourceLocation const& _location,
862+
ASTPointer<Expression> const& _condition,
863+
ASTPointer<Statement> const& _body
864+
):
841865
BreakableStatement(_location), m_condition(_condition), m_body(_body) {}
842866
virtual void accept(ASTVisitor& _visitor) override;
843867
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -891,15 +915,15 @@ class ForStatement: public BreakableStatement
891915
class Continue: public Statement
892916
{
893917
public:
894-
Continue(SourceLocation const& _location): Statement(_location) {}
918+
explicit Continue(SourceLocation const& _location): Statement(_location) {}
895919
virtual void accept(ASTVisitor& _visitor) override;
896920
virtual void accept(ASTConstVisitor& _visitor) const override;
897921
};
898922

899923
class Break: public Statement
900924
{
901925
public:
902-
Break(SourceLocation const& _location): Statement(_location) {}
926+
explicit Break(SourceLocation const& _location): Statement(_location) {}
903927
virtual void accept(ASTVisitor& _visitor) override;
904928
virtual void accept(ASTConstVisitor& _visitor) const override;
905929
};
@@ -926,7 +950,7 @@ class Return: public Statement
926950
class Throw: public Statement
927951
{
928952
public:
929-
Throw(SourceLocation const& _location): Statement(_location) {}
953+
explicit Throw(SourceLocation const& _location): Statement(_location) {}
930954
virtual void accept(ASTVisitor& _visitor) override;
931955
virtual void accept(ASTConstVisitor& _visitor) const override;
932956
};
@@ -957,7 +981,10 @@ class VariableDeclarationStatement: public Statement
957981
class ExpressionStatement: public Statement
958982
{
959983
public:
960-
ExpressionStatement(SourceLocation const& _location, ASTPointer<Expression> _expression):
984+
ExpressionStatement(
985+
SourceLocation const& _location,
986+
ASTPointer<Expression> _expression
987+
):
961988
Statement(_location), m_expression(_expression) {}
962989
virtual void accept(ASTVisitor& _visitor) override;
963990
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -981,7 +1008,7 @@ class ExpressionStatement: public Statement
9811008
class Expression: public ASTNode
9821009
{
9831010
public:
984-
Expression(SourceLocation const& _location): ASTNode(_location) {}
1011+
explicit Expression(SourceLocation const& _location): ASTNode(_location) {}
9851012

9861013
ExpressionAnnotation& annotation() const override;
9871014
};
@@ -1024,10 +1051,16 @@ class Assignment: public Expression
10241051
class UnaryOperation: public Expression
10251052
{
10261053
public:
1027-
UnaryOperation(SourceLocation const& _location, Token::Value _operator,
1028-
ASTPointer<Expression> const& _subExpression, bool _isPrefix):
1029-
Expression(_location), m_operator(_operator),
1030-
m_subExpression(_subExpression), m_isPrefix(_isPrefix)
1054+
UnaryOperation(
1055+
SourceLocation const& _location,
1056+
Token::Value _operator,
1057+
ASTPointer<Expression> const& _subExpression,
1058+
bool _isPrefix
1059+
):
1060+
Expression(_location),
1061+
m_operator(_operator),
1062+
m_subExpression(_subExpression),
1063+
m_isPrefix(_isPrefix)
10311064
{
10321065
solAssert(Token::isUnaryOp(_operator), "");
10331066
}
@@ -1051,8 +1084,12 @@ class UnaryOperation: public Expression
10511084
class BinaryOperation: public Expression
10521085
{
10531086
public:
1054-
BinaryOperation(SourceLocation const& _location, ASTPointer<Expression> const& _left,
1055-
Token::Value _operator, ASTPointer<Expression> const& _right):
1087+
BinaryOperation(
1088+
SourceLocation const& _location,
1089+
ASTPointer<Expression> const& _left,
1090+
Token::Value _operator,
1091+
ASTPointer<Expression> const& _right
1092+
):
10561093
Expression(_location), m_left(_left), m_operator(_operator), m_right(_right)
10571094
{
10581095
solAssert(Token::isBinaryOp(_operator) || Token::isCompareOp(_operator), "");
@@ -1078,8 +1115,12 @@ class BinaryOperation: public Expression
10781115
class FunctionCall: public Expression
10791116
{
10801117
public:
1081-
FunctionCall(SourceLocation const& _location, ASTPointer<Expression> const& _expression,
1082-
std::vector<ASTPointer<Expression>> const& _arguments, std::vector<ASTPointer<ASTString>> const& _names):
1118+
FunctionCall(
1119+
SourceLocation const& _location,
1120+
ASTPointer<Expression> const& _expression,
1121+
std::vector<ASTPointer<Expression>> const& _arguments,
1122+
std::vector<ASTPointer<ASTString>> const& _names
1123+
):
10831124
Expression(_location), m_expression(_expression), m_arguments(_arguments), m_names(_names) {}
10841125
virtual void accept(ASTVisitor& _visitor) override;
10851126
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -1102,7 +1143,10 @@ class FunctionCall: public Expression
11021143
class NewExpression: public Expression
11031144
{
11041145
public:
1105-
NewExpression(SourceLocation const& _location, ASTPointer<Identifier> const& _contractName):
1146+
NewExpression(
1147+
SourceLocation const& _location,
1148+
ASTPointer<Identifier> const& _contractName
1149+
):
11061150
Expression(_location), m_contractName(_contractName) {}
11071151
virtual void accept(ASTVisitor& _visitor) override;
11081152
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -1119,8 +1163,11 @@ class NewExpression: public Expression
11191163
class MemberAccess: public Expression
11201164
{
11211165
public:
1122-
MemberAccess(SourceLocation const& _location, ASTPointer<Expression> _expression,
1123-
ASTPointer<ASTString> const& _memberName):
1166+
MemberAccess(
1167+
SourceLocation const& _location,
1168+
ASTPointer<Expression> _expression,
1169+
ASTPointer<ASTString> const& _memberName
1170+
):
11241171
Expression(_location), m_expression(_expression), m_memberName(_memberName) {}
11251172
virtual void accept(ASTVisitor& _visitor) override;
11261173
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -1140,8 +1187,11 @@ class MemberAccess: public Expression
11401187
class IndexAccess: public Expression
11411188
{
11421189
public:
1143-
IndexAccess(SourceLocation const& _location, ASTPointer<Expression> const& _base,
1144-
ASTPointer<Expression> const& _index):
1190+
IndexAccess(
1191+
SourceLocation const& _location,
1192+
ASTPointer<Expression> const& _base,
1193+
ASTPointer<Expression> const& _index
1194+
):
11451195
Expression(_location), m_base(_base), m_index(_index) {}
11461196
virtual void accept(ASTVisitor& _visitor) override;
11471197
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -1170,7 +1220,10 @@ class PrimaryExpression: public Expression
11701220
class Identifier: public PrimaryExpression
11711221
{
11721222
public:
1173-
Identifier(SourceLocation const& _location, ASTPointer<ASTString> const& _name):
1223+
Identifier(
1224+
SourceLocation const& _location,
1225+
ASTPointer<ASTString> const& _name
1226+
):
11741227
PrimaryExpression(_location), m_name(_name) {}
11751228
virtual void accept(ASTVisitor& _visitor) override;
11761229
virtual void accept(ASTConstVisitor& _visitor) const override;
@@ -1225,9 +1278,12 @@ class Literal: public PrimaryExpression
12251278
Week = Token::SubWeek,
12261279
Year = Token::SubYear
12271280
};
1228-
Literal(SourceLocation const& _location, Token::Value _token,
1229-
ASTPointer<ASTString> const& _value,
1230-
SubDenomination _sub = SubDenomination::None):
1281+
Literal(
1282+
SourceLocation const& _location,
1283+
Token::Value _token,
1284+
ASTPointer<ASTString> const& _value,
1285+
SubDenomination _sub = SubDenomination::None
1286+
):
12311287
PrimaryExpression(_location), m_token(_token), m_value(_value), m_subDenomination(_sub) {}
12321288
virtual void accept(ASTVisitor& _visitor) override;
12331289
virtual void accept(ASTConstVisitor& _visitor) const override;

0 commit comments

Comments
 (0)