X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=lexer.c;h=1300b3d26f23cda1c90093658115266e03a941ab;hb=22420f9404b76d3ab2536c7d3903cbcf05a792a8;hp=7dbaaab202868828467dc57556c447283549f5c7;hpb=e59164faaefe91f425565128901f1c5b655977fe;p=cparser

diff --git a/lexer.c b/lexer.c
index 7dbaaab..1300b3d 100644
--- a/lexer.c
+++ b/lexer.c
@@ -17,6 +17,7 @@
 
 static int         c;
 token_t            lexer_token;
+symbol_t          *symbol_L;
 static FILE       *input;
 static char        buf[1024 + MAX_PUTBACK];
 static const char *bufend;
@@ -88,11 +89,7 @@ static inline void next_char(void);
 		lexer_token.source_position.linenr++; \
 		code;
 
-static inline void eat(char c_type)
-{
-	assert(c == c_type);
-	next_char();
-}
+#define eat(c_type)  do { assert(c == c_type); next_char(); } while(0)
 
 static void maybe_concat_lines(void)
 {
@@ -113,6 +110,7 @@ static inline void next_char(void)
 {
 	next_real_char();
 
+#if 0
 	/* filter trigraphs */
 	if(UNLIKELY(c == '\\')) {
 		maybe_concat_lines();
@@ -148,6 +146,8 @@ static inline void next_char(void)
 	}
 
 end_of_next_char:
+#endif
+	(void) maybe_concat_lines;
 #ifdef DEBUG_CHARS
 	printf("nchar '%c'\n", c);
 #else
@@ -281,6 +281,21 @@ static void parse_integer_suffix(void)
 	}
 }
 
+static void parse_floating_suffix(void)
+{
+	switch(c) {
+	/* TODO: do something usefull with the suffixes... */
+	case 'f':
+	case 'F':
+	case 'l':
+	case 'L':
+		next_char();
+		break;
+	default:
+		break;
+	}
+}
+
 static void parse_number_hex(void)
 {
 	assert(c == 'x' || c == 'X');
@@ -365,6 +380,8 @@ static void parse_floatingpoint_exponent(long double value)
 
 	lexer_token.type         = T_FLOATINGPOINT;
 	lexer_token.v.floatvalue = value;
+
+	parse_floating_suffix();
 }
 
 static void parse_floatingpoint_fract(int integer_part)
@@ -386,6 +403,8 @@ static void parse_floatingpoint_fract(int integer_part)
 
 	lexer_token.type         = T_FLOATINGPOINT;
 	lexer_token.v.floatvalue = value;
+
+	parse_floating_suffix();
 }
 
 static void parse_number_dec(void)
@@ -786,7 +805,7 @@ static void parse_preprocessor_identifier(void)
 	}
 }
 
-static void parse_preprocessor_directive()
+static void parse_preprocessor_directive(void)
 {
 	next_pp_token();
 
@@ -844,6 +863,12 @@ void lexer_next_preprocessing_token(void)
 
 		SYMBOL_CHARS
 			parse_symbol();
+			/* might be a wide string ( L"string" ) */
+			if(c == '"' && (lexer_token.type == T_IDENTIFIER &&
+			   lexer_token.v.symbol == symbol_L)) {
+			   	parse_string_literal();
+			   	return;
+			}
 			return;
 
 		DIGITS
@@ -1019,10 +1044,14 @@ void init_lexer(void)
 void lexer_open_stream(FILE *stream, const char *input_name)
 {
 	input                                  = stream;
-	lexer_token.source_position.linenr     = 1;
+	lexer_token.source_position.linenr     = 0;
 	lexer_token.source_position.input_name = input_name;
 
-	next_char();
+	symbol_L = symbol_table_insert("L");
+
+	/* place a virtual \n at the beginning so the lexer knows that we're
+	 * at the beginning of a line */
+	c = '\n';
 }
 
 void exit_lexer(void)