More assertion propagation.

src/parser.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 527 matching lines @@
  private:
   uc32 current() { return current_; }
   bool has_more() { return has_more_; }
   bool has_next() { return next_pos_ < in()->length(); }
   uc32 Next();
   FlatStringReader* in() { return in_; }
   void ScanForCaptures();
   bool CaptureAvailable(int index);
   uc32 current_;
   bool has_more_;
-  bool multiline_mode_;
+  bool multiline_;
   int next_pos_;
   FlatStringReader* in_;
   Handle<String>* error_;
   bool has_character_escapes_;
   ZoneList<RegExpCapture*>* captures_;
   bool is_scanned_for_captures_;
   // The capture count is only valid after we have scanned for captures.
   int capture_count_;
 };
 
@@ skipping 2933 matching lines @@
                    scanner().location().beg_pos);
 }
 
 
 // ----------------------------------------------------------------------------
 // Regular expressions
 
 
 RegExpParser::RegExpParser(FlatStringReader* in,
                            Handle<String>* error,
-                           bool multiline_mode)
+                           bool multiline)
   : current_(kEndMarker),
     has_more_(true),
-    multiline_mode_(multiline_mode),
+    multiline_(multiline),
     next_pos_(0),
     in_(in),
     error_(error),
     has_character_escapes_(false),
     captures_(NULL),
     is_scanned_for_captures_(false),
     capture_count_(0) {
   Advance(1);
 }
 
@@ skipping 94 matching lines @@
       capture_start_index = capture_new_alt_start_index;
       continue;
     }
     case '*':
     case '+':
     case '?':
       ReportError(CStrVector("Nothing to repeat"), CHECK_OK);
     case '^': {
       Advance();
       RegExpAssertion::Type type =
-          multiline_mode_ ? RegExpAssertion::START_OF_LINE :
-                            RegExpAssertion::START_OF_INPUT;
+          multiline_ ? RegExpAssertion::START_OF_LINE :
+                       RegExpAssertion::START_OF_INPUT;
       builder.AddAssertion(new RegExpAssertion(type));
       continue;
     }
     case '$': {
       Advance();
       RegExpAssertion::Type type =
-          multiline_mode_ ? RegExpAssertion::END_OF_LINE :
-                            RegExpAssertion::END_OF_INPUT;
+          multiline_ ? RegExpAssertion::END_OF_LINE :
+                       RegExpAssertion::END_OF_INPUT;
       builder.AddAssertion(new RegExpAssertion(type));
       continue;
     }
     case '.': {
       Advance();
       // everything except \x0a, \x0d, \u2028 and \u2029
       ZoneList<CharacterRange>* ranges = new ZoneList<CharacterRange>(2);
       CharacterRange::AddClassEscape('.', ranges);
       RegExpTree* atom = new RegExpCharacterClass(ranges, false);
       builder.AddAtom(atom);
@@ skipping 647 matching lines @@
   PreParser parser(no_script, allow_natives_syntax, extension);
   if (!parser.PreParseProgram(stream)) return NULL;
   // The list owns the backing store so we need to clone the vector.
   // That way, the result will be exactly the right size rather than
   // the expected 50% too large.
   Vector<unsigned> store = parser.recorder()->store()->ToVector().Clone();
   return new ScriptDataImpl(store);
 }
 
 
-bool ParseRegExp(FlatStringReader* input, RegExpParseResult* result) {
+bool ParseRegExp(FlatStringReader* input,
+                 bool multiline,
+                 RegExpParseResult* result) {
   ASSERT(result != NULL);
   // TODO(plesner): Get multiline flag somehow

[Erik Corry, 2008/11/27 10:30:05]

out of date comment

-  RegExpParser parser(input, &result->error, false);
+  RegExpParser parser(input, &result->error, multiline);
   bool ok = true;
   result->tree = parser.ParsePattern(&ok);
   if (!ok) {
     ASSERT(result->tree == NULL);
     ASSERT(!result->error.is_null());
   } else {
     ASSERT(result->tree != NULL);
     ASSERT(result->error.is_null());
   }
   if (ok) {
@@ skipping 49 matching lines @@
                        start_position,
                        is_expression);
   return result;
 }
 
 
 #undef NEW
 
 
 } }  // namespace v8::internal