From f5b26222ff0c0cbf61d9a042c5640fe3358fc0fd Mon Sep 17 00:00:00 2001
From: Robert Reif <reif@earthlink.net>
Date: Sun, 23 Jan 2011 22:31:35 +0100
Subject: [PATCH] Symbol database: better handling of functions returning
 function pointer. ticket: #2468

---
 lib/symboldatabase.cpp | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index ff4434098..08c8d5486 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -281,6 +281,8 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
                     // has body?
                     if (Token::Match(argStart->link(), ") const| {|:"))
                     {
+                        Scope *old_scope = scope;
+
                         // class function
                         if (tok->previous() && tok->previous()->str() == "::")
                             addFunction(&scope, &tok, argStart);
@@ -310,19 +312,17 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
                             function.arg = function.argDef;
                             function.type = Function::eFunction;
 
-                            Scope *old_scope = scope;
-
                             addNewFunction(&scope, &tok);
 
                             if (scope)
                                 old_scope->functionList.push_back(function);
+                        }
 
-                            // syntax error
-                            else
-                            {
-                                scope = old_scope;
-                                break;
-                            }
+                        // syntax error
+                        if (!scope)
+                        {
+                            scope = old_scope;
+                            break;
                         }
                     }
 
@@ -339,11 +339,37 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
 
                         // regular function
                         else
+                        {
+                            Function function;
+
+                            // save the function definition argument start '('
+                            function.argDef = argStart;
+
+                            // save the access type
+                            function.access = Public;
+
+                            // save the function name location
+                            function.tokenDef = funcStart;
+                            function.token = funcStart;
+
+                            function.isInline = false;
+                            function.hasBody = true;
+                            function.arg = function.argDef;
+                            function.type = Function::eFunction;
+                            function.retFuncPtr = true;
+
                             addNewFunction(&scope, &tok1);
 
+                            if (scope)
+                                old_scope->functionList.push_back(function);
+                        }
+
                         // syntax error?
                         if (!scope)
+                        {
                             scope = old_scope;
+                            break;
+                        }
 
                         tok = tok1;
                     }