From db8f96e0e6ccd31ebab9214dc871d48d720d90f4 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 15 Jul 2009 09:07:29 -0400 Subject: [PATCH] preproc: formatting cleanups Fix inconsistent indentation, and legacy use of partial directives instead of simply pp_directives[i]. Signed-off-by: H. Peter Anvin --- preproc.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/preproc.c b/preproc.c index 2cffd56f..13c269f7 100644 --- a/preproc.c +++ b/preproc.c @@ -2094,7 +2094,7 @@ static int do_directive(Token * tline) * If we're in a %rep block, another %rep nests, so should be let through. */ if (defining && i != PP_MACRO && i != PP_IMACRO && - i != PP_RMACRO && i != PP_IRMACRO && + i != PP_RMACRO && i != PP_IRMACRO && i != PP_ENDMACRO && i != PP_ENDM && (defining->name || (i != PP_ENDREP && i != PP_REP))) { return NO_DIRECTIVE_FOUND; @@ -2102,7 +2102,7 @@ static int do_directive(Token * tline) if (defining) { if (i == PP_MACRO || i == PP_IMACRO || - i == PP_RMACRO || i == PP_IRMACRO) { + i == PP_RMACRO || i == PP_IRMACRO) { nested_mac_count++; return NO_DIRECTIVE_FOUND; } else if (nested_mac_count > 0) { @@ -2614,22 +2614,19 @@ static int do_directive(Token * tline) free_tlist(origline); return DIRECTIVE_FOUND; - case PP_RMACRO: - case PP_IRMACRO: + case PP_RMACRO: + case PP_IRMACRO: case PP_MACRO: case PP_IMACRO: if (defining) { - error(ERR_FATAL, - "`%%%smacro': already defining a macro", - (i == PP_IMACRO ? "i" : - i == PP_RMACRO ? "r" : - i == PP_IRMACRO ? "ri" : "")); + error(ERR_FATAL, "`%s': already defining a macro", + pp_directives[i]); return DIRECTIVE_FOUND; } - defining = nasm_malloc(sizeof(MMacro)); - defining->max_depth = (((i == PP_RMACRO) || (i == PP_IRMACRO)) - ? (DEADMAN_LIMIT) : 0); - defining->casesense = ((i == PP_MACRO) || (i == PP_RMACRO)); + defining = nasm_malloc(sizeof(MMacro)); + defining->max_depth = + (i == PP_RMACRO) || (i == PP_IRMACRO) ? DEADMAN_LIMIT : 0; + defining->casesense = (i == PP_MACRO) || (i == PP_RMACRO); if (!parse_mmacro_spec(tline, defining, pp_directives[i])) { nasm_free(defining); defining = NULL; -- 2.11.4.GIT