glsl/glcpp: Drop extra, final newline from most output

The glcpp parser is line-based, so it needs to see a NEWLINE token at the end
of each line. This causes a trick for files that end without a final newline.

Previously, the lexer for glcpp punted in this case by unconditionally
returning a NEWLINE token at end-of-file, (causing most files to have an extra
blank line at the end). Here, we refine this by lexing end-of-file as a
NEWLINE token only if the immediately preceding token was not a NEWLINE token.

The patch is a minor change that only looks huge for two reasons:

	1. Almost all glcpp test result ".expected" files are updated to drop
	   the extra newline.

	2. All return statements from the lexer are adjusted to use a new
	   RETURN_TOKEN macro that tracks the last-token-was-a-newline state.

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

src/glsl/glcpp/tests/000-content-with-spaces.c.expected

@@ -1,2 +1 @@
    this is  four  tokens  with spaces
-

src/glsl/glcpp/tests/001-define.c.expected

@@ -1,3 +1,2 @@
 
 1
-

src/glsl/glcpp/tests/002-define-chain.c.expected

@@ -1,4 +1,3 @@
 
 
 1
-

src/glsl/glcpp/tests/003-define-chain-reverse.c.expected

@@ -1,4 +1,3 @@
 
 
 1
-

src/glsl/glcpp/tests/004-define-recursive.c.expected

@@ -4,4 +4,3 @@
 foo
 bar
 baz
-

src/glsl/glcpp/tests/005-define-composite-chain.c.expected

@@ -1,4 +1,3 @@
 
 
 a 1
-

src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected

@@ -1,4 +1,3 @@
 
 
 a 1
-

src/glsl/glcpp/tests/007-define-composite-recursive.c.expected

@@ -4,4 +4,3 @@
 a b c foo
 b c a bar
 c a b baz
-

src/glsl/glcpp/tests/008-define-empty.c.expected

@@ -1,3 +1,2 @@
 
  
-

src/glsl/glcpp/tests/009-undef.c.expected

@@ -2,4 +2,3 @@
 1
 
 foo
-

src/glsl/glcpp/tests/010-undef-re-define.c.expected

@@ -4,4 +4,3 @@
 foo
 
 2
-

src/glsl/glcpp/tests/011-define-func-empty.c.expected

@@ -1,3 +1,2 @@
 
  
-

src/glsl/glcpp/tests/012-define-func-no-args.c.expected

@@ -1,3 +1,2 @@
 
 bar
-

src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected

@@ -1,3 +1,2 @@
 
 1
-

src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected

@@ -1,3 +1,2 @@
 
 1
-

src/glsl/glcpp/tests/015-define-object-with-parens.c.expected

@@ -2,4 +2,3 @@
 ()1()
 
 ()2()
-

src/glsl/glcpp/tests/016-define-func-1-arg.c.expected

@@ -1,3 +1,2 @@
 
 ((bar)+1)
-

src/glsl/glcpp/tests/017-define-func-2-args.c.expected

@@ -1,3 +1,2 @@
 
 ((bar)*(baz))
-

src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected

@@ -1,4 +1,3 @@
 
 
 1
-

src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected

@@ -1,3 +1,2 @@
 
 (this is more than one word)
-

src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected

@@ -1,3 +1,2 @@
 
 one fish,two fish,red fish,blue fish
-

src/glsl/glcpp/tests/021-define-func-compose.c.expected

@@ -1,4 +1,3 @@
 
 
 (2*((1+(3))))
-

src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected

@@ -1,3 +1,2 @@
 
 (argument(including parens)for the win)
-

src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected

@@ -6,4 +6,3 @@
 2
 3 4
 5 6 7
-

src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected

@@ -1,4 +1,3 @@
 
 
 foo
-

src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected

@@ -1,3 +1,2 @@
 
 foo bar
-

src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected

@@ -1,4 +1,3 @@
 
 
 bar
-

src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected

@@ -1,4 +1,3 @@
 
 
 success
