Fix slight whitespace issue - don't append whitespace after closing

paren to beginning of expansion of %define with parameters.

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

diff --git a/modules/preprocs/yapp/yapp-preproc.c b/modules/preprocs/yapp/yapp-preproc.c
index 6b5ed5ef0d5e8a93f14c105813bcc1cc0810397c..2451ef4a78e845901b022c4534446a1e0e7598c9 100644 (file)
--- a/modules/preprocs/yapp/yapp-preproc.c
+++ b/modules/preprocs/yapp/yapp-preproc.c
@@ -834,7 +834,9 @@ yapp_preproc_input(char *buf, size_t max_size)
                            if (token == ')') {
                                /* after paramlist and ')' */
                                /* everything is what it's defined to be */
-                               if(append_to_return(&macro_head, &macro_tail)==0) state=YAPP_STATE_EOF;
+                               token = yapp_preproc_lex();
+                               if (token != WHITESPACE) append_token(token, &macro_head, &macro_tail);
+                               if (append_to_return(&macro_head, &macro_tail)==0) state=YAPP_STATE_EOF;
                                else {
                                    ydebug(("YAPP: Inserting define macro %s (%d)\n", s, param_count));
                                    yapp_define_insert(s, param_count, 0);

diff --git a/src/preprocs/yapp/yapp-preproc.c b/src/preprocs/yapp/yapp-preproc.c
index 6b5ed5ef0d5e8a93f14c105813bcc1cc0810397c..2451ef4a78e845901b022c4534446a1e0e7598c9 100644 (file)
--- a/src/preprocs/yapp/yapp-preproc.c
+++ b/src/preprocs/yapp/yapp-preproc.c
@@ -834,7 +834,9 @@ yapp_preproc_input(char *buf, size_t max_size)
                            if (token == ')') {
                                /* after paramlist and ')' */
                                /* everything is what it's defined to be */
-                               if(append_to_return(&macro_head, &macro_tail)==0) state=YAPP_STATE_EOF;
+                               token = yapp_preproc_lex();
+                               if (token != WHITESPACE) append_token(token, &macro_head, &macro_tail);
+                               if (append_to_return(&macro_head, &macro_tail)==0) state=YAPP_STATE_EOF;
                                else {
                                    ydebug(("YAPP: Inserting define macro %s (%d)\n", s, param_count));
                                    yapp_define_insert(s, param_count, 0);