kc3-lang/angle/src/compiler/preprocessor/Preprocessor.cpp

• Show log

  Commit

• Hash : 1b2f1629
  Author :
  Date : 2016-03-04T15:06:51
  

  Forbid defined operator generated by macro expansion
  
  After lengthy debate, the GLES working group recommended that this
  should be an error in WebGL, though old specs were not updated. Make
  ANGLE follow the WebGL spec and generate an error in this case.
  
  This is a partial revert of the patch which added support for defined
  operator generated by macro expansion. The preprocessor unit tests
  added by the reverted commit are kept, but their expectations are
  changed.
  
  This breaks some dEQP tests that are not in line with the WebGL spec.
  
  BUG=angleproject:1335
  TEST=angle_unittests, WebGL conformance tests
  
  Change-Id: I7d8a1d42c61367197f2aed4ca4de9297cc48acfc
  Reviewed-on: https://chromium-review.googlesource.com/352471
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
  

Download

• src/compiler/preprocessor/Preprocessor.cpp

• //
  // Copyright (c) 2011 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 "Preprocessor.h"
  
  #include <cassert>
  
  #include "DiagnosticsBase.h"
  #include "DirectiveParser.h"
  #include "Macro.h"
  #include "MacroExpander.h"
  #include "Token.h"
  #include "Tokenizer.h"
  
  namespace pp
  {
  
  struct PreprocessorImpl
  {
      Diagnostics *diagnostics;
      MacroSet macroSet;
      Tokenizer tokenizer;
      DirectiveParser directiveParser;
      MacroExpander macroExpander;
  
      PreprocessorImpl(Diagnostics *diag, DirectiveHandler *directiveHandler)
          : diagnostics(diag),
            tokenizer(diag),
            directiveParser(&tokenizer, &macroSet, diag, directiveHandler),
            macroExpander(&directiveParser, &macroSet, diag)
      {
      }
  };
  
  Preprocessor::Preprocessor(Diagnostics *diagnostics,
                             DirectiveHandler *directiveHandler)
  {
      mImpl = new PreprocessorImpl(diagnostics, directiveHandler);
  }
  
  Preprocessor::~Preprocessor()
  {
      delete mImpl;
  }
  
  bool Preprocessor::init(size_t count,
                          const char * const string[],
                          const int length[])
  {
      static const int kDefaultGLSLVersion = 100;
  
      // Add standard pre-defined macros.
      predefineMacro("__LINE__", 0);
      predefineMacro("__FILE__", 0);
      predefineMacro("__VERSION__", kDefaultGLSLVersion);
      predefineMacro("GL_ES", 1);
  
      return mImpl->tokenizer.init(count, string, length);
  }
  
  void Preprocessor::predefineMacro(const char *name, int value)
  {
      PredefineMacro(&mImpl->macroSet, name, value);
  }
  
  void Preprocessor::lex(Token *token)
  {
      bool validToken = false;
      while (!validToken)
      {
          mImpl->macroExpander.lex(token);
          switch (token->type)
          {
            // We should not be returning internal preprocessing tokens.
            // Convert preprocessing tokens to compiler tokens or report
            // diagnostics.
            case Token::PP_HASH:
              assert(false);
              break;
            case Token::PP_NUMBER:
              mImpl->diagnostics->report(Diagnostics::PP_INVALID_NUMBER,
                                         token->location, token->text);
              break;
            case Token::PP_OTHER:
              mImpl->diagnostics->report(Diagnostics::PP_INVALID_CHARACTER,
                                         token->location, token->text);
              break;
            default:
              validToken = true;
              break;
          }
      }
  }
  
  void Preprocessor::setMaxTokenSize(size_t maxTokenSize)
  {
      mImpl->tokenizer.setMaxTokenSize(maxTokenSize);
  }
  
  }  // namespace pp
  

Download