Changed Token::Location::string to Token::Location::file to keep it consistent…

src/compiler/preprocessor/lexer_glue.cpp

@@ -128,7 +128,7 @@ static int lex(InputSrc* in, yystypepp* yylvalpp)
         break;
     }
     SetLineNumber(token.location.line);
-    SetStringNumber(token.location.string);
+    SetStringNumber(token.location.file);
     return ret;
 }
 

src/compiler/preprocessor/new/Token.h

@@ -57,14 +57,14 @@ struct Token
     };
     struct Location
     {
-        Location() : line(0), string(0) { }
+        Location() : file(0), line(0) { }
         bool equals(const Location& other) const
         {
-            return (line == other.line) && (string == other.string);
+            return (file == other.file) && (line == other.line);
         }
 
+        int file;
         int line;
-        int string;
     };
 
     Token() : type(0), flags(0) { }

src/compiler/preprocessor/new/pp.l

@@ -32,8 +32,8 @@ typedef pp::Token::Location YYLTYPE;
 
 #define YY_USER_ACTION           \
     do {                         \
+        yylloc->file = 0;        \
         yylloc->line = yylineno; \
-        yylloc->string = 0;      \
     } while(0);
 
 // Suppress the default implementation of YY_INPUT which generated

src/compiler/preprocessor/new/pp_lex.cpp

@@ -532,8 +532,8 @@ typedef pp::Token::Location YYLTYPE;
 
 #define YY_USER_ACTION           \
     do {                         \
+        yylloc->file = 0;        \
         yylloc->line = yylineno; \
-        yylloc->string = 0;      \
     } while(0);
 
 // Suppress the default implementation of YY_INPUT which generated