From e9397867ddce20a4263949f4b3a488fa99af3041 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Tue, 25 May 2010 17:08:07 -0700
Subject: [PATCH] Collapse multiple spaces in input down to a single space.

This is what gcc does, and it's actually less work to do
this. Previously we were having to save the contents of space tokens
as a string, but we don't need to do that now.

We extend test #0 to exercise this feature here.
---
 glcpp-lex.l                     |  1 -
 glcpp-parse.y                   | 10 ++++++----
 tests/000-content-with-spaces.c |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/glcpp-lex.l b/glcpp-lex.l
index f6d0c8b7d67..516f42dee32 100644
--- a/glcpp-lex.l
+++ b/glcpp-lex.l
@@ -119,7 +119,6 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 
 {HSPACE}+ {
 	if (yyextra->space_tokens) {
-		yylval.str = xtalloc_strdup (yyextra, yytext);
 		return SPACE;
 	}
 }
diff --git a/glcpp-parse.y b/glcpp-parse.y
index a1981995fd0..0460f71f746 100644
--- a/glcpp-parse.y
+++ b/glcpp-parse.y
@@ -132,8 +132,8 @@ glcpp_parser_lex (glcpp_parser_t *parser);
 
 %token HASH HASH_DEFINE_FUNC HASH_DEFINE_OBJ HASH_UNDEF IDENTIFIER NEWLINE OTHER SPACE
 %token LEFT_SHIFT RIGHT_SHIFT LESS_OR_EQUAL GREATER_OR_EQUAL EQUAL NOT_EQUAL AND OR PASTE
-%type <ival> punctuator
-%type <str> IDENTIFIER OTHER SPACE
+%type <ival> punctuator SPACE
+%type <str> IDENTIFIER OTHER
 %type <string_list> identifier_list
 %type <token> preprocessing_token
 %type <token_list> pp_tokens replacement_list text_line
@@ -235,7 +235,7 @@ preprocessing_token:
 		$$ = _token_create_str (parser, OTHER, $1);
 	}
 |	SPACE {
-		$$ = _token_create_str (parser, SPACE, $1);	
+		$$ = _token_create_ival (parser, SPACE, SPACE);
 	}
 ;
 
@@ -495,9 +495,11 @@ _token_print (token_t *token)
 	switch (token->type) {
 	case IDENTIFIER:
 	case OTHER:
-	case SPACE:
 		printf ("%s", token->value.str);
 		break;
+	case SPACE:
+		printf (" ");
+		break;
 	case LEFT_SHIFT:
 		printf ("<<");
 		break;
diff --git a/tests/000-content-with-spaces.c b/tests/000-content-with-spaces.c
index a7fc918c908..696cb3a74fc 100644
--- a/tests/000-content-with-spaces.c
+++ b/tests/000-content-with-spaces.c
@@ -1 +1 @@
-this is four tokens
+this is  four 	tokens
-- 
2.30.2