git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: xfuncname problems with C++

From
RDRobert Dailey <rcdailey.lists@gmail.com>
Date
Jan 2, 2015, 21:27 UTC
Message-ID
<CAHd499DpyO6Csji8gp1E6HsrvtBa7QMKBah2xOewrWAfNgQUHg@mail.gmail.com>
In-Reply-To
<54A7000A.3050605@kdbg.org>
On Fri, Jan 2, 2015 at 2:31 PM, Johannes Sixt <j6t@kdbg.org> wrote:
Show 61 quoted lines
> Am 02.01.2015 um 18:03 schrieb Robert Dailey:
>> On Fri, Jan 2, 2015 at 10:49 AM, Robert Dailey <rcdailey.lists@gmail.com> wrote:
>>> I have a function like so:
>>>
>>> void MyClass::SomeFunction(int someParameter)
>>> {
>>>     // Stuff changed in here
>>> }
>>>
>>> When I do `git diff` on the file containing this function, I get a
>>> chunk showing some changed code in this function somewhere in the
>>> middle of the body. However, the chunk header shows my root namespace
>>> name in the file instead of the function header:
>>>
>>> @@ -144,15 +149,22 @@ namespace Utils
>>>
>>> What I expect to see:
>>>
>>> @@ -144,15 +149,22 @@ void MyClass::SomeFunction(int someParameter)
>>>
>>> I've tried various regular expressions that work in regex testers I
>>> use against this function signature, however they do not work when I
>>> apply them to my config:
>>>
>>> [diff "cpp"]
>>>     xfuncname =
>>> "^\\s*[\\w_][\\w\\d_]*\\s*.*\\s*[\\w_][\\w\\d_]*\\s*\\(.*\\)\\s*$"
>>>
>>> File name is "foo.cpp", I even added it to my git attributes file:
>>>
>>> *.cpp diff=cpp
>>>
>>> Using the regex above, my chunk headers come back blank. Why is it
>>> showing namespace? How do I make this match the nearest function
>>> header?
>>
>> Oopsie, I didn't realize the regex must be POSIX compatible. I've
>> updated the regex to this:
>> https://www.regex101.com/r/kP3dM6
>>
>> The test seems to work; however git gives me an error with the regex
>> when I do a diff:
>>
>> $ git diff Core
>> fatal: Invalid regexp to look for hunk header:
>> ^[[:space:]]*[[:word:]_][[:word:][:digit:]_]*[[:space:]]*.*[[:space:]]*[[:word:]_][[:word:][:digit:]_]*[[:space:]]*\(.*\)[[:space:]]*$
>>
>> Here is how it is stored in my .gitconfig:
>>
>> [diff "cpp"]
>>     xfuncname =
>> "^[[:space:]]*[[:word:]_][[:word:][:digit:]_]*[[:space:]]*.*[[:space:]]*[[:word:]_][[:word:][:digit:]_]*[[:space:]]*\\(.*\\)[[:space:]]*$"
>>
>
> Perhaps there is a pair of parentheses missing that capture text for the
> hunk header? I you intended that to be the part inside \(...\), then
> that is wrong. Use unescapted parentheses.
>
> There are two catch-all .* in your pattern. That is very suspicious,
> particularly since the first one is outside the meant-to-be capturing
> parentheses.

My regex actually is intended to not have any capture groups. Is that required? The documentation I read didn't mention any requirements, so I am not sure.

The 'void' does not start on the leftmost column, due to tabbing there can be any number of whitespace (the regex should account for this).

Previous: Johannes SixtNext: Jonathan Nieder
Message 4 of 7 in “xfuncname problems with C++”
  1. Robert DaileyJan 2, 2015
  2. Robert DaileyJan 2, 2015
  3. Johannes SixtJan 2, 2015
  4. Robert DaileyJan 2, 2015
  5. Jonathan NiederJan 2, 2015
  6. Jonathan NiederJan 2, 2015
  7. Johannes SixtJan 2, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.