Merge branch 'gawk-4.0-stable'

1 files changed, 27 insertions, 9 deletions

diff --git a/awkgram.c b/awkgram.c
index 24c102d4..4e62f98d 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -5450,6 +5450,32 @@ allow_newline(void)
 	}
 }
 
+/* newline_eof --- return newline or EOF as needed and adjust variables */
+
+/*
+ * This routine used to be a macro, however GCC 4.6.2 warned about
+ * the result of a computation not being used.  Converting to a function
+ * removes the warnings.
+ */
+
+static int newline_eof()
+{
+	/* NB: a newline at end does not start a source line. */
+	if (lasttok != NEWLINE) {
+                pushback();
+		if (do_lint && ! eof_warned) {
+        		lintwarn(_("source file does not end in newline"));
+			eof_warned = TRUE;
+		}
+		sourceline++;
+		return NEWLINE;
+	}
+
+	sourceline--;
+	eof_warned = FALSE;
+	return LEX_EOF;
+}
+
 /* yylex --- Read the input and turn it into tokens. */
 
 static int
@@ -5468,15 +5494,7 @@ yylex(void)
 
 #define GET_INSTRUCTION(op) bcalloc(op, 1, sourceline)
 
-	/* NB: a newline at end does not start a source line. */
-
-#define NEWLINE_EOF                                             \
-    (lasttok != NEWLINE  ?                                      \
-                (pushback(), do_lint && ! eof_warned &&         \
-        (lintwarn(_("source file does not end in newline")),    \
-       		eof_warned = TRUE), sourceline++, NEWLINE) :        \
-                 (sourceline--, eof_warned = FALSE, LEX_EOF))
-
+#define NEWLINE_EOF newline_eof()
 
 	yylval = (INSTRUCTION *) NULL;
 	if (lasttok == SUBSCRIPT) {