-

src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected

@@ -1,4 +1,3 @@
 
 
 success
-

src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected

@@ -1,4 +1,3 @@
 
 
 success
-

src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected

@@ -2,4 +2,3 @@
 
 
 success
-

src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected

@@ -2,4 +2,3 @@
 
 
 success
-

src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected

@@ -1,3 +1,2 @@
 
 foo(2*(3))
-

src/glsl/glcpp/tests/033-define-func-self-compose.c.expected

@@ -1,3 +1,2 @@
 
 foo(2*(foo(2*(3))))
-

src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected

@@ -1,3 +1,2 @@
 
 foo
-

src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected

@@ -1,3 +1,2 @@
 
 1+foo
-

src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected

@@ -1,4 +1,3 @@
 
 
 more success
-

src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected

@@ -1,4 +1,3 @@
 
 
 expand(just once)
-

src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected

@@ -1,3 +1,2 @@
 
 success
-

src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected

@@ -1,4 +1,3 @@
 
 
 (two,words)
-

src/glsl/glcpp/tests/040-token-pasting.c.expected

@@ -1,3 +1,2 @@
 
 onetoken
-

src/glsl/glcpp/tests/041-if-0.c.expected

@@ -3,4 +3,3 @@ success_1
 
 
 success_2
-

src/glsl/glcpp/tests/042-if-1.c.expected

@@ -3,4 +3,3 @@ success_1
 success_2
 
 success_3
-

src/glsl/glcpp/tests/043-if-0-else.c.expected

@@ -5,4 +5,3 @@ success_1
 success_2
 
 success_3
-

src/glsl/glcpp/tests/044-if-1-else.c.expected

@@ -5,4 +5,3 @@ success_2
 
 
 success_3
-

src/glsl/glcpp/tests/045-if-0-elif.c.expected

@@ -9,4 +9,3 @@ success_3
 
 
 success_4
-

src/glsl/glcpp/tests/046-if-1-elsif.c.expected

@@ -9,4 +9,3 @@ success_2
 
 
 success_3
-

src/glsl/glcpp/tests/047-if-elif-else.c.expected

@@ -9,4 +9,3 @@ success_1
 success_2
 
 success_3
-

src/glsl/glcpp/tests/048-if-nested.c.expected

@@ -9,4 +9,3 @@ success_1
 
 
 success_2
-

src/glsl/glcpp/tests/049-if-expression-precedence.c.expected

@@ -3,4 +3,3 @@
 
 success
 
-

src/glsl/glcpp/tests/050-if-defined.c.expected

@@ -15,4 +15,3 @@ success_2
 
 success_3
 
-

src/glsl/glcpp/tests/051-if-relational.c.expected

@@ -33,4 +33,3 @@ success_5
 
 
 
-

src/glsl/glcpp/tests/052-if-bitwise.c.expected

@@ -18,4 +18,3 @@ success_4
 
 
 
-

src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected

@@ -13,4 +13,3 @@ success_2
 
 success_3
 
-

src/glsl/glcpp/tests/054-if-with-macros.c.expected

@@ -32,4 +32,3 @@ success_6
 
 
 
-

src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected

@@ -1,4 +1,3 @@
 
 
 success
-

src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected

@@ -2,4 +2,3 @@
 
 
 success
-

src/glsl/glcpp/tests/057-empty-arguments.c.expected

@@ -4,4 +4,3 @@ success
 success
 
 success
-

src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected

@@ -3,4 +3,3 @@ ab
 a
 b
 
-

src/glsl/glcpp/tests/059-token-pasting-integer.c.expected

@@ -2,4 +2,3 @@
 12
 1000
 identifier2
-

src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected

@@ -1,4 +1,3 @@
 
 
 5*2
-

src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected

@@ -3,4 +3,3 @@
 
 
 success
-

src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected

@@ -3,4 +3,3 @@
 
 
 
-

src/glsl/glcpp/tests/063-comments.c.expected

