Re: [PATCH 00/10] userdiff: cpp pattern simplification and test framework

2014-03-24 Thread Jeff King
On Fri, Mar 21, 2014 at 10:07:12PM +0100, Johannes Sixt wrote:

 Here is a series that makes the hunk header pattern for C and C++ even
 simpler than suggested by Peff in [1] to catch a lot more C++ functions
 and two more C patterns.
 
 As a preparatory work, the test cases are totally rewritten to make it
 a lot simpler to drop in new tests. There was an earlier attempt to
 change the infrastructure [2], and it is the reason for the widened Cc
 list.

Thanks. This looks sane overall, and I am especially happy about the
increased test coverage. I do not know if your 10/10 misses some cases,
but at least now we can collect and reason about a set of examples going
forward.

-Peff
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 00/10] userdiff: cpp pattern simplification and test framework

2014-03-21 Thread Johannes Sixt
Here is a series that makes the hunk header pattern for C and C++ even
simpler than suggested by Peff in [1] to catch a lot more C++ functions
and two more C patterns.

As a preparatory work, the test cases are totally rewritten to make it
a lot simpler to drop in new tests. There was an earlier attempt to
change the infrastructure [2], and it is the reason for the widened Cc
list.

Two patches also extend the word regexp.

[1] http://article.gmane.org/gmane.comp.version-control.git/243408
[2] http://thread.gmane.org/gmane.comp.version-control.git/187269/focus=187497

Johannes Sixt (10):
  userdiff: support C++ -* and .* operators in the word regexp
  userdiff: support unsigned and long long suffixes of integer constants
  t4018: an infrastructure to test hunk headers
  t4018: convert perl pattern tests to the new infrastructure
  t4018: convert java pattern test to the new infrastructure
  t4018: convert custom pattern test to the new infrastructure
  t4018: reduce test files for pattern compilation tests
  t4018: test cases for the built-in cpp pattern
  t4018: test cases showing that the cpp pattern misses many anchor
points
  userdiff: have 'cpp' hunk header pattern catch more C++ anchor points

 t/t4018-diff-funcname.sh   | 230 ++---
 t/t4018/README |  18 +++
 t/t4018/cpp-c++-function   |   4 +
 t/t4018/cpp-class-constructor  |   4 +
 t/t4018/cpp-class-constructor-mem-init |   5 +
 t/t4018/cpp-class-definition   |   4 +
 t/t4018/cpp-class-definition-derived   |   5 +
 t/t4018/cpp-class-destructor   |   4 +
 t/t4018/cpp-function-returning-global-type |   4 +
 t/t4018/cpp-function-returning-nested  |   5 +
 t/t4018/cpp-function-returning-pointer |   4 +
 t/t4018/cpp-function-returning-reference   |   4 +
 t/t4018/cpp-gnu-style-function |   5 +
 t/t4018/cpp-namespace-definition   |   4 +
 t/t4018/cpp-operator-definition|   4 +
 t/t4018/cpp-skip-access-specifiers |   8 +
 t/t4018/cpp-skip-comment-block |   9 ++
 t/t4018/cpp-skip-labels|   8 +
 t/t4018/cpp-struct-definition  |   9 ++
 t/t4018/cpp-struct-single-line |   7 +
 t/t4018/cpp-template-function-definition   |   4 +
 t/t4018/cpp-union-definition   |   4 +
 t/t4018/cpp-void-c-function|   4 +
 t/t4018/custom1-pattern|  17 +++
 t/t4018/custom2-match-to-end-of-line   |   8 +
 t/t4018/custom3-alternation-in-pattern |  17 +++
 t/t4018/java-class-member-function |   8 +
 t/t4018/perl-skip-end-of-heredoc   |   8 +
 t/t4018/perl-skip-forward-decl |  10 ++
 t/t4018/perl-skip-sub-in-pod   |  18 +++
 t/t4018/perl-sub-definition|   4 +
 t/t4018/perl-sub-definition-kr-brace   |   4 +
 userdiff.c |  12 +-
 33 files changed, 303 insertions(+), 160 deletions(-)
 create mode 100644 t/t4018/README
 create mode 100644 t/t4018/cpp-c++-function
 create mode 100644 t/t4018/cpp-class-constructor
 create mode 100644 t/t4018/cpp-class-constructor-mem-init
 create mode 100644 t/t4018/cpp-class-definition
 create mode 100644 t/t4018/cpp-class-definition-derived
 create mode 100644 t/t4018/cpp-class-destructor
 create mode 100644 t/t4018/cpp-function-returning-global-type
 create mode 100644 t/t4018/cpp-function-returning-nested
 create mode 100644 t/t4018/cpp-function-returning-pointer
 create mode 100644 t/t4018/cpp-function-returning-reference
 create mode 100644 t/t4018/cpp-gnu-style-function
 create mode 100644 t/t4018/cpp-namespace-definition
 create mode 100644 t/t4018/cpp-operator-definition
 create mode 100644 t/t4018/cpp-skip-access-specifiers
 create mode 100644 t/t4018/cpp-skip-comment-block
 create mode 100644 t/t4018/cpp-skip-labels
 create mode 100644 t/t4018/cpp-struct-definition
 create mode 100644 t/t4018/cpp-struct-single-line
 create mode 100644 t/t4018/cpp-template-function-definition
 create mode 100644 t/t4018/cpp-union-definition
 create mode 100644 t/t4018/cpp-void-c-function
 create mode 100644 t/t4018/custom1-pattern
 create mode 100644 t/t4018/custom2-match-to-end-of-line
 create mode 100644 t/t4018/custom3-alternation-in-pattern
 create mode 100644 t/t4018/java-class-member-function
 create mode 100644 t/t4018/perl-skip-end-of-heredoc
 create mode 100644 t/t4018/perl-skip-forward-decl
 create mode 100644 t/t4018/perl-skip-sub-in-pod
 create mode 100644 t/t4018/perl-sub-definition
 create mode 100644 t/t4018/perl-sub-definition-kr-brace

-- 
1.8.5.2.244.g9fb3fb1

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 00/10] userdiff: cpp pattern simplification and test framework

2014-03-21 Thread Junio C Hamano
Thanks; will replace jk/diff-funcname-cpp-regex with this series.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html