AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Graph node attribute printing.

Browse Source 
git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@852 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
christian.plesner.hansen@gmail.com 2008-11-27 07:21:43 +00:00
parent 259789372f
commit be6f6d0dc2
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/jsregexp.cc
View File

@ -1500,6 +1500,7 @@ class DotPrinter: public NodeVisitor {
void PrintNode(const char* label, RegExpNode* node); void PrintNode(const char* label, RegExpNode* node);
void Visit(RegExpNode* node); void Visit(RegExpNode* node);
void PrintOnFailure(RegExpNode* from, RegExpNode* on_failure); void PrintOnFailure(RegExpNode* from, RegExpNode* on_failure);
void PrintAttributes(RegExpNode* from);
StringStream* stream() { return &stream_; } StringStream* stream() { return &stream_; }
#define DECLARE_VISIT(Type) \ #define DECLARE_VISIT(Type) \
virtual void Visit##Type(Type##Node* that); virtual void Visit##Type(Type##Node* that);
@ -1602,11 +1603,34 @@ class TableEntryHeaderPrinter {
}; };
void DotPrinter::PrintAttributes(RegExpNode* that) {
stream()->Add(" a%p [shape=Mrecord, style=dashed, color=lightgrey, "
"fontcolor=lightgrey, margin=0.1, fontsize=10, label=\"{",
that);
NodeInfo* info = that->info();
stream()->Add("{NI|%i}|{SI|%i}|{WI|%i}",
info->follows_newline_interest,
info->follows_start_interest,
info->follows_word_interest);
stream()->Add("|{DN|%i}|{DS|%i}|{DW|%i}",
info->determine_newline,
info->determine_start,
info->determine_word);
Label* label = that->label();
if (label->is_bound())
stream()->Add("|{@|%x}", label->pos());
stream()->Add("}\"];\n");
stream()->Add(" a%p -> n%p [style=dashed, color=lightgrey, "
"arrowhead=none];\n", that, that);
}
void DotPrinter::VisitChoice(ChoiceNode* that) { void DotPrinter::VisitChoice(ChoiceNode* that) {
stream()->Add(" n%p [shape=Mrecord, label=\"", that); stream()->Add(" n%p [shape=Mrecord, label=\"", that);
TableEntryHeaderPrinter header_printer(stream()); TableEntryHeaderPrinter header_printer(stream());
that->table()->ForEach(&header_printer); that->table()->ForEach(&header_printer);
stream()->Add("\"]\n", that); stream()->Add("\"]\n", that);
PrintAttributes(that);
TableEntryBodyPrinter body_printer(stream(), that); TableEntryBodyPrinter body_printer(stream(), that);
that->table()->ForEach(&body_printer); that->table()->ForEach(&body_printer);
PrintOnFailure(that, that->on_failure()); PrintOnFailure(that, that->on_failure());
@ -1644,6 +1668,7 @@ void DotPrinter::VisitText(TextNode* that) {
} }
} }
stream()->Add("\", shape=box, peripheries=2];\n"); stream()->Add("\", shape=box, peripheries=2];\n");
PrintAttributes(that);
stream()->Add(" n%p -> n%p;\n", that, that->on_success()); stream()->Add(" n%p -> n%p;\n", that, that->on_success());
Visit(that->on_success()); Visit(that->on_success());
PrintOnFailure(that, that->on_failure()); PrintOnFailure(that, that->on_failure());
@ -1655,6 +1680,7 @@ void DotPrinter::VisitBackReference(BackReferenceNode* that) {
that, that,
that->start_register(), that->start_register(),
that->end_register()); that->end_register());
PrintAttributes(that);
stream()->Add(" n%p -> n%p;\n", that, that->on_success()); stream()->Add(" n%p -> n%p;\n", that, that->on_success());
Visit(that->on_success()); Visit(that->on_success());
PrintOnFailure(that, that->on_failure()); PrintOnFailure(that, that->on_failure());
@ -1663,6 +1689,7 @@ void DotPrinter::VisitBackReference(BackReferenceNode* that) {
void DotPrinter::VisitEnd(EndNode* that) { void DotPrinter::VisitEnd(EndNode* that) {
stream()->Add(" n%p [style=bold, shape=point];\n", that); stream()->Add(" n%p [style=bold, shape=point];\n", that);
PrintAttributes(that);
} }
@ -1698,6 +1725,7 @@ void DotPrinter::VisitAction(ActionNode* that) {
break; break;
} }
stream()->Add("];\n"); stream()->Add("];\n");
PrintAttributes(that);
stream()->Add(" n%p -> n%p;\n", that, that->on_success()); stream()->Add(" n%p -> n%p;\n", that, that->on_success());
Visit(that->on_success()); Visit(that->on_success());
} }

2
test/cctest/test-regexp.cc
View File

@ -1175,5 +1175,5 @@ TEST(CharacterRangeCaseIndependence) {
TEST(Graph) { TEST(Graph) {
V8::Initialize(NULL); V8::Initialize(NULL);
Execute("(x)?\\1y", "", true); Execute("\\w+", "", true);
} }