@@ -18,4 +18,3 @@ more code here
 are not treated like comments.
  
  
-

src/glsl/glcpp/tests/064-version.c.expected

@@ -1,3 +1,2 @@
 #version 130
 
-

src/glsl/glcpp/tests/065-if-defined-parens.c.expected

@@ -15,4 +15,3 @@ success_2
 
 success_3
 
-

src/glsl/glcpp/tests/066-if-nospace-expression.c.expected

@@ -1,4 +1,3 @@
 
 success
 
-

src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected

@@ -38,4 +38,3 @@ success
 
 
 success
-

src/glsl/glcpp/tests/068-accidental-pasting.c.expected

@@ -9,4 +9,3 @@
 | |
 + +
 - -
-

src/glsl/glcpp/tests/069-repeated-argument.c.expected

@@ -1,3 +1,2 @@
 
 1 1
-

src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected

@@ -3,4 +3,3 @@
 
 Success
 
-

src/glsl/glcpp/tests/071-punctuator.c.expected

@@ -1,2 +1 @@
 a = b
-

src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected

@@ -1,3 +1,2 @@
 
 success_1 success_2 success_3
-

src/glsl/glcpp/tests/073-if-in-ifdef.c.expected

@@ -2,4 +2,3 @@
 
 
 
-

src/glsl/glcpp/tests/074-elif-undef.c.expected

@@ -1,4 +1,3 @@
 
 
 
-

src/glsl/glcpp/tests/075-elif-elif-undef.c.expected

@@ -2,4 +2,3 @@
 
 
 
-

src/glsl/glcpp/tests/076-elif-undef-nested.c.expected

@@ -3,4 +3,3 @@
 
 
 
-

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

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

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

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

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

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

src/glsl/glcpp/tests/080-if-without-expression.c.expected

@@ -3,4 +3,3 @@
 
 
 
-

src/glsl/glcpp/tests/081-elif-without-expression.c.expected

@@ -2,4 +2,3 @@
 
 
 
-

src/glsl/glcpp/tests/082-invalid-paste.c.expected

@@ -17,4 +17,3 @@ Pasting "4" and "+" does not give a valid preprocessing token.
 2
 34
 45.2
-

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

@@ -2,4 +2,3 @@
 
 
 
-

src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected

@@ -9,4 +9,3 @@ MULT()
 MULT(1)
 MULT(1,2,3)
 
-

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

@@ -7,4 +7,3 @@
 
 
 
-

src/glsl/glcpp/tests/087-if-comments.c.expected

@@ -3,4 +3,3 @@
 
 win
 
-

src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected

@@ -3,4 +3,3 @@
 
 
 
-

src/glsl/glcpp/tests/089-redefine-macro-error.c.expected

@@ -27,4 +27,3 @@
 
 
 
-

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

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

src/glsl/glcpp/tests/091-hash-line.c.expected

@@ -16,4 +16,3 @@
 #line 90 2
 
 #line 180 2
-

src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected

@@ -7,4 +7,3 @@
 
 
 
-

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

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

src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected

@@ -12,4 +12,3 @@
 
 
 
-

src/glsl/glcpp/tests/095-recursive-define.c.expected

@@ -1,4 +1,3 @@
 
 
 B(0, C)
-

src/glsl/glcpp/tests/096-paste-twice.c.expected

@@ -1,4 +1,3 @@
 
 justonetoken
 
-

src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected

@@ -1,4 +1,3 @@
 
 onetoken
 
-

src/glsl/glcpp/tests/098-elif-undefined.c.expected

@@ -5,4 +5,3 @@
 
 Yes, this.
 
-

src/glsl/glcpp/tests/099-c99-example.c.expected

@@ -14,4 +14,3 @@
 f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);
 f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);
 int i[] = { 1, 23, 4, 5, };
-

src/glsl/glcpp/tests/100-macro-with-colon.c.expected

@@ -5,4 +5,3 @@ switch (1) {
    case 1 + 2:
       break;
 }
-