X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=parse.c;h=758e9ffbd24626c303633ef865de3f2364a6f43f;hp=0988f1e0965d9810ffc80ea44a3428c863952da7;hb=806cd92dfbe2c0ac42847a03512de54de6cec5c6;hpb=27b9348c2ca5a17c153399390161850ac99bda3b

diff --git a/parse.c b/parse.c
index 0988f1e..758e9ff 100644
--- a/parse.c
+++ b/parse.c
@@ -316,54 +316,54 @@ int parse_tree(struct lex_file *file) {
 							 * is a rather large macro, and is #undef after it's use below.
 							 */
 							#define PARSE_VEC_ELEMENT(NAME, BIT)                                                                                                                               \
-                                token = lex_token(file);                                                                                                                                           \
-                                if (token == ' ') {                                                                                                                                                \
-                                    token = lex_token(file);                                                                                                                                       \
-                                }                                                                                                                                                                  \
-                                if (token == '.') {                                                                                                                                                \
-                                    compile_calc_d = 1;                                                                                                                                            \
-                                }                                                                                                                                                                  \
-                                if (!isdigit(token) && !compile_calc_d && token != '+' && token != '-')                                                                                            \
-                                    error(ERROR_PARSE,"%s:%d Invalid constant initializer element %c for vector, must be numeric\n", file->name, file->line, NAME);                                \
-                                if (token == '+') {                                                                                                                                                \
-                                    compile_calc_s = '+';                                                                                                                                          \
-                                }                                                                                                                                                                  \
-                                if (token == '-' && !compile_calc_s) {                                                                                                                             \
-                                    compile_calc_s = '-';                                                                                                                                          \
-                                }                                                                                                                                                                  \
-                                while (isdigit(token) || token == '.' || token == '+' || token == '-') {                                                                                           \
-                                    *compile_eval++ = token;                                                                                                                                       \
-                                    token           = lex_token(file);                                                                                                                             \
-                                    if (token == '.' && compile_calc_d) {                                                                                                                          \
-                                        error(ERROR_PARSE, "%s:%d Invalid constant initializer element %c for vector, must be numeric.\n", file->name, file->line, NAME);                          \
-                                        token = lex_token(file);                                                                                                                                   \
-                                    }                                                                                                                                                              \
-                                    if ((token == '-' || token == '+') && compile_calc_s) {                                                                                                        \
-                                        error(ERROR_PARSE, "%s:%d Invalid constant initializer sign for vector element %c\n", file->name, file->line, NAME);                                       \
-                                        token = lex_token(file);                                                                                                                                   \
-                                    } else if (token == '.' && !compile_calc_d) {                                                                                                                  \
-                                        compile_calc_d = 1;                                                                                                                                        \
-                                    } else if (token == '-' && !compile_calc_s) {                                                                                                                  \
-                                        compile_calc_s = '-';                                                                                                                                      \
-                                    } else if (token == '+' && !compile_calc_s) {                                                                                                                  \
-                                        compile_calc_s = '+';                                                                                                                                      \
-                                    }                                                                                                                                                              \
-                                }                                                                                                                                                                  \
-                                if (token == ' ') {                                                                                                                                                \
-                                    token = lex_token(file);                                                                                                                                       \
-                                }                                                                                                                                                                  \
-                                if (NAME != 'z') {                                                                                                                                                 \
-                                    if (token != ',' && token != ' ')  {                                                                                                                           \
-                                        error(ERROR_PARSE, "%s:%d invalid constant initializer element %c for vector (missing spaces, or comma delimited list?)\n", NAME, file->name, file->line); \
-                                    }                                                                                                                                                              \
-                                } else if (token != '}') {                                                                                                                                         \
-                                    error(ERROR_PARSE, "%s:%d Expected `}` on end of constant initialization for vector\n", file->name, file->line);                                               \
-                                }                                                                                                                                                                  \
-                                compile_calc_##BIT = atof(compile_data);                                                                                                                           \
-                                compile_calc_d = 0;                                                                                                                                                \
-                                compile_calc_s = 0;                                                                                                                                                \
-                                compile_eval   = &compile_data[0];                                                                                                                                 \
-                                memset(compile_data, 0, sizeof(compile_data))
+							token = lex_token(file);                                                                                                                                           \
+							if (token == ' ') {                                                                                                                                                \
+								token = lex_token(file);                                                                                                                                       \
+							}                                                                                                                                                                  \
+							if (token == '.') {                                                                                                                                                \
+								compile_calc_d = 1;                                                                                                                                            \
+							}                                                                                                                                                                  \
+							if (!isdigit(token) && !compile_calc_d && token != '+' && token != '-')                                                                                            \
+								error(ERROR_PARSE,"%s:%d Invalid constant initializer element %c for vector, must be numeric\n", file->name, file->line, NAME);                                \
+							if (token == '+') {                                                                                                                                                \
+								compile_calc_s = '+';                                                                                                                                          \
+							}                                                                                                                                                                  \
+							if (token == '-' && !compile_calc_s) {                                                                                                                             \
+								compile_calc_s = '-';                                                                                                                                          \
+							}                                                                                                                                                                  \
+							while (isdigit(token) || token == '.' || token == '+' || token == '-') {                                                                                           \
+								*compile_eval++ = token;                                                                                                                                       \
+								token           = lex_token(file);                                                                                                                             \
+								if (token == '.' && compile_calc_d) {                                                                                                                          \
+									error(ERROR_PARSE, "%s:%d Invalid constant initializer element %c for vector, must be numeric.\n", file->name, file->line, NAME);                          \
+									token = lex_token(file);                                                                                                                                   \
+								}                                                                                                                                                              \
+								if ((token == '-' || token == '+') && compile_calc_s) {                                                                                                        \
+									error(ERROR_PARSE, "%s:%d Invalid constant initializer sign for vector element %c\n", file->name, file->line, NAME);                                       \
+									token = lex_token(file);                                                                                                                                   \
+								} else if (token == '.' && !compile_calc_d) {                                                                                                                  \
+									compile_calc_d = 1;                                                                                                                                        \
+								} else if (token == '-' && !compile_calc_s) {                                                                                                                  \
+									compile_calc_s = '-';                                                                                                                                      \
+								} else if (token == '+' && !compile_calc_s) {                                                                                                                  \
+									compile_calc_s = '+';                                                                                                                                      \
+								}                                                                                                                                                              \
+							}                                                                                                                                                                  \
+							if (token == ' ') {                                                                                                                                                \
+								token = lex_token(file);                                                                                                                                       \
+							}                                                                                                                                                                  \
+							if (NAME != 'z') {                                                                                                                                                 \
+								if (token != ',' && token != ' ')  {                                                                                                                           \
+									error(ERROR_PARSE, "%s:%d invalid constant initializer element %c for vector (missing spaces, or comma delimited list?)\n", NAME, file->name, file->line); \
+								}                                                                                                                                                              \
+							} else if (token != '}') {                                                                                                                                         \
+								error(ERROR_PARSE, "%s:%d Expected `}` on end of constant initialization for vector\n", file->name, file->line);                                               \
+							}                                                                                                                                                                  \
+							compile_calc_##BIT = atof(compile_data);                                                                                                                           \
+							compile_calc_d = 0;                                                                                                                                                \
+							compile_calc_s = 0;                                                                                                                                                \
+							compile_eval   = &compile_data[0];                                                                                                                                 \
+							memset(compile_data, 0, sizeof(compile_data))
 							
 							/*
 							 * Parse all elements using the macro above.