src-highlite.git - src-highlite

diff --git a/src/lib/regexpstateprinter.cpp b/src/lib/regexpstateprinter.cpp
index 9a56b91..be5abb2 100644
--- a/src/lib/regexpstateprinter.cpp
+++ b/src/lib/regexpstateprinter.cpp

@@ -10,6 +10,7 @@

//

//

#include "regexpstateprinter.h"

+#include "regexpreprocessor.h"

#include <iostream>

@@ -33,21 +34,54 @@ void RegExpStatePrinter::printRegExpState(RegExpStatePtr state)

{

do_indent;

cout << " STATE " << state->id << endl;

+ do_indent;

+ cout << " regexp " << state->reg_exp <<

+ (state->has_alternative() ? " (has alternatives)" : "") << endl;

inc_indent;

- int i = 0;

- for (format_vector::const_iterator it = state->formatters.begin();

- it != state->formatters.end(); ++it)

- {

- do_indent;

- cout << i << ": " << (*it)->elem << " "

- << (i > 0 ? state->subExpressions[i-1].first : "");

- printRegExpFormatter(*it);

- ++i;

+ unsigned int i = 0;

+ if (state->allAlternativesCanMatch) {

+ // print the default formatter

+ do_indent;

+ cout << i << ": " << state->formatters[0]->elem << " ";

+ printRegExpFormatter(state->formatters[0]);

+

+ // we need to get all the subexpressions

+ const subexpressions_strings *split = RegexPreProcessor::split_marked_subexpressions(state->reg_exp.str());

+

+ i = 1;

+ for (subexpressions_strings::const_iterator it = split->begin(); it != split->end(); ++it) {

+ do_indent;

+ cout << i << ": " << state->formatters[i]->elem << " "

+ << *it ;

+ ++i;

+ if (i < state->formatters.size())

+ cout << endl;

+ }

+

+ // and print only the last state which has all the next state

+ // and exit level information

+ do_indent;

+ printRegExpFormatter(state->formatters[i-1]);

+

+ delete split;

+ } else {

+ for (format_vector::const_iterator it = state->formatters.begin();

+ it != state->formatters.end(); ++it)

+ {

+ do_indent;

+ cout << i << ": " << (*it)->elem << " "

+ << (i > 0 ? state->subExpressions[i-1].first : "");

+ printRegExpFormatter(*it);

+ ++i;

+ }

}

dec_indent;

+

+ if (state->alternative.get())

+ printRegExpState(state->alternative);

}

void RegExpStatePrinter::printRegExpFormatter(RegExpFormatterPtr formatter)