glsl/glcpp: Fix off-by-one error in column in first-line error messages

For the first line we were initializing the column to 1, but for all
subsequent lines we were initializing the column to 0. The column number is
advanced for each token read before any error message is printed. So the 0
value is the correct initialization, (so that the first column is reported as
column 1).

With this extremely minor change, many of the .expected files are updated such
that error messages for the first line now have the correct column number in
them.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

src/glsl/glcpp/glcpp-lex.l

@@ -57,7 +57,7 @@ void glcpp_set_column (int  column_no , yyscan_t yyscanner);
 #define YY_USER_INIT			\
 	do {				\
 		yylineno = 1;		\
-		yycolumn = 1;		\
+		yycolumn = 0;		\
 		yylloc->source = 0;	\
 	} while(0)
 

src/glsl/glcpp/tests/077-else-without-if.c.expected

@@ -1,3 +1,3 @@
-0:1(2): preprocessor error: #else without #if
+0:1(1): preprocessor error: #else without #if
 
 

src/glsl/glcpp/tests/078-elif-without-if.c.expected

@@ -1,3 +1,3 @@
-0:1(2): preprocessor error: #elif without #if
+0:1(1): preprocessor error: #elif without #if
 
 

src/glsl/glcpp/tests/079-endif-without-if.c.expected

@@ -1,3 +1,3 @@
-0:1(2): preprocessor error: #endif without #if
+0:1(1): preprocessor error: #endif without #if
 
 

src/glsl/glcpp/tests/083-unterminated-if.c.expected

@@ -1,4 +1,4 @@
-0:1(7): preprocessor error: Unterminated #if
+0:1(6): preprocessor error: Unterminated #if
 
 
 

src/glsl/glcpp/tests/086-reserved-macro-names.c.expected

@@ -1,4 +1,4 @@
-0:1(10): preprocessor warning: Macro names containing "__" are reserved for use by the implementation.
+0:1(9): preprocessor warning: Macro names containing "__" are reserved for use by the implementation.
 
 0:2(9): preprocessor error: Macro names starting with "GL_" are reserved.
 

src/glsl/glcpp/tests/090-hash-error.c.expected

@@ -1,2 +1,2 @@
-0:1(2): preprocessor error: #error human error
+0:1(1): preprocessor error: #error human error
 

src/glsl/glcpp/tests/093-divide-by-zero.c.expected

@@ -1,3 +1,3 @@
-0:1(13): preprocessor error: division by 0 in preprocessor directive
+0:1(12): preprocessor error: division by 0 in preprocessor directive
 
 

src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected

@@ -1,4 +1,4 @@
 0:2(7): preprocessor error: syntax error, unexpected IDENTIFIER, expecting NEWLINE
-0:1(7): preprocessor error: Unterminated #if
+0:1(6): preprocessor error: Unterminated #if
 
 

src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected

@@ -1 +1 @@
-0:1(3): preprocessor error: Invalid tokens after #
+0:1(2): preprocessor error: Invalid tokens after #

src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected

@@ -1 +1 @@
-0:1(3): preprocessor error: Invalid tokens after #
+0:1(2): preprocessor error: Invalid tokens after #

src/glsl/glcpp/tests/120-undef-builtin.c.expected

@@ -1,4 +1,4 @@
-0:1(2): preprocessor error: Built-in (pre-defined) macro names can not be undefined.
+0:1(1): preprocessor error: Built-in (pre-defined) macro names can not be undefined.
 0:2(1): preprocessor error: Built-in (pre-defined) macro names can not be undefined.
 0:3(1): preprocessor error: Built-in (pre-defined) macro names can not be undefined.
 

src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected

@@ -1,4 +1,4 @@
 0:2(7): preprocessor error: syntax error, unexpected IDENTIFIER, expecting NEWLINE
-0:1(7): preprocessor error: Unterminated #if
+0:1(6): preprocessor error: Unterminated #if
 
 

src/glsl/glcpp/tests/126-garbage-after-directive.c.expected

@@ -1,4 +1,4 @@
-0:1(15): preprocessor error: extra tokens at end of directive
+0:1(14): preprocessor error: extra tokens at end of directive
 0:4(14): preprocessor error: extra tokens at end of directive
 
 

src/glsl/glcpp/tests/129-define-non-identifier.c.expected

@@ -1,2 +1,2 @@
-0:1(10): preprocessor error: #define followed by a non-identifier: 123
-0:1(10): preprocessor error: syntax error, unexpected INTEGER_STRING, expecting FUNC_IDENTIFIER or OBJ_IDENTIFIER
+0:1(9): preprocessor error: #define followed by a non-identifier: 123
+0:1(9): preprocessor error: syntax error, unexpected INTEGER_STRING, expecting FUNC_IDENTIFIER or OBJ_IDENTIFIER

src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected

@@ -1,2 +1,2 @@
-0:1(2): preprocessor error: #define without macro name
-0:1(2): preprocessor error: syntax error, unexpected NEWLINE, expecting FUNC_IDENTIFIER or OBJ_IDENTIFIER
+0:1(1): preprocessor error: #define without macro name
+0:1(1): preprocessor error: syntax error, unexpected NEWLINE, expecting FUNC_IDENTIFIER or OBJ_IDENTIFIER

src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected

@@ -1,2 +1,2 @@
-0:1(52): preprocessor error: Unterminated comment
+0:1(51): preprocessor error: Unterminated comment
 This file ends with no newline within a comment