From: Brandon Casey <drafnel@xxxxxxxxx> Add one case for matching a function returning a pointer. Plus add examples of things we explicitly do not match: labels function declarations global variable declarations Signed-off-by: Brandon Casey <drafnel@xxxxxxxxx> --- This can be squashed into the original patch with the other test cases. This just introduces a few more cases pointed out by Thomas Rast in the email Johannes referenced. http://thread.gmane.org/gmane.comp.version-control.git/186355/focus=186439 Also, note that all of the tests pass except for ignore_global.cpp with Johannes's pattern: "!^[ \\t]*[a-zA-Z_][a-zA-Z_0-9]*[^()]*:[[:space:]]*$\n^[a-zA-Z_][a-zA-Z_0-9]*.*" -Brandon t/t4018/ignore_declaration.cpp | 35 +++++++++++++++++++++++++++++++++++ t/t4018/ignore_global.cpp | 36 ++++++++++++++++++++++++++++++++++++ t/t4018/ignore_label.cpp | 35 +++++++++++++++++++++++++++++++++++ t/t4018/pointer_return.cpp | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+), 0 deletions(-) create mode 100644 t/t4018/ignore_declaration.cpp create mode 100644 t/t4018/ignore_global.cpp create mode 100644 t/t4018/ignore_label.cpp create mode 100644 t/t4018/pointer_return.cpp diff --git a/t/t4018/ignore_declaration.cpp b/t/t4018/ignore_declaration.cpp new file mode 100644 index 0000000..615aea0 --- /dev/null +++ b/t/t4018/ignore_declaration.cpp @@ -0,0 +1,35 @@ +int WRONG_function_hunk_header_preceding_the_right_one (void) +{ + return 0; +} + +int RIGHT_function_hunk_header (void) +{ + void WRONG_function_declaration_within_body (void); + /* + * Filler + * Filler + * Filler + * Filler + * Filler + * Filler + */ + + int answer = 0; + + /* + * Filler + * Filler + * Filler + * Filler + * Filler + * Filler + */ + + return answer; +} + +int WRONG_function_hunk_header_following_the_right_one (void) +{ + return 0; +} diff --git a/t/t4018/ignore_global.cpp b/t/t4018/ignore_global.cpp new file mode 100644 index 0000000..df6b8aa --- /dev/null +++ b/t/t4018/ignore_global.cpp @@ -0,0 +1,36 @@ +int WRONG_function_hunk_header_preceding_the_right_one (void) +{ + return 0; +} + +int RIGHT_function_hunk_header (void) +{ + /* + * Filler + * Filler + * Filler + * Filler + * Filler + * Filler + */ + + return answer; +} + +int WRONG_global_variable; + +/* + * Filler + * Filler + * Filler + * Filler + * Filler + * Filler + */ + +int answer = 0; + +int WRONG_function_hunk_header_following_the_right_one (void) +{ + return 0; +} diff --git a/t/t4018/ignore_label.cpp b/t/t4018/ignore_label.cpp new file mode 100644 index 0000000..2e3ce10 --- /dev/null +++ b/t/t4018/ignore_label.cpp @@ -0,0 +1,35 @@ +int WRONG_function_hunk_header_preceding_the_right_one (void) +{ + return 0; +} + +int RIGHT_function_hunk_header (void) +{ +WRONG_should_not_match_label: + /* + * Filler + * Filler + * Filler + * Filler + * Filler + * Filler + */ + + int answer = 0; + + /* + * Filler + * Filler + * Filler + * Filler + * Filler + * Filler + */ + + return answer; +} + +int WRONG_function_hunk_header_following_the_right_one (void) +{ + return 0; +} diff --git a/t/t4018/pointer_return.cpp b/t/t4018/pointer_return.cpp new file mode 100644 index 0000000..fd85545 --- /dev/null +++ b/t/t4018/pointer_return.cpp @@ -0,0 +1,34 @@ +int WRONG_function_hunk_header_preceding_the_right_one (void) +{ + return 0; +} + +static int *RIGHT_function_hunk_header (void) +{ + /* + * Filler + * Filler + * Filler + * Filler + * Filler + * Filler + */ + + int answer = 0; + + /* + * Filler + * Filler + * Filler + * Filler + * Filler + * Filler + */ + + return answer; +} + +int WRONG_function_hunk_header_following_the_right_one (void) +{ + return 0; +} -- 1.7.7.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html