Change multi-case macros so their usage looks like ordinary case labels.

diff --git a/lexer.c b/lexer.c
index 8a2dbdd..4e36c3a 100644 (file)
--- a/lexer.c
+++ b/lexer.c
@@ -182,7 +182,7 @@ static inline void next_char(void)
 }
 
 #define SYMBOL_CHARS_WITHOUT_E_P \
-       case '$': if (!allow_dollar_in_symbol) goto dollar_sign; \
+            '$': if (!allow_dollar_in_symbol) goto dollar_sign; \
        case 'a':         \
        case 'b':         \
        case 'c':         \
@@ -231,20 +231,20 @@ static inline void next_char(void)
        case 'X':         \
        case 'Y':         \
        case 'Z':         \
-       case '_':
+       case '_'
 
 #define SYMBOL_CHARS_E_P \
-       case 'E': \
+            'E': \
        case 'P': \
        case 'e': \
-       case 'p':
+       case 'p'
 
 #define SYMBOL_CHARS  \
-       SYMBOL_CHARS_WITHOUT_E_P \
-       SYMBOL_CHARS_E_P
+            SYMBOL_CHARS_WITHOUT_E_P: \
+       case SYMBOL_CHARS_E_P
 
 #define DIGITS        \
-       case '0':         \
+            '0':         \
        case '1':         \
        case '2':         \
        case '3':         \
@@ -253,7 +253,7 @@ static inline void next_char(void)
        case '6':         \
        case '7':         \
        case '8':         \
-       case '9':
+       case '9'
 
 static bool is_universal_char_valid(utf32 const v)
 {
@@ -354,8 +354,8 @@ static void parse_symbol(void)
 {
        while (true) {
                switch (c) {
-               DIGITS
-               SYMBOL_CHARS
+               case DIGITS:
+               case SYMBOL_CHARS:
                        obstack_1grow(&symbol_obstack, (char) c);
                        next_char();
                        break;
@@ -430,13 +430,13 @@ static void parse_pp_number(void)
 {
        for (;;) {
                switch (c) {
-               SYMBOL_CHARS_E_P
+               case SYMBOL_CHARS_E_P:
                        obstack_1grow(&symbol_obstack, (char)c);
                        next_char();
                        if (c == '+' || c == '-') {
                case '.':
-               DIGITS
-               SYMBOL_CHARS_WITHOUT_E_P
+               case DIGITS:
+               case SYMBOL_CHARS_WITHOUT_E_P:
                                obstack_1grow(&symbol_obstack, (char)c);
                                next_char();
                        }
@@ -942,7 +942,7 @@ void lexer_next_preprocessing_token(void)
                        lexer_token.kind = '\n';
                        return;
 
-               SYMBOL_CHARS {
+               case SYMBOL_CHARS: {
                        parse_symbol();
                        /* might be a wide string ( L"string" ) */
                        string_encoding_t const enc = STRING_ENCODING_WIDE;
@@ -955,7 +955,7 @@ void lexer_next_preprocessing_token(void)
                        return;
                }
 
-               DIGITS
+               case DIGITS:
                        parse_pp_number();
                        return;
 
@@ -969,7 +969,7 @@ void lexer_next_preprocessing_token(void)
 
                case '.':
                        MAYBE_PROLOG
-                               DIGITS
+                               case DIGITS:
                                        put_back(c);
                                        c = '.';
                                        parse_pp_number();

diff --git a/preprocessor.c b/preprocessor.c
index 90dedc2..f9cc49b 100644 (file)
--- a/preprocessor.c
+++ b/preprocessor.c
@@ -530,8 +530,8 @@ static void parse_character_constant(string_encoding_t const enc)
        }
 }
 
-#define SYMBOL_CHARS_WITHOUT_E_P \
-       case 'a': \
+#define SYMBOL_CASES_WITHOUT_E_P \
+            'a': \
        case 'b': \
        case 'c': \
        case 'd': \
@@ -579,17 +579,17 @@ static void parse_character_constant(string_encoding_t const enc)
        case 'X': \
        case 'Y': \
        case 'Z': \
-       case '_':
+       case '_'
 
-#define SYMBOL_CHARS \
-       SYMBOL_CHARS_WITHOUT_E_P \
+#define SYMBOL_CASES \
+            SYMBOL_CASES_WITHOUT_E_P: \
        case 'e': \
        case 'p': \
        case 'E': \
-       case 'P':
+       case 'P'
 
-#define DIGITS \
-       case '0':  \
+#define DIGIT_CASES \
+            '0':  \
        case '1':  \
        case '2':  \
        case '3':  \
@@ -598,7 +598,7 @@ static void parse_character_constant(string_encoding_t const enc)
        case '6':  \
        case '7':  \
        case '8':  \
-       case '9':
+       case '9'
 
 /**
  * returns next final token from a preprocessor macro expansion
@@ -752,8 +752,8 @@ static void parse_symbol(void)
 
        while (true) {
                switch (input.c) {
-               DIGITS
-               SYMBOL_CHARS
+               case DIGIT_CASES:
+               case SYMBOL_CASES:
                        obstack_1grow(&symbol_obstack, (char) input.c);
                        next_char();
                        break;
@@ -798,8 +798,8 @@ static void parse_number(void)
        while (true) {
                switch (input.c) {
                case '.':
-               DIGITS
-               SYMBOL_CHARS_WITHOUT_E_P
+               case DIGIT_CASES:
+               case SYMBOL_CASES_WITHOUT_E_P:
                        obstack_1grow(&symbol_obstack, (char) input.c);
                        next_char();
                        break;
@@ -876,11 +876,11 @@ restart:
                info.had_whitespace = true;
                goto restart;
 
-       SYMBOL_CHARS
+       case SYMBOL_CASES:
                parse_symbol();
                return;
 
-       DIGITS
+       case DIGIT_CASES:
                parse_number();
                return;