commit 73bc298e3f0688d40c07c13d94197c4146ae1b49
author alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Jun 19 18:48:05 2012 +0000
committer alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Jun 19 18:48:05 2012 +0000
tree fbb5caf6760b36fbdd5d555d3bdce3f80d6d81a0
parent f3cdb460d1dde723815eecd006274a3da5d81099

Hooked up the new preprocessor behind a compile-time flag ANGLE_USE_NEW_PREPROCESSOR.
Review URL: https://codereview.appspot.com/6304095

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1158 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/compiler/ParseHelper.cpp

diff --git a/src/compiler/ParseHelper.cpp b/src/compiler/ParseHelper.cpp
index 5e700e0..ac89e44 100644
--- a/src/compiler/ParseHelper.cpp
+++ b/src/compiler/ParseHelper.cpp
@@ -12,40 +12,6 @@
 #include "compiler/glslang.h"
 #include "compiler/preprocessor/new/SourceLocation.h"
 
-extern "C" {
-extern int InitPreprocessor();
-extern int FinalizePreprocessor();
-extern void PredefineIntMacro(const char *name, int value);
-}
-
-static void DefineExtensionMacros(const TExtensionBehavior& extBehavior)
-{
-    for (TExtensionBehavior::const_iterator iter = extBehavior.begin();
-         iter != extBehavior.end(); ++iter) {
-        PredefineIntMacro(iter->first.c_str(), 1);
-    }
-}
-
-///////////////////////////////////////////////////////////////////////
-//
-// Preprocessor
-//
-////////////////////////////////////////////////////////////////////////
-
-bool TParseContext::initPreprocessor()
-{
-    if (InitPreprocessor())
-        return false;
-
-    DefineExtensionMacros(directiveHandler.extBehavior());
-    return true;
-}
-
-void TParseContext::destroyPreprocessor()
-{
-    FinalizePreprocessor();
-}
-
 ///////////////////////////////////////////////////////////////////////
 //
 // Sub- vector and matrix fields
@@ -942,7 +908,7 @@
 
 bool TParseContext::extensionErrorCheck(int line, const TString& extension)
 {
-    const TExtensionBehavior& extBehavior = directiveHandler.extBehavior();
+    const TExtensionBehavior& extBehavior = extensionBehavior();
     TExtensionBehavior::const_iterator iter = extBehavior.find(extension.c_str());
     if (iter == extBehavior.end()) {
         error(line, "extension", extension.c_str(), "is not supported");
@@ -963,9 +929,9 @@
 
 bool TParseContext::supportsExtension(const char* extension)
 {
-    const TExtensionBehavior& extBehavior = directiveHandler.extBehavior();
-    TExtensionBehavior::const_iterator iter = extBehavior.find(extension);
-    return (iter != extBehavior.end());
+    const TExtensionBehavior& extbehavior = extensionBehavior();
+    TExtensionBehavior::const_iterator iter = extbehavior.find(extension);
+    return (iter != extbehavior.end());
 }
 
 void TParseContext::handleExtensionDirective(int line, const char* extName, const char* behavior)
@@ -1513,9 +1479,6 @@
     if ((count == 0) || (string == NULL))
         return 1;
 
-    if (!context->initPreprocessor())
-        return 1;
-
     if (glslang_initialize(context))
         return 1;
 
@@ -1523,8 +1486,7 @@
     if (!error)
         error = glslang_parse(context);
 
-    glslang_finalize(context);    
-    context->destroyPreprocessor();
+    glslang_finalize(context);
 
     return (error == 0) && (context->numErrors == 0) ? 0 : 1;
 }