* Changed meaning of "%k" format to always output fixed-width ASCII-only representations.

regexp2000/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 236 matching lines @@
 void* RegExpUnparser::VisitAlternative(RegExpAlternative* that, void* data) {
   stream()->Add("(:");
   for (int i = 0; i <  that->nodes()->length(); i++) {
     stream()->Add(" ");
     that->nodes()->at(i)->Accept(this, data);
   }
   stream()->Add(")");
   return NULL;
 }
 
-static void AddChar(StringStream* stream, uc16 character) {
-  if (character < 32 || (character >= 128 && character < 256)) {
-    stream->Add("\\x%02x", character);
-  } else if (character >= 256) {
-    stream->Add("\\u%04x", character);
-  } else {
-    stream->Add("%c", character);
+
+void RegExpUnparser::VisitCharacterRange(CharacterRange that) {
+  stream()->Add("%k", that.from());
+  if (!that.IsSingleton()) {
+    stream()->Add("-%k", that.to());
   }
 }
 
-void RegExpUnparser::VisitCharacterRange(CharacterRange that) {
-  AddChar(stream(), that.from());
-  if (!that.IsSingleton()) {
-    stream()->Add("-");
-    AddChar(stream(), that.to());
-  }
-}
-
 
 
 void* RegExpUnparser::VisitCharacterClass(RegExpCharacterClass* that,
                                           void* data) {
   if (that->is_negated())
     stream()->Add("^");
   stream()->Add("[");
   for (int i = 0; i < that->ranges()->length(); i++) {
     if (i > 0) stream()->Add(" ");
     VisitCharacterRange(that->ranges()->at(i));
@@ skipping 25 matching lines @@
       break;
   }
   return NULL;
 }
 
 
 void* RegExpUnparser::VisitAtom(RegExpAtom* that, void* data) {
   stream()->Add("'");
   Vector<const uc16> chardata = that->data();
   for (int i = 0; i < chardata.length(); i++) {
-    AddChar(stream(), chardata[i]);
+    stream()->Add("%k", chardata[i]);
   }
   stream()->Add("'");
   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 {
@@ skipping 53 matching lines @@
 
 
 SmartPointer<const char> RegExpTree::ToString() {
   RegExpUnparser unparser;
   Accept(&unparser, NULL);
   return unparser.ToString();
 }
 
 
 } }  // namespace v8::internal