Author Topic: [RFA] patch to fix Bug #18483 Auto-completion of function pointers in a struct  (Read 5990 times)

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5229
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
I have the patch to fix this issue:
Auto-completion of function pointers in a structure
Code: [Select]
Index: parserthread.cpp
===================================================================
--- parserthread.cpp (revision 7785)
+++ parserthread.cpp (working copy)
@@ -1948,7 +1948,7 @@
     m_Tokenizer.SetState(oldState);
 }
 
-void ParserThread::HandleFunction(const wxString& name, bool isOperator)
+void ParserThread::HandleFunction(wxString& name, bool isOperator)
 {
     TRACE(_T("HandleFunction() : Adding function '")+name+_T("': m_Str='")+m_Str+_T("'"));
     int lineNr = m_Tokenizer.GetLineNumber();
@@ -2029,6 +2029,25 @@
                 break; // function decl
             else if (peek == ParserConsts::kw_const)
                 isConst = true;
+            else if (peek.GetChar(0)== ParserConsts::opbracket_chr)
+            {
+                //Here, we meet some kind of statement like: a function pointer declaration
+                //unsigned int (*func1)(int var1);
+                //now: peek = (int var1);
+                int pos = peek.find(ParserConsts::ptr);
+                if (pos != wxNOT_FOUND) //find *
+                {
+                    peek.Trim(true).RemoveLast();
+                    peek.Remove(0, pos+1);
+                    name = peek;
+                    peek = m_Tokenizer.PeekToken();
+                    //Thus, the peek should be ";"
+                    if( peek == ParserConsts::semicolon )
+                    {
+                        break; // function pointer declaration
+                    }
+                }
+            }
             else
                 break; // darned macros that do not end with a semicolon :/
 
Index: parserthread.h
===================================================================
--- parserthread.h (revision 7785)
+++ parserthread.h (working copy)
@@ -196,7 +196,7 @@
       * @param name function name
       * @param isOperator if true, means it is an operator overload function
       */
-    void HandleFunction(const wxString& name, bool isOperator = false);
+    void HandleFunction(wxString& name, bool isOperator = false);
 
     /** handle enum declaration */
     void HandleEnum();


So, I need your comments. :)
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 12372
    • Travis build status
Does the test suite passes, without failures?
Urhm, there is not test suite, then you're doomed. :)
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline ollydbg

  • Developer
  • Lives here!
  • *****
  • Posts: 5229
  • OpenCV and Robotics
    • Chinese OpenCV forum moderator
Does the test suite passes, without failures?
Urhm, there is not test suite, then you're doomed. :)


I think the simplest test suite that we could do is to extend the parsertest project.

We feed some file(source file to it), and we check the log output (the tree list contains all the symbols), then we can see if it matches some standard log.

PS: I have no experiences on create any test suite project... :-[
If some piece of memory should be reused, turn them to variables (or const variables).
If some piece of operations should be reused, turn them to functions.
If they happened together, then turn them to classes.

Offline oBFusCATed

  • Developer
  • Lives here!
  • *****
  • Posts: 12372
    • Travis build status
So now you can gain it, by making such a test suite project  :P
(most of the time I ignore long posts)
[strangers don't send me private messages, I'll ignore them; post a topic in the forum, but first read the rules!]

Offline MortenMacFly

  • Administrator
  • Lives here!
  • *****
  • Posts: 9592
Does the test suite passes, without failures?
Urhm, there is not test suite, then you're doomed. :)
A simple "test suite" is to run let run CC through the C::B sources one time with and one time without the patch and inspect, how many tokens in how many files are found. if it's getting less -> something is seriously wrong.

However, generally obfuscated is right: we *need* unit testing here. But it won't be easy, as the parser has many options and you need actually to test against all their combinations. I've started with test cases under plugins\codecompletion\testing, though...
Compiler logging: Settings->Compiler & Debugger->tab "Other"->Compiler logging="Full command line"
C::B Manual: http://www.codeblocks.org/docs/main_codeblocks_en.html
C::B FAQ: http://wiki.codeblocks.org/index.php?title=FAQ