Pushed in master and branch-2.5.
* data/xslt/xml2dot.xsl, data/xslt/xml2xhtml.xsl: Space changes.
* src/print-xml.c: Style changes.
* tests/conflicts.at: Comment changes.
From 4197678606a0bad3da0d16a1c7c6729a6b3c362a Mon Sep 17 00:00:00 2001
From: Akim Demaille <[email protected]>
Date: Thu, 11 Jun 2009 14:50:25 +0200
Subject: [PATCH 4/4] style changes.
* data/xslt/xml2dot.xsl, data/xslt/xml2xhtml.xsl: Space changes.
* src/print-xml.c: Style changes.
* tests/conflicts.at: Comment changes.
---
ChangeLog | 7 +++++++
data/xslt/xml2dot.xsl | 8 ++++----
data/xslt/xml2xhtml.xsl | 8 ++++----
src/print-xml.c | 9 +++++----
tests/conflicts.at | 18 +++++++++---------
5 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0147e0a..e23fe27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-06-11 Akim Demaille <[email protected]>
+ style changes.
+ * data/xslt/xml2dot.xsl, data/xslt/xml2xhtml.xsl: Space changes.
+ * src/print-xml.c: Style changes.
+ * tests/conflicts.at: Comment changes.
+
+2009-06-11 Akim Demaille <[email protected]>
+
xml: beware of user strings used to give a %prec to rules.
* tests/conflicts.at (%prec with user strings): New.
* src/gram.c (grammar_rules_print_xml): Escape the precedence for
diff --git a/data/xslt/xml2dot.xsl b/data/xslt/xml2dot.xsl
index 130692e..aa9bde0 100644
--- a/data/xslt/xml2dot.xsl
+++ b/data/xslt/xml2dot.xsl
@@ -3,7 +3,7 @@
<!--
xml2dot.xsl - transform Bison XML Report into DOT.
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -196,11 +196,11 @@
<xsl:with-param name="search" select="$search"/>
<xsl:with-param name="replace" select="$replace"/>
</xsl:call-template>
- </xsl:when>
+ </xsl:when>
<xsl:otherwise>
- <xsl:value-of select="$subject"/>
+ <xsl:value-of select="$subject"/>
</xsl:otherwise>
- </xsl:choose>
+ </xsl:choose>
</xsl:template>
</xsl:stylesheet>
diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index 91dc630..e33f3ea 100644
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -3,7 +3,7 @@
<!--
xml2html.xsl - transform Bison XML Report into XHTML.
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -48,15 +48,15 @@
font-size: 9pt;
}
a:link {
- color: #1f00ff;
+ color: #1f00ff;
text-decoration: none;
}
a:visited {
- color: #1f00ff;
+ color: #1f00ff;
text-decoration: none;
}
a:hover {
- color: red;
+ color: red;
}
#menu a {
text-decoration: underline;
diff --git a/src/print-xml.c b/src/print-xml.c
index 72e61a8..d8becc5 100644
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -248,10 +248,11 @@ print_reductions (FILE *out, int level, state *s)
int report = false;
int i, j;
- if (reds->num == 0) {
- xml_puts (out, level, "<reductions/>");
- return;
- }
+ if (reds->num == 0)
+ {
+ xml_puts (out, level, "<reductions/>");
+ return;
+ }
if (yydefact[s->number] != 0)
default_reduction = &rules[yydefact[s->number] - 1];
diff --git a/tests/conflicts.at b/tests/conflicts.at
index f91be51..98b7d41 100644
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -580,9 +580,9 @@ input.y: expected 2 shift/reduce conflicts
AT_CLEANUP
-## ------------------------------ ##
-## %expect with reduce conflicts ##
-## ------------------------------ ##
+## ------------------------------- ##
+## %expect with reduce conflicts. ##
+## ------------------------------- ##
AT_SETUP([%expect with reduce conflicts])
@@ -643,9 +643,9 @@ AT_BISON_CHECK([-o input.c input.y], 0, [],
AT_CLEANUP
-## ---------------------------- ##
-## %no-default-prec with %prec ##
-## ---------------------------- ##
+## ----------------------------- ##
+## %no-default-prec with %prec. ##
+## ----------------------------- ##
AT_SETUP([%no-default-prec with %prec])
@@ -667,9 +667,9 @@ AT_BISON_CHECK([-o input.c input.y])
AT_CLEANUP
-## ---------------- ##
-## %default-prec ##
-## ---------------- ##
+## --------------- ##
+## %default-prec. ##
+## --------------- ##
AT_SETUP([%default-prec])
--
1.6.3.2
