Introduce text nodes

src/ast.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 169 matching lines @@
 }
 
 
 // ----------------------------------------------------------------------------
 // Regular expressions
 
 #define MAKE_ACCEPT(Name)                                            \
   void* RegExp##Name::Accept(RegExpVisitor* visitor, void* data) {   \
     return visitor->Visit##Name(this, data);                         \
   }
-FOR_EACH_REG_EXP_NODE_TYPE(MAKE_ACCEPT)
+FOR_EACH_REG_EXP_TREE_TYPE(MAKE_ACCEPT)
 #undef MAKE_ACCEPT
 
 #define MAKE_CONVERSION(Name)                                        \
   RegExp##Name* RegExpTree::As##Name() {                             \
     return NULL;                                                     \
   }
-  FOR_EACH_REG_EXP_NODE_TYPE(MAKE_CONVERSION)
+  FOR_EACH_REG_EXP_TREE_TYPE(MAKE_CONVERSION)
 #undef MAKE_CONVERSION
 
 #define MAKE_CONVERSION(Name)                                       \
   RegExp##Name* RegExp##Name::As##Name() {                          \
     return this;                                                    \
   }
-FOR_EACH_REG_EXP_NODE_TYPE(MAKE_CONVERSION)
+FOR_EACH_REG_EXP_TREE_TYPE(MAKE_CONVERSION)
 #undef MAKE_CONVERSION
 
 RegExpEmpty RegExpEmpty::kInstance;
 
 
 // Convert regular expression trees to a simple sexp representation.
 // This representation should be different from the input grammar
 // in as many cases as possible, to make it more difficult for incorrect
 // parses to look as correct ones which is likely if the input and
 // output formats are alike.
 class RegExpUnparser: public RegExpVisitor {
  public:
   RegExpUnparser();
   void VisitCharacterRange(CharacterRange that);
   SmartPointer<const char> ToString() { return stream_.ToCString(); }
 #define MAKE_CASE(Name) virtual void* Visit##Name(RegExp##Name*, void* data);
-  FOR_EACH_REG_EXP_NODE_TYPE(MAKE_CASE)
+  FOR_EACH_REG_EXP_TREE_TYPE(MAKE_CASE)
 #undef MAKE_CASE
  private:
   StringStream* stream() { return &stream_; }
   HeapStringAllocator alloc_;
   StringStream stream_;
 };
 
 
 RegExpUnparser::RegExpUnparser() : stream_(&alloc_) {
 }
@@ skipping 69 matching lines @@
   return NULL;
 }
 
 
 void* RegExpUnparser::VisitAtom(RegExpAtom* that, void* data) {
   stream()->Add("'%w'", that->data());
   return NULL;
 }
 
 
+void* RegExpUnparser::VisitText(RegExpText* that, void* data) {
+  if (that->elements()->length() == 1) {
+    that->elements()->at(0).data.u_atom->Accept(this, data);
+  } else {
+    stream()->Add("(!");
+    for (int i = 0; i < that->elements()->length(); i++) {
+      stream()->Add(" ");
+      that->elements()->at(i).data.u_atom->Accept(this, data);
+    }
+    stream()->Add(")");
+  }
+  return NULL;
+}
+
+
 void* RegExpUnparser::VisitQuantifier(RegExpQuantifier* that, void* data) {
   stream()->Add("(# %i ", that->min());
   if (that->max() == RegExpQuantifier::kInfinity) {
     stream()->Add("- ");
   } else {
     stream()->Add("%i ", that->max());
   }
   stream()->Add(that->is_greedy() ? "g " : "n ");
   that->body()->Accept(this, data);
   stream()->Add(")");
@@ skipping 32 matching lines @@
 
 
 SmartPointer<const char> RegExpTree::ToString() {
   RegExpUnparser unparser;
   Accept(&unparser, NULL);
   return unparser.ToString();
 }
 
 
 } }  // namespace v8::internal