- renamed AST to ast and ABI to abi

- style fixes

10 files changed, 31 insertions, 24 deletions

diff --git a/libsolidity/AST.cpp b/libsolidity/AST.cpp
index a9382031..8889edf0 100644
--- a/libsolidity/AST.cpp
+++ b/libsolidity/AST.cpp
@@ -112,8 +112,10 @@ map<FixedHash<4>, FunctionTypePointer> ContractDefinition::interfaceFunctions()
 	for (auto const& it: exportedFunctionList)
 		exportedFunctions.insert(it);
 
-	solAssert(exportedFunctionList.size() == exportedFunctions.size(),
-			  "Hash collision at Function Definition Hash calculation");
+	solAssert(
+		exportedFunctionList.size() == exportedFunctions.size(),
+		"Hash collision at Function Definition Hash calculation"
+	);
 
 	return exportedFunctions;
 }
diff --git a/libsolidity/CompilerStack.cpp b/libsolidity/CompilerStack.cpp
index 53ac5344..385533b2 100644
--- a/libsolidity/CompilerStack.cpp
+++ b/libsolidity/CompilerStack.cpp
@@ -277,7 +277,7 @@ Scanner const& CompilerStack::scanner(string const& _sourceName) const
 	return *source(_sourceName).scanner;
 }
 
-SourceUnit const& CompilerStack::AST(string const& _sourceName) const
+SourceUnit const& CompilerStack::ast(string const& _sourceName) const
 {
 	return *source(_sourceName).ast;
 }
diff --git a/libsolidity/CompilerStack.h b/libsolidity/CompilerStack.h
index e5e1ece8..0d812e02 100644
--- a/libsolidity/CompilerStack.h
+++ b/libsolidity/CompilerStack.h
@@ -132,7 +132,7 @@ public:
 	/// @returns the previously used scanner, useful for counting lines during error reporting.
 	Scanner const& scanner(std::string const& _sourceName = "") const;
 	/// @returns the parsed source unit with the supplied name.
-	SourceUnit const& AST(std::string const& _sourceName = "") const;
+	SourceUnit const& ast(std::string const& _sourceName = "") const;
 	/// @returns the parsed contract with the supplied name. Throws an exception if the contract
 	/// does not exist.
 	ContractDefinition const& contractDefinition(std::string const& _contractName) const;
diff --git a/libsolidity/InterfaceHandler.cpp b/libsolidity/InterfaceHandler.cpp
index a52357d0..fc79b493 100644
--- a/libsolidity/InterfaceHandler.cpp
+++ b/libsolidity/InterfaceHandler.cpp
@@ -28,7 +28,7 @@ string InterfaceHandler::documentation(
 	case DocumentationType::NatspecDev:
 		return devDocumentation(_contractDef);
 	case DocumentationType::ABIInterface:
-		return ABIInterface(_contractDef);
+		return abiInterface(_contractDef);
 	case DocumentationType::ABISolidityInterface:
 		return ABISolidityInterface(_contractDef);
 	}
@@ -37,7 +37,7 @@ string InterfaceHandler::documentation(
 	return "";
 }
 
