flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

StyleCheck: Check spaces around ==, <=, >=

This commit is contained in:
Mattes D 2015-10-08 16:16:53 +02:00
parent 86ab236b01
commit 66e8190ca8
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CheckBasicStyle.lua
View File

@ -187,11 +187,19 @@ local g_ViolationPatterns =
{"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%/[a-zA-Z0-9]+", "Add space around /"},
-- Check spaces around "&":
{"^[a-zA-Z0-9]+%&[a-zA-Z0-9]+", "Add space around /"},
{"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%&[a-zA-Z0-9]+", "Add space around /"},
{"^[a-zA-Z0-9]+%&[a-zA-Z0-9]+", "Add space around &"},
{"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%&[a-zA-Z0-9]+", "Add space around &"},
{"^[a-zA-Z0-9]+%& [a-zA-Z0-9]+", "Add space before &"},
{"^[^\"]*[!@#$%%%^&*() %[%]\t][a-zA-Z0-9]+%& [a-zA-Z0-9]+", "Add space before &"},
-- Check spaces around "==", "<=" and ">=":
{"==[a-zA-Z0-9]+", "Add space after =="},
{"[a-zA-Z0-9]+==", "Add space before =="},
{"<=[a-zA-Z0-9]+", "Add space after <="},
{"[a-zA-Z0-9]+<=", "Add space before <="},
{">=[a-zA-Z0-9]+", "Add space after >="},
{"[a-zA-Z0-9]+>=", "Add space before >="},
-- We don't like "Type const *" and "Type const &". Use "const Type *" and "const Type &" instead:
{"const %&", "Use 'const Type &' instead of 'Type const &'"},
{"const %*", "Use 'const Type *' instead of 'Type const *'"},

6
src/Mobs/Monster.cpp
View File

@ -320,7 +320,7 @@ bool cMonster::EnsureProperDestination(cChunk & a_Chunk)
{
for (x = -1; x <= 1; ++x)
{
if ((x==0) && (z==0))
if ((x == 0) && (z == 0))
{
continue;
}
@ -329,8 +329,8 @@ bool cMonster::EnsureProperDestination(cChunk & a_Chunk)
{
return false;
}
RelX = FloorC(m_FinalDestination.x+x) - Chunk->GetPosX() * cChunkDef::Width;
RelZ = FloorC(m_FinalDestination.z+z) - Chunk->GetPosZ() * cChunkDef::Width;
RelX = FloorC(m_FinalDestination.x + x) - Chunk->GetPosX() * cChunkDef::Width;
RelZ = FloorC(m_FinalDestination.z + z) - Chunk->GetPosZ() * cChunkDef::Width;
Chunk->GetBlockTypeMeta(RelX, FloorC(m_FinalDestination.y) - 1, RelZ, BlockType, BlockMeta);
if (cBlockInfo::IsSolid(BlockType))
{