diff options
| -rw-r--r-- | apps/codestyle/codestyle-cpp.py | 4 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_worldstate.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/codestyle/codestyle-cpp.py b/apps/codestyle/codestyle-cpp.py index 77ff3f3764..7b0dea93fa 100644 --- a/apps/codestyle/codestyle-cpp.py +++ b/apps/codestyle/codestyle-cpp.py @@ -223,7 +223,7 @@ def misc_codestyle_check(file: io, file_path: str) -> None: # used to check for "if/else (...) {" "} else" ignores "if/else (...) {...}" "#define ... if/else (...) {" ifelse_curlyregex = r"^[^#define].*\s+(if|else)(\s*\(.*\))?\s*{[^}]*$|}\s*else(\s*{[^}]*$)" # used to catch double semicolons ";;" ignores "(;;)" - double_semiregex = r"[^(];;[^)]" + double_semiregex = r"(?<!\()\s*;;(?!\))" # used to catch tabs tab_regex = r"\t" @@ -245,7 +245,7 @@ def misc_codestyle_check(file: io, file_path: str) -> None: print( f"Curly brackets are not allowed to be leading or trailing if/else statements. Place it on a new line: {file_path} at line {line_number}") check_failed = True - if re.match(double_semiregex, line): + if re.search(double_semiregex, line): print( f"Double semicolon (;;) found in {file_path} at line {line_number}") check_failed = True diff --git a/src/server/scripts/Commands/cs_worldstate.cpp b/src/server/scripts/Commands/cs_worldstate.cpp index 7c1887b1c1..40b37d6c5c 100644 --- a/src/server/scripts/Commands/cs_worldstate.cpp +++ b/src/server/scripts/Commands/cs_worldstate.cpp @@ -83,7 +83,7 @@ public: handler->PSendSysMessage("Invalid subphase, see \".worldstate sunsreach subphase\" for usage"); return false; } - sWorldState->HandleSunsReachSubPhaseTransition(subphase);; + sWorldState->HandleSunsReachSubPhaseTransition(subphase); handler->PSendSysMessage(sWorldState->GetSunsReachPrintout()); return true; } |