-string InterfaceHandler::ABIInterface(ContractDefinition const& _contractDef)
+string InterfaceHandler::abiInterface(ContractDefinition const& _contractDef)
 {
 	Json::Value abi(Json::arrayValue);
 
diff --git a/libsolidity/InterfaceHandler.h b/libsolidity/InterfaceHandler.h
index 86cdc2c4..62164517 100644
--- a/libsolidity/InterfaceHandler.h
+++ b/libsolidity/InterfaceHandler.h
@@ -73,7 +73,7 @@ public:
 	/// Get the ABI Interface of the contract
 	/// @param _contractDef The contract definition
 	/// @return             A string with the json representation of the contract's ABI Interface
-	std::string ABIInterface(ContractDefinition const& _contractDef);
+	std::string abiInterface(ContractDefinition const& _contractDef);
 	std::string ABISolidityInterface(ContractDefinition const& _contractDef);
 	/// Get the User documentation of the contract
 	/// @param _contractDef The contract definition
diff --git a/libsolidity/NameAndTypeResolver.cpp b/libsolidity/NameAndTypeResolver.cpp
index a0298e8e..96800ec3 100644
--- a/libsolidity/NameAndTypeResolver.cpp
+++ b/libsolidity/NameAndTypeResolver.cpp
@@ -80,7 +80,9 @@ void NameAndTypeResolver::resolveNamesAndTypes(ContractDefinition& _contract)
 	{
 		m_currentScope = &m_scopes[function.get()];
 		ReferencesResolver referencesResolver(
-			*function, *this, &_contract,
+			*function,
+			*this,
+			&_contract,
 			function->returnParameterList().get()
 		);
 	}
diff --git a/libsolidity/Parser.cpp b/libsolidity/Parser.cpp
index c196c666..e001d0f1 100644
--- a/libsolidity/Parser.cpp
+++ b/libsolidity/Parser.cpp
@@ -139,16 +139,19 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
 	while (true)
 	{
 		Token::Value currentTokenValue= m_scanner->currentToken();
-		if (currentTokenValue== Token::RBrace)
+		if (currentTokenValue == Token::RBrace)
 			break;
-		else if (currentTokenValue== Token::Function)
+		else if (currentTokenValue == Token::Function)
 			functions.push_back(parseFunctionDefinition(name.get()));
-		else if (currentTokenValue== Token::Struct)
+		else if (currentTokenValue == Token::Struct)
 			structs.push_back(parseStructDefinition());
-		else if (currentTokenValue== Token::Enum)
+		else if (currentTokenValue == Token::Enum)
 			enums.push_back(parseEnumDefinition());
-		else if (currentTokenValue== Token::Identifier || currentTokenValue== Token::Mapping ||
-				 Token::isElementaryTypeName(currentTokenValue))
+		else if (
+			currentTokenValue == Token::Identifier ||
+			currentTokenValue == Token::Mapping ||
+			Token::isElementaryTypeName(currentTokenValue)
+		)
 		{
 			VarDeclParserOptions options;
 			options.isStateVariable = true;
@@ -156,9 +159,9 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
 			stateVariables.push_back(parseVariableDeclaration(options));
 			expectToken(Token::Semicolon);
 		}
-		else if (currentTokenValue== Token::Modifier)
+		else if (currentTokenValue == Token::Modifier)
 			modifiers.push_back(parseModifierDefinition());
-		else if (currentTokenValue== Token::Event)
+		else if (currentTokenValue == Token::Event)
 			events.push_back(parseEventDefinition());
 		else
 			BOOST_THROW_EXCEPTION(createParserError("Function, variable, struct or modifier declaration expected."));
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 3ce6a2d9..6a90c69f 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -522,7 +522,7 @@ void CommandLineInterface::handleCombinedJSON()
 		output["sources"] = Json::Value(Json::objectValue);
 		for (auto const& sourceCode: m_sourceCodes)
 		{
-			ASTJsonConverter converter(m_compiler->AST(sourceCode.first));
+			ASTJsonConverter converter(m_compiler->ast(sourceCode.first));
 			output["sources"][sourceCode.first] = Json::Value(Json::objectValue);
 			output["sources"][sourceCode.first]["AST"] = converter.json();
 		}
@@ -546,7 +546,7 @@ void CommandLineInterface::handleAst(string const& _argStr)
 	{
 		vector<ASTNode const*> asts;
 		for (auto const& sourceCode: m_sourceCodes)
-			asts.push_back(&m_compiler->AST(sourceCode.first));
+			asts.push_back(&m_compiler->ast(sourceCode.first));
 		map<ASTNode const*, eth::GasMeter::GasConsumption> gasCosts;
 		if (m_compiler->runtimeAssemblyItems())
 			gasCosts = GasEstimator::breakToStatementLevel(
@@ -562,12 +562,12 @@ void CommandLineInterface::handleAst(string const& _argStr)
 				string postfix = "";
 				if (_argStr == g_argAstStr)
 				{
-					ASTPrinter printer(m_compiler->AST(sourceCode.first), sourceCode.second);
+					ASTPrinter printer(m_compiler->ast(sourceCode.first), sourceCode.second);
 					printer.print(data);
 				}
 				else
 				{
-					ASTJsonConverter converter(m_compiler->AST(sourceCode.first));
+					ASTJsonConverter converter(m_compiler->ast(sourceCode.first));
 					converter.print(data);
 					postfix += "_json";
 				}
@@ -584,7 +584,7 @@ void CommandLineInterface::handleAst(string const& _argStr)
 				if (_argStr == g_argAstStr)
 				{
 					ASTPrinter printer(
-						m_compiler->AST(sourceCode.first),
+						m_compiler->ast(sourceCode.first),
 						sourceCode.second,
 						gasCosts
 					);
@@ -592,7 +592,7 @@ void CommandLineInterface::handleAst(string const& _argStr)
 				}
 				else
 				{
-					ASTJsonConverter converter(m_compiler->AST(sourceCode.first));
+					ASTJsonConverter converter(m_compiler->ast(sourceCode.first));
 					converter.print(cout);
 				}
 			}
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index 207ecb3c..b6b9f512 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -179,7 +179,7 @@ string compile(string _input, bool _optimize)
 
 	output["sources"] = Json::Value(Json::objectValue);
 	output["sources"][""] = Json::Value(Json::objectValue);
-	output["sources"][""]["AST"] = ASTJsonConverter(compiler.AST("")).json();
+	output["sources"][""]["AST"] = ASTJsonConverter(compiler.ast("")).json();
 
 	return Json::FastWriter().write(output);
 }
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index bcf9bbc1..897d12fd 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -49,7 +49,7 @@ public:
 		ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(), "Compiling contract failed");
 
 		AssemblyItems const* items = m_compiler.runtimeAssemblyItems("");
-		ASTNode const& sourceUnit = m_compiler.AST();
+		ASTNode const& sourceUnit = m_compiler.ast();
 		BOOST_REQUIRE(items != nullptr);
 		m_gasCosts = GasEstimator::breakToStatementLevel(
 			GasEstimator::structuralEstimation(*items, vector<ASTNode const*>({&sourceUnit})),