[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Move bitsetv_maxtrix_dump
From: |
Akim Demaille |
Subject: |
Move bitsetv_maxtrix_dump |
Date: |
06 May 2002 10:43:01 +0200 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Common Lisp) |
This is the prepare the next patch.
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/closure.c (print_firsts): Display of the symbol tags.
(bitmatrix_print): Move to...
* lib/bitsetv-print.h, lib/bitsetv-print.c (bitsetv_matrix_dump):
here.
* tests/sets.at (Nullable, Broken Closure, Firsts): Adjust.
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/lib/Makefile.am,v
retrieving revision 1.24
diff -u -u -r1.24 Makefile.am
--- lib/Makefile.am 14 Mar 2002 18:31:14 -0000 1.24
+++ lib/Makefile.am 6 May 2002 08:41:50 -0000
@@ -49,5 +49,9 @@
bitset-int.h bitset.h bitsetv.h ebitset.h lbitset.h sbitset.h \
bitset.c bitsetv.c ebitset.c lbitset.c sbitset.c
+# Additional bitset operations.
+libbison_a_SOURCES += \
+ bitsetv-print.h bitsetv-print.c
+
libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@
libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)
Index: lib/bitsetv-print.c
===================================================================
RCS file: lib/bitsetv-print.c
diff -N lib/bitsetv-print.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/bitsetv-print.c 6 May 2002 08:41:50 -0000
@@ -0,0 +1,74 @@
+/* Bitset vectors.
+ Copyright (C) 2001 Free Software Foundation, Inc.
+
+This file is part of Bison.
+
+Bison is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Bison is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Bison; see the file COPYING. If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include "bitsetv-print.h"
+
+/*--------------------------------------------------------.
+| Display the MATRIX array of SIZE bitsets of size SIZE. |
+`--------------------------------------------------------*/
+
+void
+bitsetv_matrix_dump (FILE * out, const char *title, bitsetv bset)
+{
+ size_t i, j;
+ size_t hsize = bitset_size (bset[0]);
+
+ /* Title. */
+ fprintf (out, "%s BEGIN\n", title);
+
+ /* Column numbers. */
+ fputs (" ", out);
+ for (i = 0; i < hsize; ++i)
+ putc (i / 10 ? '0' + i / 10 : ' ', out);
+ putc ('\n', out);
+ fputs (" ", out);
+ for (i = 0; i < hsize; ++i)
+ fprintf (out, "%d", i % 10);
+ putc ('\n', out);
+
+ /* Bar. */
+ fputs (" .", out);
+ for (i = 0; i < hsize; ++i)
+ putc ('-', out);
+ fputs (".\n", out);
+
+ /* Contents. */
+ for (i = 0; bset[i]; ++i)
+ {
+ fprintf (out, "%2d|", i);
+ for (j = 0; j < hsize; ++j)
+ fputs (bitset_test (bset[i], j) ? "1" : " ", out);
+ fputs ("|\n", out);
+ }
+
+ /* Bar. */
+ fputs (" `", out);
+ for (i = 0; i < hsize; ++i)
+ putc ('-', out);
+ fputs ("'\n", out);
+
+ /* End title. */
+ fprintf (out, "%s END\n\n", title);
+}
Index: lib/bitsetv-print.h
===================================================================
RCS file: lib/bitsetv-print.h
diff -N lib/bitsetv-print.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/bitsetv-print.h 6 May 2002 08:41:50 -0000
@@ -0,0 +1,28 @@
+/* Bitset vectors.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ Contributed by Akim Demaille (address@hidden).
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifndef _BITSETV_PRINT_H
+#define _BITSETV_PRINT_H
+
+#include "bitsetv.h"
+
+/* Dump vector of bitsets as a matrix. */
+extern void bitsetv_matrix_dump PARAMS ((FILE *, const char *,
+ bitsetv));
+
+#endif /* _BITSETV_H */
Index: src/closure.c
===================================================================
RCS file: /cvsroot/bison/bison/src/closure.c,v
retrieving revision 1.52
diff -u -u -r1.52 closure.c
--- src/closure.c 8 Apr 2002 11:45:59 -0000 1.52
+++ src/closure.c 6 May 2002 08:41:50 -0000
@@ -22,6 +22,7 @@
#include "quotearg.h"
#include "bitset.h"
#include "bitsetv.h"
+#include "bitsetv-print.h"
#include "getargs.h"
#include "symtab.h"
#include "gram.h"
@@ -78,8 +79,7 @@
quotearg_style (escape_quoting_style, symbols[i]->tag));
for (j = 0; j < nvars; j++)
if (bitset_test (FIRSTS (i), j))
- fprintf (stderr, "\t\t%d (%s)\n",
- j + ntokens,
+ fprintf (stderr, "\t\t%s\n",
quotearg_style (escape_quoting_style,
symbols[j + ntokens]->tag));
}
@@ -111,54 +111,6 @@
}
fprintf (stderr, "\n\n");
}
-
-/*--------------------------------------------------------.
-| Display the MATRIX array of SIZE bitsets of size SIZE. |
-`--------------------------------------------------------*/
-
-static void
-bitmatrix_print (const char *title, bitsetv matrix)
-{
- size_t i, j;
- size_t size = bitset_size (matrix[0]);
-
- /* Title. */
- fprintf (stderr, "%s BEGIN\n", title);
-
- /* Column numbers. */
- fputs (" ", stderr);
- for (i = 0; i < size; ++i)
- putc (i / 10 ? '0' + i / 10 : ' ', stderr);
- putc ('\n', stderr);
- fputs (" ", stderr);
- for (i = 0; i < size; ++i)
- fprintf (stderr, "%d", i % 10);
- putc ('\n', stderr);
-
- /* Bar. */
- fputs (" .", stderr);
- for (i = 0; i < size; ++i)
- putc ('-', stderr);
- fputs (".\n", stderr);
-
- /* Contents. */
- for (i = 0; i < size; ++i)
- {
- fprintf (stderr, "%2d|", i);
- for (j = 0; j < size; ++j)
- fputs (bitset_test (matrix[i], j) ? "1" : " ", stderr);
- fputs ("|\n", stderr);
- }
-
- /* Bar. */
- fputs (" `", stderr);
- for (i = 0; i < size; ++i)
- putc ('-', stderr);
- fputs ("'\n", stderr);
-
- /* End title. */
- fprintf (stderr, "%s END\n\n", title);
-}
/*------------------------------------------------------------------.
| Set FIRSTS to be an NVARS array of NVARS bitsets indicating which |
@@ -187,10 +139,10 @@
}
if (trace_flag)
- bitmatrix_print ("RTC: Input", firsts);
+ bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts);
bitsetv_reflexive_transitive_closure (firsts);
if (trace_flag)
- bitmatrix_print ("RTC: Output", firsts);
+ bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts);
if (trace_flag)
print_firsts ();
@@ -226,6 +178,7 @@
bitsetv_free (firsts);
}
+
void
Index: tests/sets.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/sets.at,v
retrieving revision 1.12
diff -u -u -r1.12 sets.at
--- tests/sets.at 25 Apr 2002 10:30:27 -0000 1.12
+++ tests/sets.at 6 May 2002 08:41:50 -0000
@@ -92,10 +92,10 @@
e: yes
FIRSTS
$axiom firsts
- 4 ($axiom)
- 5 (e)
+ $axiom
+ e
e firsts
- 5 (e)
+ e
FDERIVES
$axiom derives
0: e $
@@ -164,8 +164,8 @@
AT_CHECK([[bison --trace input.y]], [], [], [stderr])
-AT_CHECK([[sed -n 's/[ ]*$//;/^RTC: Output BEGIN/,/^RTC: Output END/p'
stderr]], [],
-[[RTC: Output BEGIN
+AT_CHECK([[sed -n 's/[ ]*$//;/^RTC: Firsts Output BEGIN/,/^RTC: Firsts Output
END/p' stderr]], [],
+[[RTC: Firsts Output BEGIN
012345678
.---------.
@@ -179,7 +179,7 @@
7| 11|
8| 1|
`---------'
-RTC: Output END
+RTC: Firsts Output END
]])
AT_CLEANUP
@@ -227,10 +227,10 @@
exp: no
FIRSTS
$axiom firsts
- 10 ($axiom)
- 11 (exp)
+ $axiom
+ exp
exp firsts
- 11 (exp)
+ exp
FDERIVES
$axiom derives
0: exp $
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Move bitsetv_maxtrix_dump,
Akim Demaille <=