From 7219198d729db708eddfe28615664ef55d2dfeed Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 26 Feb 2009 14:34:48 -0800 Subject: [PATCH] nasm.c: readability cleanup for seg:off parsing The code to pick apart seg:off in nasm.c was virtually unreadable due to mechanized line breaking. --- nasm.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/nasm.c b/nasm.c index 405fb1e9..b2f76311 100644 --- a/nasm.c +++ b/nasm.c @@ -1539,23 +1539,17 @@ static void assemble_file(char *fname, StrList **depend_ptr) false, isext, ofmt, report_error); } else if (output_ins.operands == 2 - && (output_ins.oprs[0]. - type & IMMEDIATE) + && (output_ins.oprs[0].type & IMMEDIATE) && (output_ins.oprs[0].type & COLON) - && output_ins.oprs[0].segment == - NO_SEG + && output_ins.oprs[0].segment == NO_SEG && output_ins.oprs[0].wrt == NO_SEG - && (output_ins.oprs[1]. - type & IMMEDIATE) - && output_ins.oprs[1].segment == - NO_SEG - && output_ins.oprs[1].wrt == - NO_SEG) { + && (output_ins.oprs[1].type & IMMEDIATE) + && output_ins.oprs[1].segment == NO_SEG + && output_ins.oprs[1].wrt == NO_SEG) { def_label(output_ins.label, - output_ins.oprs[0]. - offset | SEG_ABS, - output_ins.oprs[1].offset, NULL, - false, false, ofmt, + output_ins.oprs[0].offset | SEG_ABS, + output_ins.oprs[1].offset, + NULL, false, false, ofmt, report_error); } else report_error(ERR_NONFATAL, -- 2.11.4.GIT