From 66e8190ca801b78b66c29030e4ace783582b4ec8 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 8 Oct 2015 16:16:53 +0200
Subject: [PATCH] StyleCheck: Check spaces around ==, <=, >=
---
src/CheckBasicStyle.lua | 12 ++++++++++--
src/Mobs/Monster.cpp | 6 +++---
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/CheckBasicStyle.lua b/src/CheckBasicStyle.lua
index f9f8f6b4d..a3d21106a 100755
--- a/src/CheckBasicStyle.lua
+++ b/src/CheckBasicStyle.lua
@@ -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 *'"},
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 4d9b9ca06..7bf56bb47 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -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))
{