New code completion remarks/issues

[ollydbg]

I'm sorry, I find the bug, it's here

line 766-787 of nativeparser.cpp.

Code Select Expand


            if (!token->m_Args.IsEmpty() && !token->m_Args.Matches(_T("()")))
            {
                wxString buffer = token->m_Args;
                buffer.Remove(0, 1); // remove (
                buffer.RemoveLast(); // remove )
                buffer.Replace(_T(","), _T(";")); // replace commas with semi-colons
                buffer << _T(';'); // aid parser ;)
                buffer.Trim();

                if (s_DebugSmartSense)
                {
                #if wxCHECK_VERSION(2, 9, 0)
                    Manager::Get()->GetLogManager()->DebugLog(F(_T("Parsing arguments: \"%s\""), buffer.wx_str()));
                #else
                    Manager::Get()->GetLogManager()->DebugLog(F(_T("Parsing arguments: \"%s\""), buffer.c_str()));
                #endif
                    if (!buffer.IsEmpty() && !parser->ParseBuffer(buffer, false, false, true))
                    {
                        Manager::Get()->GetLogManager()->DebugLog(_T("ERROR parsing arguments"));
                    }
                }


[MortenMacFly]

I'm sorry, I find the bug, it's here
line 766-787 of nativeparser.cpp.

...so?! What exactly is wrong with that portion?
...besides: it works fine here (trunk)...?!

[ollydbg]

I'm sorry, I find the bug, it's here
line 766-787 of nativeparser.cpp.

...so?! What exactly is wrong with that portion?

The code is wrapped in the if (s_DebugSmartSense ）from rev 5840 to 5845 of the nativeparser.cpp.

[MortenMacFly]

The code is wrapped in the if (s_DebugSmartSense ）from rev 5840 to 5845 of the nativeparser.cpp.

Argh! Good one. Nevermind... my mistake. :oops: I was always using it *with* DebugSmartSense enabled, so that's why it worked here... Will commit the fix soon...

[ollydbg]

The code is wrapped in the if (s_DebugSmartSense ）from rev 5840 to 5845 of the nativeparser.cpp.

Argh! Good one. Nevermind... my mistake. :oops: I was always using it *with* DebugSmartSense enabled, so that's why it worked here... Will commit the fix soon...

haha, I think one reason of the mistake:  #if wxCHECK_VERSION(2, 9, 0)  preprocessor guard is a little annoying.

[MortenMacFly]

Will commit the fix soon...

...done.

[mmkider]

Will commit the fix soon...

...done.

Look so good.
Thank you.

[blueshake]

Will commit the fix soon...

...done.

:lol: :lol: :lol: :lol: :lol: :lol: :lol: :lol:

[blueshake]

Dear ollydbg:
had you tried on reply #155?

[daniloz]

Quick question... in the structs_typedefs.cpp (from the tests - thx Morten):

Code Select Expand


struct _s
{
  int   x;
  float y;
};
typedef struct _s t_s;

typedef struct _s_inner
{
int z_inner;
} t_s_inner;


C::B shows "t_s" as a typedef, BUT "t_s_inner" as a class. Is this a bug or a feature?

Btw, I was expecting to see "t_s_inner" as a typedef...

daniloz

PS: why are structs treated as class by the CC?

[blueshake]

Quick question... in the structs_typedefs.cpp (from the tests - thx Morten):

Code Select Expand


struct _s
{
  int   x;
  float y;
};
typedef struct _s t_s;

typedef struct _s_inner
{
int z_inner;
} t_s_inner;


C::B shows "t_s" as a typedef, BUT "t_s_inner" as a class. Is this a bug or a feature?

Btw, I was expecting to see "t_s_inner" as a typedef...

daniloz

PS: why are structs treated as class by the CC?

not a bug,I do this.read the codes about void ParserThread::ReadClsNames(wxString& ancestor)
as I kown ,there is a bug in typedef handle .so......

[blueshake]

Quick question... in the structs_typedefs.cpp (from the tests - thx Morten):

Code Select Expand


struct _s
{
  int   x;
  float y;
};
typedef struct _s t_s;

typedef struct _s_inner
{
int z_inner;
} t_s_inner;


C::B shows "t_s" as a typedef, BUT "t_s_inner" as a class. Is this a bug or a feature?

Btw, I was expecting to see "t_s_inner" as a typedef...

daniloz

PS: why are structs treated as class by the CC?

fixed.


and fixed the typedef issue.
test codes:

Code Select Expand

struct _s
{
  int   x;
  float y;
};
typedef struct _s t_s;
typedef t_s ssss;

ssss.
patch:

Code Select Expand

Index: src/plugins/codecompletion/parser/parserthread.cpp
===================================================================
--- src/plugins/codecompletion/parser/parserthread.cpp (revision 5859)
+++ src/plugins/codecompletion/parser/parserthread.cpp (working copy)
@@ -1795,13 +1795,15 @@
                   current.c_str(),
                   m_Str.c_str(),
                   (m_pLastParent ? m_pLastParent->m_Name.c_str():_T("<no-parent>")));
-            Token* newToken = DoAddToken(tkClass, current, m_Tokenizer.GetLineNumber());
+            Token* newToken = DoAddToken(tkTypedef, current, m_Tokenizer.GetLineNumber());
             if (!newToken)
                 break;
             else
             {
                 wxString tempAncestor = ancestor;
                 newToken->m_AncestorsString = tempAncestor;
+                newToken->m_ActualType = tempAncestor;
+                newToken->m_Type = tempAncestor;
             }
         }
         else // unexpected
Index: src/plugins/codecompletion/parser/token.cpp
===================================================================
--- src/plugins/codecompletion/parser/token.cpp (revision 5859)
+++ src/plugins/codecompletion/parser/token.cpp (working copy)
@@ -865,7 +865,7 @@
                 {
                     Token* ancestorToken = at(*it);
                     // only classes take part in inheritance
-                    if (ancestorToken && ancestorToken != token && (ancestorToken->m_TokenKind == tkClass || ancestorToken->m_TokenKind == tkEnum))// && !ancestorToken->m_IsTypedef)
+                    if (ancestorToken && ancestorToken != token && (ancestorToken->m_TokenKind == tkClass || ancestorToken->m_TokenKind == tkEnum || ancestorToken->m_TokenKind == tkTypedef))// && !ancestorToken->m_IsTypedef)
                     {
                         token->m_Ancestors.insert(*it);
                         ancestorToken->m_Descendants.insert(i);


[ollydbg]

Here is the patch to add TRACE to the token.cpp.

Also, this patch contains the previous post's patch by blueshake.

Currently, If you test the structs_typedefs.cbp.

Only these statements below failed.

Code Select Expand


//    t_ptr.
//    t_ptr(3,3).


PS: Is it a typo? the original code is:

Code Select Expand


//    t_ptr_s(
//    t_ptr_s(3,3).




[attachment deleted by admin]

[ollydbg]

This is the testing patch for parsing the Macros for GCC 4.x

See the screenshot.



You should also change these section in your default.conf file. Just search by "TOKEN_REPLACEMENTS"

Code Select Expand


<TOKEN_REPLACEMENTS>
<ssmap>
<_GLIBCXX_BEGIN_NAMESPACE>
<![CDATA[+namespace]]>
</_GLIBCXX_BEGIN_NAMESPACE>
<_GLIBCXX_BEGIN_NAMESPACE_TR1>
<![CDATA[-namespace tr1 {]]>
</_GLIBCXX_BEGIN_NAMESPACE_TR1>
<_GLIBCXX_BEGIN_NESTED_NAMESPACE>
<![CDATA[+namespace]]>
</_GLIBCXX_BEGIN_NESTED_NAMESPACE>
<_GLIBCXX_END_NAMESPACE>
<![CDATA[}]]>
</_GLIBCXX_END_NAMESPACE>
<_GLIBCXX_END_NAMESPACE_TR1>
<![CDATA[}]]>
</_GLIBCXX_END_NAMESPACE_TR1>
<_GLIBCXX_END_NESTED_NAMESPACE>
<![CDATA[}]]>
</_GLIBCXX_END_NESTED_NAMESPACE>
<_GLIBCXX_STD>
<![CDATA[std]]>
</_GLIBCXX_STD>
</ssmap>
</TOKEN_REPLACEMENTS>



I'm still testing...

Edit

it seems works OK!



[attachment deleted by admin]

[blueshake]

What I want to know is if doing this wil slow down the parse process?