Fix indentation of parser trace (several threads may compile at once).

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 
 #include "lib/invocation_mirror.h"
 #include "platform/utils.h"
 #include "vm/ast_transformer.h"
 #include "vm/bootstrap.h"
@@ skipping 51 matching lines @@
 
 
 // Quick access to the current isolate and zone.
 #define I (thread()->isolate())
 #define Z (zone())
 
 
 #if defined(DEBUG)
 class TraceParser : public ValueObject {
  public:
-  TraceParser(intptr_t token_pos, const Script& script, const char* msg) {
+  TraceParser(intptr_t token_pos,
+              const Script& script,
+              intptr_t* trace_indent,
+              const char* msg) {
+    indent_ = trace_indent;
     if (FLAG_trace_parser) {
       // Skips tracing of bootstrap libraries.
       if (script.HasSource()) {
         intptr_t line, column;
         script.GetTokenLocation(token_pos, &line, &column);
         PrintIndent();
         OS::Print("%s (line %" Pd ", col %" Pd ", token %" Pd ")\n",
                   msg, line, column, token_pos);
       }
-      indent_++;
+      (*indent_)++;
     }
   }
-  ~TraceParser() { indent_--; }
+  ~TraceParser() {
+    if (FLAG_trace_parser) {
+      (*indent_)--;
+      ASSERT(*indent_ >= 0);
+    }
+  }
+
  private:
   void PrintIndent() {
-    for (int i = 0; i < indent_; i++) { OS::Print(". "); }
+    for (intptr_t i = 0; i < *indent_; i++) { OS::Print(". "); }
   }
-  static int indent_;
+  intptr_t* indent_;
 };
 
-int TraceParser::indent_ = 0;
 
 #define TRACE_PARSER(s) \
-  TraceParser __p__(this->TokenPos(), this->script_, s)
+  TraceParser __p__(this->TokenPos(), this->script_, &this->trace_indent_, s)
 
 #else  // not DEBUG
 #define TRACE_PARSER(s)
 #endif  // DEBUG
 
 
 class BoolScope : public ValueObject {
  public:
   BoolScope(bool* addr, bool new_value) : _addr(addr), _saved_value(*addr) {
     *_addr = new_value;
@@ skipping 212 matching lines @@
       current_member_(NULL),
       allow_function_literals_(true),
       parsed_function_(NULL),
       innermost_function_(Function::Handle(zone())),
       literal_token_(LiteralToken::Handle(zone())),
       current_class_(Class::Handle(zone())),
       library_(Library::Handle(zone(), library.raw())),
       try_blocks_list_(NULL),
       last_used_try_index_(0),
       unregister_pending_function_(false),
-      async_temp_scope_(NULL) {
+      async_temp_scope_(NULL),
+      trace_indent_(0) {
   ASSERT(tokens_iterator_.IsValid());
   ASSERT(!library.IsNull());
 }
 
 
 // For parsing a function.
 Parser::Parser(const Script& script,
                ParsedFunction* parsed_function,
                intptr_t token_position)
     : thread_(Thread::Current()),
@@ skipping 11 matching lines @@
                                            parsed_function->function().raw())),
       literal_token_(LiteralToken::Handle(zone())),
       current_class_(Class::Handle(zone(),
                                    parsed_function->function().Owner())),
       library_(Library::Handle(zone(), Class::Handle(
           zone(),
           parsed_function->function().origin()).library())),
       try_blocks_list_(NULL),
       last_used_try_index_(0),
       unregister_pending_function_(false),
-      async_temp_scope_(NULL) {
+      async_temp_scope_(NULL),
+      trace_indent_(0) {
   ASSERT(tokens_iterator_.IsValid());
   ASSERT(!current_function().IsNull());
   EnsureExpressionTemp();
 }
 
 
 Parser::~Parser() {
   if (unregister_pending_function_) {
     const GrowableObjectArray& pending_functions =
         GrowableObjectArray::Handle(I->object_store()->pending_functions());
@@ skipping 12185 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart