mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
- renamed AST to ast and ABI to abi
- style fixes
This commit is contained in:
+4
-2
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
);
|
||||
}
|
||||
|
||||
+11
-8
@@ -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."));
|
||||
|
||||
Reference in New Issue
Block a user