preproc.c: revamped context-local fall-through warning message
authorKeith Kanios <keith@kanios.net>
Sat, 14 Aug 2010 17:47:45 +0000 (12:47 -0500)
committerKeith Kanios <keith@kanios.net>
Sat, 14 Aug 2010 17:47:45 +0000 (12:47 -0500)
preproc.c

index f04434b9afcf4fb4758a289a217db9372bc7ff15..5fafbd4cc2eeeafd2d2082b17fdb0f1f0bbe81ba 100644 (file)
--- a/preproc.c
+++ b/preproc.c
@@ -1482,16 +1482,17 @@ static Context *get_ctx(const char *name, const char **namep,
         m = hash_findix(&ctx->localmac, name);
         while (m) {
             if (!mstrcmp(m->name, name, m->casesense)) {
-                /* NOTE: obsolete since 2.10 */
+                /* NOTE: deprecated as of 2.10 */
                 static int once = 0;
                 if (!once) {
                     error(ERR_WARNING, "context-local macro expansion"
-                            " to outer contexts will be deprecated"
-                            " starting in NASM 2.10, please update your"
-                            " code accordingly");
+                            " fall-through (automatic searching of outer"
+                                                   " contexts) will be deprecated starting in"
+                                                   " NASM 2.10, please see the NASM Manual for"
+                                                   " more information");
                     once = 1;
                 }
-                error(ERR_WARNING, "`%s': context through macro expansion", name);
+                error(ERR_WARNING, "`%s': context-local macro expansion fall-through", name);
                 return ctx;
             }
             m = m->next;