Fixed compile error in lexer_glue.cpp.

src/build_angle.gyp

@@ -24,6 +24,7 @@
         'compiler/preprocessor/new/ExpressionParser.h',
         'compiler/preprocessor/new/Input.cpp',
         'compiler/preprocessor/new/Input.h',
+        'compiler/preprocessor/new/Lexer.cpp',
         'compiler/preprocessor/new/Lexer.h',
         'compiler/preprocessor/new/MacroExpander.cpp',
         'compiler/preprocessor/new/MacroExpander.h',

src/compiler/preprocessor/lexer_glue.cpp

@@ -12,12 +12,25 @@ extern "C" {
 #include "compiler/preprocessor/slglobals.h"
 #include "compiler/preprocessor/scanner.h"
 }
-#include "compiler/preprocessor/new/Lexer.h"
+#include "compiler/preprocessor/new/Diagnostics.h"
 #include "compiler/preprocessor/new/Token.h"
+#include "compiler/preprocessor/new/Tokenizer.h"
+
+class Diagnostics : public pp::Diagnostics
+{
+protected:
+    virtual void print(ID id,
+                       const pp::SourceLocation& loc,
+                       const std::string& text)
+    {
+        // TODO(alokp): Implement me.
+    }
+};
 
 struct InputSrcLexer
 {
     InputSrc base;
+    pp::Diagnostics* diagnostics;
     pp::Lexer* lexer;
 };
 
@@ -36,12 +49,14 @@ static int lex(InputSrc* in, yystypepp* yylvalpp)
 {
     InputSrcLexer* src = ((InputSrcLexer *)in);
 
+    int ret = 0;
     pp::Token token;
-    int ret = src->lexer->lex(&token);
-    switch (ret)
+    src->lexer->lex(&token);
+    switch (token.type)
     {
     case 0:  // EOF
         delete src->lexer;
+        delete src->diagnostics;
         free(src);
         cpp->currentInput = 0;
         ret = EOF;
@@ -134,10 +149,12 @@ static int lex(InputSrc* in, yystypepp* yylvalpp)
 
 InputSrc* LexerInputSrc(int count, const char* const string[], const int length[])
 {
-    pp::Lexer* lexer = new pp::Lexer;
+    Diagnostics* diagnostics = new Diagnostics;
+    pp::Tokenizer* lexer = new pp::Tokenizer(diagnostics);
     if (!lexer->init(count, string, length))
     {
         delete lexer;
+        delete diagnostics;
         return 0;
     }
 
@@ -145,6 +162,7 @@ InputSrc* LexerInputSrc(int count, const char* const string[], const int length[
     memset(in, 0, sizeof(InputSrcLexer));
     in->base.line = 1;
     in->base.scan = lex;
+    in->diagnostics = diagnostics;
     in->lexer = lexer;
 
     return &in->base;

src/compiler/preprocessor/new/Diagnostics.cpp

@@ -11,6 +11,10 @@
 namespace pp
 {
 
+Diagnostics::~Diagnostics()
+{
+}
+
 void Diagnostics::report(ID id,
                          const SourceLocation& loc,
                          const std::string& text)

src/compiler/preprocessor/new/Diagnostics.h

@@ -38,6 +38,8 @@ class Diagnostics
         WARNING_END
     };
 
+    virtual ~Diagnostics();
+
     void report(ID id, const SourceLocation& loc, const std::string& text);
 
   protected:

src/compiler/preprocessor/new/Lexer.cpp

+//
+// Copyright (c) 2012 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 "Lexer.h"
+
+namespace pp
+{
+
+Lexer::~Lexer()
+{
+}
+
+}  // namespace pp

src/compiler/preprocessor/new/Lexer.h

@@ -7,9 +7,6 @@
 #ifndef COMPILER_PREPROCESSOR_LEXER_H_
 #define COMPILER_PREPROCESSOR_LEXER_H_
 
-#include <cassert>
-#include <vector>
-
 namespace pp
 {
 
@@ -18,6 +15,8 @@ struct Token;
 class Lexer
 {
   public:
+    virtual ~Lexer();
+
     virtual void lex(Token* token) = 0;
 };