Augment MATCH_NEWLINE() so its usage looks like an ordinary case label.

diff --git a/ast2firm.c b/ast2firm.c
index 3edec46..21ec74b 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -1119,8 +1119,8 @@ static ir_node *string_to_firm(source_position_t const *const src_pos, char cons
                elem_type   = ir_type_char;
                initializer = create_initializer_compound(slen);
 
-               ir_mode  *const mode = get_type_mode(elem_type);
-               char const     *p    = value->begin;
+               ir_mode *const mode = get_type_mode(elem_type);
+               char const    *p    = value->begin;
                for (size_t i = 0; i < slen; ++i) {
                        ir_tarval        *tv  = new_tarval_from_long(*p++, mode);
                        ir_initializer_t *val = create_initializer_tarval(tv);

diff --git a/lexer.c b/lexer.c
index 5d73bbd..51e6fa5 100644 (file)
--- a/lexer.c
+++ b/lexer.c
@@ -108,16 +108,17 @@ static inline void put_back(utf32 const pc)
 
 static inline void next_char(void);
 
-#define MATCH_NEWLINE(code)  \
-       case '\r':               \
-               next_char();         \
-               if (c == '\n') {     \
-       case '\n':               \
-                       next_char();     \
-               }                    \
-               lexer_pos.lineno++;  \
+#define NEWLINE  \
+       '\r': \
+               next_char(); \
+               if (c == '\n') { \
+       case '\n': \
+                       next_char(); \
+               } \
+               lexer_pos.lineno++; \
                lexer_pos.colno = 1; \
-               code
+               goto newline; \
+               newline // Let it look like an ordinary case label.
 
 #define eat(c_type) (assert(c == c_type), next_char())
 
@@ -126,7 +127,8 @@ static void maybe_concat_lines(void)
        eat('\\');
 
        switch (c) {
-       MATCH_NEWLINE(return;)
+       case NEWLINE:
+               return;
 
        default:
                break;
@@ -660,10 +662,9 @@ static void parse_string(utf32 const delim, token_kind_t const kind, string_enco
                        break;
                }
 
-               MATCH_NEWLINE(
+               case NEWLINE:
                        errorf(&lexer_pos, "newline while parsing %s", context);
                        break;
-               )
 
                case EOF:
                        errorf(&lexer_token.base.source_position, "EOF while parsing %s", context);
@@ -732,7 +733,8 @@ static void skip_multiline_comment(void)
                        }
                        break;
 
-               MATCH_NEWLINE(break;)
+               case NEWLINE:
+                       break;
 
                case EOF: {
                        errorf(&lexer_token.base.source_position,
@@ -991,10 +993,9 @@ void lexer_next_preprocessing_token(void)
                        next_char();
                        break;
 
-               MATCH_NEWLINE(
+               case NEWLINE:
                        lexer_token.kind = '\n';
                        return;
-               )
 
                SYMBOL_CHARS {
                        parse_symbol();