Simplify y.tab.c when location tracking is disabled.

* data/yacc.c: Do not check YYLTYPE_IS_TRIVIAL if location
tracking is not enabled.  Instead, unconditionally define
YY_LOCATION_PRINT as a no-op for backward compatibility.

diff --git a/ChangeLog b/ChangeLog
index 19dda9df1928eaa52138fb75c9c1017d3900c25e..029826fce353c952eaf9c920a315206461d252ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-15  Jonathan Nieder  <jrnieder@gmail.com>  (tiny change)
+
+       Simplify y.tab.c when location tracking is disabled.
+       * data/yacc.c: Do not check YYLTYPE_IS_TRIVIAL if location
+       tracking is not enabled.  Instead, unconditionally define
+       YY_LOCATION_PRINT as a no-op for backward compatibility.
+
 2009-12-15  Jonathan Nieder  <jrnieder@gmail.com>  (tiny change)
 
        Avoid warnings from gcc -Wundef y.tab.c.

diff --git a/data/yacc.c b/data/yacc.c
index a7d794812d3b313f3a4ff4c9b22549d431a91b8c..711d41de68300a832e8eded6c6816e1df1ef22a1 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -662,7 +662,7 @@ while (YYID (0))
     while (YYID (0))
 #endif
 
-
+]b4_locations_if([[
 /* YY_LOCATION_PRINT -- Print the location on the stream.
    This macro was not mandated originally: define only if we know
    we won't break user code: when these are the locations we know.  */
@@ -677,7 +677,13 @@ while (YYID (0))
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
 #endif
+]], [[
+/* This macro is provided for backward compatibility. */
 
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+]])[
 
 /* YYLEX -- calling `yylex' with the right arguments.  */