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>

diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index 3e533ceda4ed8ab9461b5982960012c922496bf9..798ff4c1a7b802c64918c37bff02793849e2c46c 100644 (file)
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/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)
 

diff --git a/src/glsl/glcpp/tests/077-else-without-if.c.expected b/src/glsl/glcpp/tests/077-else-without-if.c.expected
index 64e6d1ac93e97455755b9b7e48d7f7f74cd26ff4..69f34047033047490528d1865f8f03c8f534963b 100644 (file)
--- a/src/glsl/glcpp/tests/077-else-without-if.c.expected
+++ b/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
 
 

diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c.expected b/src/glsl/glcpp/tests/078-elif-without-if.c.expected
index f3530ed2c072aef13b8960c9984d9aad4b03eed6..b8e40ecc09b67a66319deb27ea300543127138cd 100644 (file)
--- a/src/glsl/glcpp/tests/078-elif-without-if.c.expected
+++ b/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
 
 

diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c.expected b/src/glsl/glcpp/tests/079-endif-without-if.c.expected
index ad21d4c957933bf3a3eb1ba3c0b6f2aa3791a5b7..7ae579dd25ef403e6175d9ba30bc7e1b5c92a6f2 100644 (file)
--- a/src/glsl/glcpp/tests/079-endif-without-if.c.expected
+++ b/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
 
 

diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c.expected b/src/glsl/glcpp/tests/083-unterminated-if.c.expected
index b03f9ccf95f2f676e240388c9a3072c337cb3942..4659ab6fe67fc056863fb69ef017d7adc1fbbb5b 100644 (file)
--- a/src/glsl/glcpp/tests/083-unterminated-if.c.expected
+++ b/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
 
 
 

diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected b/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected
index f0b1373d760336daaf89a0f4df35fc0fbc328482..38b089daec3bf32f4ccbe1a79e15b2f8925c8902 100644 (file)
--- a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected
+++ b/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.
 

diff --git a/src/glsl/glcpp/tests/090-hash-error.c.expected b/src/glsl/glcpp/tests/090-hash-error.c.expected
index b9b226bb4e1b4b1a150f935d63b89f28f30c1764..32954f7380e4dec8a3e77031c0bf5094c3c9558e 100644 (file)
--- a/src/glsl/glcpp/tests/090-hash-error.c.expected
+++ b/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
 

diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected b/src/glsl/glcpp/tests/093-divide-by-zero.c.expected
index 9adae3f9d558e7571357c8737e9ee012ac18d7f8..a858870b7943b75ee1e1d2426a27f2a8bd8e3189 100644 (file)
--- a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected
+++ b/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
 
 

diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected b/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected
index f9f5f1976f755adb069ee1c772de07efa499dfb3..b053b399775f38ba34b0dfbe70aa1722d31cdb26 100644 (file)
--- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected
+++ b/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
 
 

diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
index 748bfe19b36c281ee93b37cf9c35529e3479d40e..462166c98018cfd0107a4b3b182384c0fab43723 100644 (file)
--- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected
+++ b/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 #

diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
index 748bfe19b36c281ee93b37cf9c35529e3479d40e..462166c98018cfd0107a4b3b182384c0fab43723 100644 (file)
--- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected
+++ b/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 #

diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/glsl/glcpp/tests/120-undef-builtin.c.expected
index 339ea4fc617ed849ae80a8c0e0ca1bbfdb12ed2c..cdb9c29adfbf91befaaf1ed6d7ea4b163fed5613 100644 (file)
--- a/src/glsl/glcpp/tests/120-undef-builtin.c.expected
+++ b/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.
 

diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected b/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected
index f9f5f1976f755adb069ee1c772de07efa499dfb3..b053b399775f38ba34b0dfbe70aa1722d31cdb26 100644 (file)
--- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected
+++ b/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
 
 

diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected b/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected
index 283963db5cf502ac09b21d816f07be9818ac7cd0..82a06f8a3b3b178340c5c94e9a3b7b1165a81a7e 100644 (file)
--- a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected
+++ b/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
 
 

diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected b/src/glsl/glcpp/tests/129-define-non-identifier.c.expected
index b460357fe20b956735ec6fa96432f7f6b691a5e7..fd0b41347fa48d62fa054161915312a16528eed6 100644 (file)
--- a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected
+++ b/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

diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected b/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected
index a3ace0f3966a0f86fffb63a55ba3eddb48078f39..57dee695714dfa50eca2d887cc884e3ea21437a6 100644 (file)
--- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected
+++ b/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

diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected b/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected
index 506eb5617561813c5fcf60da4b9e065815d1320b..d186f48761f29e88873bbc398463dfd5aa3a872f 100644 (file)
--- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected
+++ b/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