CFamilyLexer: Fix matching of function parameters

pygments/lexers/c_cpp.py

@@ -129,22 +129,22 @@ class CFamilyLexer(RegexLexer):
             include('keywords'),
             # functions
             (r'(' + _namespaced_ident + r'(?:[&*\s])+)'  # return arguments
-             r'(' + _possible_comments + r')'    # possible comments
+             r'(' + _possible_comments + r')'
              r'(' + _namespaced_ident + r')'             # method name
-             r'(' + _possible_comments + r')'    # possible comments
-             r'(\([^;"\']*?\))'                          # signature
-             r'(' + _possible_comments + r')'    # possible comments
+             r'(' + _possible_comments + r')'
+             r'(\([^;"\')]*?\))'                         # signature
+             r'(' + _possible_comments + r')'
              r'([^;{/"\']*)(\{)',
              bygroups(using(this), using(this, state='whitespace'), Name.Function, using(this, state='whitespace'),
                       using(this), using(this, state='whitespace'), using(this), Punctuation),
              'function'),
             # function declarations
             (r'(' + _namespaced_ident + r'(?:[&*\s])+)'  # return arguments
-             r'(' + _possible_comments + r')'    # possible comments
+             r'(' + _possible_comments + r')'
              r'(' + _namespaced_ident + r')'             # method name
-             r'(' + _possible_comments + r')'    # possible comments
-             r'(\([^;"\']*?\))'                          # signature
-             r'(' + _possible_comments + r')'    # possible comments
+             r'(' + _possible_comments + r')'
+             r'(\([^;"\')]*?\))'                         # signature
+             r'(' + _possible_comments + r')'
              r'([^;/"\']*)(;)',
              bygroups(using(this), using(this, state='whitespace'), Name.Function, using(this, state='whitespace'),
                       using(this), using(this, state='whitespace'), using(this), Punctuation)),

tests/examplefiles/cpp/functions.cpp

@@ -87,4 +87,20 @@ class raz {
 // Make sure these are not functions:
 else if(flag && func_call()) {}
 new T();
-const operator int() const {} // so int is lexed as type and not function.name
+const operator int() const {} // so int is lexed as type and not function.name
+
+class foo bar : public raz
+{
+  Q_OBJECT
+  /// \cond INCLUDE_QPROPERTIES
+  Q_PROPERTY(arg1 arg2)
+  /// \endcond
+
+public:
+  /*!
+    Lorem ipsum core vanditi.
+  */
+  enum duck { dog, // Comment.
+              cat  // Comment (see \ref replot).
+  };
+};