Apply clang-format to code base

This commit is contained in:
clang-format-bot 2022-09-22 21:26:05 +03:00 committed by ζeh Matt
parent f37d0be806
commit ddb0522bbf
No known key found for this signature in database
GPG key ID: 18CE582C71A225B0
2199 changed files with 118692 additions and 114392 deletions

View file

@ -2,54 +2,63 @@
#include <components/misc/strings/lower.hpp>
#include "scanner.hpp"
#include "errorhandler.hpp"
#include "skipparser.hpp"
#include "locals.hpp"
#include "scanner.hpp"
#include "skipparser.hpp"
Compiler::DeclarationParser::DeclarationParser (ErrorHandler& errorHandler, const Context& context,
Locals& locals)
: Parser (errorHandler, context), mLocals (locals), mState (State_Begin), mType (0)
{}
bool Compiler::DeclarationParser::parseName (const std::string& name, const TokenLoc& loc,
Scanner& scanner)
Compiler::DeclarationParser::DeclarationParser(ErrorHandler& errorHandler, const Context& context, Locals& locals)
: Parser(errorHandler, context)
, mLocals(locals)
, mState(State_Begin)
, mType(0)
{
if (mState==State_Name)
}
bool Compiler::DeclarationParser::parseName(const std::string& name, const TokenLoc& loc, Scanner& scanner)
{
if (mState == State_Name)
{
std::string name2 = ::Misc::StringUtils::lowerCase (name);
std::string name2 = ::Misc::StringUtils::lowerCase(name);
char type = mLocals.getType (name2);
char type = mLocals.getType(name2);
if (type!=' ')
getErrorHandler().warning ("Local variable re-declaration", loc);
if (type != ' ')
getErrorHandler().warning("Local variable re-declaration", loc);
else
mLocals.declare (mType, name2);
mLocals.declare(mType, name2);
mState = State_End;
return true;
}
else if (mState==State_End)
else if (mState == State_End)
{
getErrorHandler().warning ("Extra text after local variable declaration", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
getErrorHandler().warning("Extra text after local variable declaration", loc);
SkipParser skip(getErrorHandler(), getContext());
scanner.scan(skip);
return false;
}
return Parser::parseName (name, loc, scanner);
return Parser::parseName(name, loc, scanner);
}
bool Compiler::DeclarationParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
bool Compiler::DeclarationParser::parseKeyword(int keyword, const TokenLoc& loc, Scanner& scanner)
{
if (mState==State_Begin)
if (mState == State_Begin)
{
switch (keyword)
{
case Scanner::K_short: mType = 's'; break;
case Scanner::K_long: mType = 'l'; break;
case Scanner::K_float: mType = 'f'; break;
default: mType = 0;
case Scanner::K_short:
mType = 's';
break;
case Scanner::K_long:
mType = 'l';
break;
case Scanner::K_float:
mType = 'f';
break;
default:
mType = 0;
}
if (mType)
@ -58,41 +67,41 @@ bool Compiler::DeclarationParser::parseKeyword (int keyword, const TokenLoc& loc
return true;
}
}
else if (mState==State_Name)
else if (mState == State_Name)
{
// allow keywords to be used as local variable names. MW script compiler, you suck!
return parseName (loc.mLiteral, loc, scanner);
return parseName(loc.mLiteral, loc, scanner);
}
else if (mState==State_End)
else if (mState == State_End)
{
getErrorHandler().warning ("Extra text after local variable declaration", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
getErrorHandler().warning("Extra text after local variable declaration", loc);
SkipParser skip(getErrorHandler(), getContext());
scanner.scan(skip);
return false;
}
return Parser::parseKeyword (keyword, loc, scanner);
return Parser::parseKeyword(keyword, loc, scanner);
}
bool Compiler::DeclarationParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
bool Compiler::DeclarationParser::parseSpecial(int code, const TokenLoc& loc, Scanner& scanner)
{
if (mState==State_End)
if (mState == State_End)
{
if (code!=Scanner::S_newline)
if (code != Scanner::S_newline)
{
getErrorHandler().warning ("Extra text after local variable declaration", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
getErrorHandler().warning("Extra text after local variable declaration", loc);
SkipParser skip(getErrorHandler(), getContext());
scanner.scan(skip);
}
return false;
}
return Parser::parseSpecial (code, loc, scanner);
return Parser::parseSpecial(code, loc, scanner);
}
bool Compiler::DeclarationParser::parseInt(int value, const TokenLoc& loc, Scanner& scanner)
{
if(mState == State_Name)
if (mState == State_Name)
{
// Allow integers to be used as variable names
return parseName(loc.mLiteral, loc, scanner);