* nasm-bison.y (nasm_parser_directive): The objfmt directive must be the last

directive called; thus reorder dbgfmt_directive and objfmt_directive calls.

svn path=/trunk/yasm/; revision=1514

diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index c9fa7fd42c17fd4e1f9328bb8eb64efb71a92c17..1c6ec56ac28fdd98722a9adfd9cd607e43be129a 100644 (file)
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -656,12 +656,12 @@ nasm_parser_directive(yasm_parser_nasm *parser_nasm, const char *name,
     } else if (!yasm_arch_parse_directive(parser_nasm->arch, name, valparams,
                    objext_valparams, parser_nasm->object, line)) {
        ;
-    } else if (!yasm_objfmt_directive(parser_nasm->objfmt, name, valparams,
-                                     objext_valparams, line)) {
+    } else if (!yasm_dbgfmt_directive(parser_nasm->dbgfmt, name,
+                                     parser_nasm->cur_section, valparams,
+                                     line)) {
        ;
-    } else if (yasm_dbgfmt_directive(parser_nasm->dbgfmt, name,
-                                    parser_nasm->cur_section, valparams,
-                                    line)) {
+    } else if (yasm_objfmt_directive(parser_nasm->objfmt, name, valparams,
+                                    objext_valparams, line)) {
        yasm__error(line, N_("unrecognized directive [%s]"), name);
     }