Merge changes from bleeding_edge into experimental toiger branch....

src/ast.cc

Index: src/ast.cc
===================================================================
--- src/ast.cc	(revision 1012)
+++ src/ast.cc	(working copy)
@@ -332,7 +332,7 @@
 
 void* RegExpUnparser::VisitQuantifier(RegExpQuantifier* that, void* data) {
   stream()->Add("(# %i ", that->min());
-  if (that->max() == RegExpQuantifier::kInfinity) {
+  if (that->max() == RegExpTree::kInfinity) {
     stream()->Add("- ");
   } else {
     stream()->Add("%i ", that->max());
@@ -381,4 +381,34 @@
 }
 
 
+RegExpDisjunction::RegExpDisjunction(ZoneList<RegExpTree*>* alternatives)
+    : alternatives_(alternatives) {
+  RegExpTree* first_alternative = alternatives->at(0);
+  min_match_ = first_alternative->min_match();
+  max_match_ = first_alternative->max_match();
+  for (int i = 1; i < alternatives->length(); i++) {
+    RegExpTree* alternative = alternatives->at(i);
+    min_match_ = Min(min_match_, alternative->min_match());
+    max_match_ = Max(max_match_, alternative->max_match());
+  }
+}
+
+
+RegExpAlternative::RegExpAlternative(ZoneList<RegExpTree*>* nodes)
+    : nodes_(nodes) {
+  min_match_ = 0;
+  max_match_ = 0;
+  for (int i = 0; i < nodes->length(); i++) {
+    RegExpTree* node = nodes->at(i);
+    min_match_ += node->min_match();
+    int node_max_match = node->max_match();
+    if (kInfinity - max_match_ < node_max_match) {
+      max_match_ = kInfinity;
+    } else {
+      max_match_ += node->max_match();
+    }
+  }
+}
+
+
 } }  // namespace v8::internal