Merge pull request #16 from google/pp-directive

Preprocessing directive handling

diff --cc Test/test-preprocessor-list
index 1baa558,d4fef57..2816d40
--- 1/Test/test-preprocessor-list
--- 2/Test/test-preprocessor-list
+++ b/Test/test-preprocessor-list
@@@ -3,6 -3,6 +3,7 @@@ preprocessor.errors.ver
  preprocessor.extensions.vert
  preprocessor.function_macro.vert
  preprocessor.line.vert
+ preprocessor.line.frag
  preprocessor.pragma.vert
  preprocessor.simple.vert
 +preprocessor.success_if_parse_would_fail.vert

diff --cc glslang/MachineIndependent/ParseHelper.cpp
Simple merge

diff --cc glslang/MachineIndependent/ParseHelper.h
Simple merge

diff --cc glslang/MachineIndependent/ShaderLang.cpp
Simple merge

diff --cc glslang/MachineIndependent/preprocessor/Pp.cpp
index 1d03b43,54cea32..0e035c2
--- 1/glslang/MachineIndependent/preprocessor/Pp.cpp
--- 2/glslang/MachineIndependent/preprocessor/Pp.cpp
+++ b/glslang/MachineIndependent/preprocessor/Pp.cpp
@@@ -624,8 -624,9 +624,9 @@@ int TPpContext::CPPline(TPpToken* ppTok
      // "#line line source-string-number"
  
      int token = scanToken(ppToken);
+     const int directiveLoc = ppToken->loc.line;
      if (token == '\n') {
 -        parseContext.error(ppToken->loc, "must by followed by an integral literal", "#line", "");
 +        parseContext.ppError(ppToken->loc, "must by followed by an integral literal", "#line", "");
          return token;
      }