kc3-lang/angle/src/compiler/translator/Diagnostics.cpp

• Show log

  Commit

• Hash : 77ba408a
  Author :
  Date : 2016-12-16T12:01:18
  

  Unify Diagnostics interface
  
  Use the same kind of interface for reporting preprocessor errors as
  for reporting regular compiler errors, and make global errors like
  having too many uniforms also go through Diagnostics. Also don't
  create std::string objects unnecessarily.
  
  Includes cleanups of some dead code related to reporting errors.
  
  BUG=angleproject:1670
  TEST=angle_unittests
  
  Change-Id: I3ee794d32ddeec1826bdf1b76b558f35259f82c0
  Reviewed-on: https://chromium-review.googlesource.com/421527
  Reviewed-by: Corentin Wallez <cwallez@chromium.org>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
  

Download

• src/compiler/translator/Diagnostics.cpp

• //
  // Copyright (c) 2012-2013 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  
  #include "compiler/translator/Diagnostics.h"
  
  #include "common/debug.h"
  #include "compiler/preprocessor/SourceLocation.h"
  #include "compiler/translator/Common.h"
  #include "compiler/translator/InfoSink.h"
  
  namespace sh
  {
  
  TDiagnostics::TDiagnostics(TInfoSinkBase &infoSink)
      : mInfoSink(infoSink), mNumErrors(0), mNumWarnings(0)
  {
  }
  
  TDiagnostics::~TDiagnostics()
  {
  }
  
  void TDiagnostics::writeInfo(Severity severity,
                               const pp::SourceLocation &loc,
                               const char *reason,
                               const char *token)
  {
      switch (severity)
      {
          case SH_ERROR:
              ++mNumErrors;
              break;
          case SH_WARNING:
              ++mNumWarnings;
              break;
          default:
              UNREACHABLE();
              break;
      }
  
      /* VC++ format: file(linenum) : error #: 'token' : extrainfo */
      mInfoSink.prefix(severity);
      mInfoSink.location(loc.file, loc.line);
      mInfoSink << "'" << token << "' : " << reason << "\n";
  }
  
  void TDiagnostics::globalError(const char *message)
  {
      ++mNumErrors;
      mInfoSink.prefix(SH_ERROR);
      mInfoSink << message << "\n";
  }
  
  void TDiagnostics::error(const pp::SourceLocation &loc, const char *reason, const char *token)
  {
      writeInfo(SH_ERROR, loc, reason, token);
  }
  
  void TDiagnostics::warning(const pp::SourceLocation &loc, const char *reason, const char *token)
  {
      writeInfo(SH_WARNING, loc, reason, token);
  }
  
  void TDiagnostics::error(const TSourceLoc &loc, const char *reason, const char *token)
  {
      pp::SourceLocation srcLoc;
      srcLoc.file = loc.first_file;
      srcLoc.line = loc.first_line;
      error(srcLoc, reason, token);
  }
  
  void TDiagnostics::warning(const TSourceLoc &loc, const char *reason, const char *token)
  {
      pp::SourceLocation srcLoc;
      srcLoc.file = loc.first_file;
      srcLoc.line = loc.first_line;
      warning(srcLoc, reason, token);
  }
  
  void TDiagnostics::print(ID id, const pp::SourceLocation &loc, const std::string &text)
  {
      writeInfo(isError(id) ? SH_ERROR : SH_WARNING, loc, message(id), text.c_str());
  }
  
  void TDiagnostics::resetErrorCount()
  {
      mNumErrors   = 0;
      mNumWarnings = 0;
  }
  
  }  // namespace sh
  

Download