nasm.c: readability cleanup for seg:off parsing
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 26 Feb 2009 22:34:48 +0000 (14:34 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 26 Feb 2009 22:34:48 +0000 (14:34 -0800)
The code to pick apart seg:off in nasm.c was virtually unreadable due
to mechanized line breaking.

nasm.c

diff --git a/nasm.c b/nasm.c
index 405fb1e..b2f7631 100644 (file)
--- 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,