style fixes

This commit is contained in:
LianaHus 2015-10-15 16:13:52 +02:00
parent 68e126dc7d
commit 3871e77946
2 changed files with 16 additions and 16 deletions

View File

@ -311,20 +311,20 @@ void NameAndTypeResolver::reportDeclarationError(
m_errors.push_back(err); m_errors.push_back(err);
} }
void NameAndTypeResolver::reportDeclarationError(SourceLocation _sourceLoction, string const& _description) void NameAndTypeResolver::reportDeclarationError(SourceLocation _sourceLocation, string const& _description)
{ {
auto err = make_shared<Error>(Error::Type::DeclarationError); // todo remove Error? auto err = make_shared<Error>(Error::Type::DeclarationError); // todo remove Error?
*err << errinfo_sourceLocation(_sourceLoction) << errinfo_comment(_description); *err << errinfo_sourceLocation(_sourceLocation) << errinfo_comment(_description);
m_errors.push_back(err); m_errors.push_back(err);
} }
void NameAndTypeResolver::reportFatalDeclarationError( void NameAndTypeResolver::reportFatalDeclarationError(
SourceLocation _sourceLoction, SourceLocation _sourceLocation,
string _description string const& _description
) )
{ {
reportDeclarationError(_sourceLoction, _description); reportDeclarationError(_sourceLocation, _description);
BOOST_THROW_EXCEPTION(FatalError()); BOOST_THROW_EXCEPTION(FatalError());
} }
@ -511,7 +511,7 @@ string DeclarationRegistrationHelper::currentCanonicalName() const
} }
void DeclarationRegistrationHelper::declarationError( void DeclarationRegistrationHelper::declarationError(
SourceLocation _sourceLoction, SourceLocation _sourceLocation,
string const& _description, string const& _description,
SourceLocation _secondarySourceLocation, SourceLocation _secondarySourceLocation,
string const& _secondaryDescription string const& _secondaryDescription
@ -519,7 +519,7 @@ void DeclarationRegistrationHelper::declarationError(
{ {
auto err = make_shared<Error>(Error::Type::DeclarationError); auto err = make_shared<Error>(Error::Type::DeclarationError);
*err << *err <<
errinfo_sourceLocation(_sourceLoction) << errinfo_sourceLocation(_sourceLocation) <<
errinfo_comment(_description) << errinfo_comment(_description) <<
errinfo_secondarySourceLocation( errinfo_secondarySourceLocation(
SecondarySourceLocation().append(_secondaryDescription, _secondarySourceLocation) SecondarySourceLocation().append(_secondaryDescription, _secondarySourceLocation)
@ -528,20 +528,20 @@ void DeclarationRegistrationHelper::declarationError(
m_errors.push_back(err); m_errors.push_back(err);
} }
void DeclarationRegistrationHelper::declarationError(SourceLocation _sourceLoction, string const& _description) void DeclarationRegistrationHelper::declarationError(SourceLocation _sourceLocation, string const& _description)
{ {
auto err = make_shared<Error>(Error::Type::DeclarationError); auto err = make_shared<Error>(Error::Type::DeclarationError);
*err << errinfo_sourceLocation(_sourceLoction) << errinfo_comment(_description); *err << errinfo_sourceLocation(_sourceLocation) << errinfo_comment(_description);
m_errors.push_back(err); m_errors.push_back(err);
} }
void DeclarationRegistrationHelper::fatalDeclarationError( void DeclarationRegistrationHelper::fatalDeclarationError(
SourceLocation _sourceLoction, SourceLocation _sourceLocation,
string const& _description string const& _description
) )
{ {
declarationError(_sourceLoction, _description); declarationError(_sourceLocation, _description);
BOOST_THROW_EXCEPTION(FatalError()); BOOST_THROW_EXCEPTION(FatalError());
} }

View File

@ -101,9 +101,9 @@ private:
std::string const& _secondaryDescription std::string const& _secondaryDescription
); );
// creates the Declaration error and adds it in the errors list // creates the Declaration error and adds it in the errors list
void reportDeclarationError(SourceLocation _sourceLoction, std::string const& _description); void reportDeclarationError(SourceLocation _sourceLocation, std::string const& _description);
// creates the Declaration error and adds it in the errors list and throws FatalError // creates the Declaration error and adds it in the errors list and throws FatalError
void reportFatalDeclarationError(SourceLocation _sourceLoction, std::string _description); void reportFatalDeclarationError(SourceLocation _sourceLocation, std::string const& _description);
// creates the Declaration error and adds it in the errors list // creates the Declaration error and adds it in the errors list
void reportTypeError(Error _e); void reportTypeError(Error _e);
@ -148,16 +148,16 @@ private:
std::string currentCanonicalName() const; std::string currentCanonicalName() const;
// creates the Declaration error and adds it in the errors list // creates the Declaration error and adds it in the errors list
void declarationError( void declarationError(
SourceLocation _sourceLoction, SourceLocation _sourceLocation,
std::string const& _description, std::string const& _description,
SourceLocation _secondarySourceLocation, SourceLocation _secondarySourceLocation,
std::string const& _secondaryDescription std::string const& _secondaryDescription
); );
// creates the Declaration error and adds it in the errors list // creates the Declaration error and adds it in the errors list
void declarationError(SourceLocation _sourceLoction, std::string const& _description); void declarationError(SourceLocation _sourceLocation, std::string const& _description);
// creates the Declaration error and adds it in the errors list and throws FatalError // creates the Declaration error and adds it in the errors list and throws FatalError
void fatalDeclarationError(SourceLocation _sourceLoction, std::string const& _description); void fatalDeclarationError(SourceLocation _sourceLocation, std::string const& _description);
std::map<ASTNode const*, DeclarationContainer>& m_scopes; std::map<ASTNode const*, DeclarationContainer>& m_scopes;
Declaration const* m_currentScope; Declaration const* m_currentScope;