Parse enumerator assignment

[Alpha]

Testing parsing of enumerator assignments.  (Patch attached.)

[oBFusCATed]

Can you give example, what doesn't work and work works with the patch.
I'm not sure I understand the term enumerator assignments.

[Alpha]

Given the following from src/plugins/codecompletion/parser/tokenizer.h

Code Select Expand


enum TokenizerState
{
    tsSkipEqual         = 0x0001,         /// Skip the assignment statement
    tsSkipQuestion      = 0x0002,         /// Skip the conditional evaluation statement
    tsSkipSubScrip      = 0x0004,         /// Skip the array-subscript notation statement

    tsSingleAngleBrace  = 0x0008,         /// Reserve angle braces
    tsReadRawExpression = 0x0010,         /// Reserve every chars

    tsSkipNone          = 0x1000,         /// Skip None
    // convenient masks
    tsSkipUnWanted      = tsSkipEqual    | tsSkipQuestion | tsSkipSubScrip,
    tsTemplateArgument  = tsSkipUnWanted | tsSingleAngleBrace
};

The tool tip for tsSkipQuestion is currently:

Code Select Expand

TokenizerState::tsSkipQuestion=
With this patch, it becomes:

Code Select Expand

TokenizerState::tsSkipQuestion=0x0002
With this patch, the tool tip for tsTemplateArgument is:

Code Select Expand

TokenizerState::tsTemplateArgument=tsSkipUnWanted|tsSingleAngleBrace

Given the following code:

Code Select Expand


enum HexAssignment
{
    haFirst = 0x0001,
    haSecond,
    haThird
};

enum Colors
{
    clRed,
    clBlue,
    clGreen
};

enum TestEnum
{
    teFirst,
    teSecond = 5,
    teThird
};

haFirst is:

Code Select Expand

HexAssignment::haFirst=0x0001
haSecond is:

Code Select Expand

HexAssignment::haSecond=0x0002
haThird is:

Code Select Expand

HexAssignment::haThird=0x0003
clRed is:

Code Select Expand

Colors::clRed=0
clGreen is:

Code Select Expand

Colors::clGreen=2
teFirst is

Code Select Expand

TestEnum::teFirst=0
teThird is

Code Select Expand

TestEnum::teThird=6

[Alpha]

Code Select Expand


enum TokenizerState
{
    tsSkipEqual         = 0x0001,         /// Skip the assignment statement
    tsSkipQuestion      = 0x0002,         /// Skip the conditional evaluation statement
    tsSkipSubScrip      = 0x0004,         /// Skip the array-subscript notation statement

    tsSingleAngleBrace  = 0x0008,         /// Reserve angle braces
    tsReadRawExpression = 0x0010,         /// Reserve every chars

    tsSkipNone          = 0x1000,         /// Skip None
    // convenient masks
    tsSkipUnWanted      = tsSkipEqual    | tsSkipQuestion | tsSkipSubScrip,
    tsTemplateArgument  = tsSkipUnWanted | tsSingleAngleBrace,
    tsAnotherState
};

What does not work is that with this patch tsAnotherState will still have the tool tip:

Code Select Expand

TokenizerState::tsAnotherState=

[oBFusCATed]

Have tried to add a test to the test application (cctest or something like this)?

[Alpha]

No, I have not added test cases yet; I will try to this weekend.

[ollydbg]

Just applied your patch (not test yet), and I see that the major part of your patch is handling the assignment.
Looks really nice.
So some suggestions:

Code Select Expand


        // assignments (=xxx) are ignored by the tokenizer,
        // so we don't have to worry about them here ;)

These two comment lines should be removed.

Maybe, add comments like:

Code Select Expand

enumerator->m_Args += peek; //emulator values were stored in m_Args field of the Token

Code Select Expand



                        // emulator value string may have two types, hex value with prefix "0x" or decimal value
                        if (lastEnumerator->m_Args.StartsWith(wxT("0x")))


[Alpha]

Attached patch has better comments (functionality is the same).  I will write test cases, and then probably commit if no problems are identified.