[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12-fyi-symbols-1.patch
From: |
Akim Demaille |
Subject: |
12-fyi-symbols-1.patch |
Date: |
Sat, 29 Dec 2001 15:14:13 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* src/gram.h, src/gram.c (symbols): New, similar to state_table
and rule_table.
* src/reader.c (packsymbols): Fill this table.
Drop sprec.
* src/conflicts.c (resolve_sr_conflict): Adjust.
* src/reduce.c (reduce_grammar): Adjust: just sort symbols, a
single table.
Use symbols[i]->tag instead of tags[i].
Index: src/LR0.c
--- src/LR0.c Fri, 28 Dec 2001 15:16:45 +0100 akim
+++ src/LR0.c Fri, 28 Dec 2001 16:17:46 +0100 akim
@@ -23,6 +23,7 @@
The entry point is generate_states. */
#include "system.h"
+#include "symtab.h"
#include "getargs.h"
#include "reader.h"
#include "gram.h"
Index: src/conflicts.c
--- src/conflicts.c Thu, 27 Dec 2001 10:53:35 +0100 akim
+++ src/conflicts.c Fri, 28 Dec 2001 16:17:46 +0100 akim
@@ -21,6 +21,7 @@
#include "system.h"
#include "complain.h"
#include "getargs.h"
+#include "symtab.h"
#include "files.h"
#include "gram.h"
#include "state.h"
@@ -99,17 +100,17 @@
for (i = 0; i < ntokens; i++)
if (BITISSET (LA (lookahead), i)
&& BITISSET (lookaheadset, i)
- && sprec[i])
+ && symbols[i]->prec)
{
/* Shift-reduce conflict occurs for token number i
and it has a precedence.
The precedence of shifting is that of token i. */
- if (sprec[i] < redprec)
+ if (symbols[i]->prec < redprec)
{
log_resolution (state, lookahead, i, _("reduce"));
flush_shift (state, i);
}
- else if (sprec[i] > redprec)
+ else if (symbols[i]->prec > redprec)
{
log_resolution (state, lookahead, i, _("shift"));
flush_reduce (lookahead, i);
Index: src/gram.c
--- src/gram.c Fri, 28 Dec 2001 15:05:22 +0100 akim
+++ src/gram.c Fri, 28 Dec 2001 16:17:46 +0100 akim
@@ -21,6 +21,7 @@
#include "system.h"
#include "gram.h"
+#include "symtab.h"
#include "reader.h"
/* comments for these variables are in gram.h */
@@ -37,6 +38,8 @@
rule_t *rule_table = NULL;
short *rprec = NULL;
short *rprecsym = NULL;
+
+struct bucket **symbols = NULL;
short *sprec = NULL;
short *rassoc = NULL;
short *sassoc = NULL;
Index: src/gram.h
--- src/gram.h Thu, 27 Dec 2001 15:45:59 +0100 akim
+++ src/gram.h Fri, 28 Dec 2001 16:17:46 +0100 akim
@@ -133,6 +133,9 @@
extern struct rule_s *rule_table;
+/* Table of the symbols, indexed by the symbol number. */
+extern struct bucket **symbols;
+
/* token translation table: indexed by a token number as returned by
the user's yylex routine, it yields the internal token number used
by the parser and throughout bison. */
Index: src/reader.c
--- src/reader.c Fri, 28 Dec 2001 15:32:20 +0100 akim
+++ src/reader.c Fri, 28 Dec 2001 16:17:46 +0100 akim
@@ -1556,11 +1556,10 @@
}
-/*------------------------------------------------------------------.
-| Assign symbol numbers, and write definition of token names into |
-| FDEFINES. Set up vectors TAGS and SPREC of names and precedences |
-| of symbols. |
-`------------------------------------------------------------------*/
+/*----------------------------------------------------------------.
+| Assign symbol numbers, and write definition of token names into |
+| FDEFINES. Set up vectors SYMBOL_TABLE, TAGS of symbols. |
+`----------------------------------------------------------------*/
static void
packsymbols (void)
@@ -1571,8 +1570,8 @@
tags = XCALLOC (char *, nsyms + 1);
user_toknums = XCALLOC (short, nsyms + 1);
+ symbols = XCALLOC (bucket *, nsyms);
- sprec = XCALLOC (short, nsyms);
sassoc = XCALLOC (short, nsyms);
max_user_token_number = 256;
@@ -1644,9 +1643,9 @@
max_user_token_number = bp->user_token_number;
}
+ symbols[bp->value] = bp;
tags[bp->value] = bp->tag;
user_toknums[bp->value] = bp->user_token_number;
- sprec[bp->value] = bp->prec;
sassoc[bp->value] = bp->assoc;
}
Index: src/reduce.c
--- src/reduce.c Fri, 28 Dec 2001 14:55:09 +0100 akim
+++ src/reduce.c Fri, 28 Dec 2001 16:21:25 +0100 akim
@@ -28,6 +28,7 @@
#include "system.h"
#include "getargs.h"
#include "files.h"
+#include "symtab.h"
#include "gram.h"
#include "complain.h"
#include "reduce.h"
@@ -353,26 +354,13 @@
/* Shuffle elements of tables indexed by symbol number. */
{
- short *sassoc_sorted = XMALLOC (short, nvars) - ntokens;
- short *sprec_sorted = XMALLOC (short, nvars) - ntokens;
- char **tags_sorted = XMALLOC (char *, nvars) - ntokens;
+ bucket **symbols_sorted = XMALLOC (bucket *, nvars) - ntokens;
for (i = ntokens; i < nsyms; i++)
- {
- n = nontermmap[i];
- sassoc_sorted[n] = sassoc[i];
- sprec_sorted[n] = sprec[i];
- tags_sorted[n] = tags[i];
- }
+ symbols_sorted[nontermmap[i]] = symbols[i];
for (i = ntokens; i < nsyms; i++)
- {
- sassoc[i] = sassoc_sorted[i];
- sprec[i] = sprec_sorted[i];
- tags[i] = tags_sorted[i];
- }
- free (sassoc_sorted + ntokens);
- free (sprec_sorted + ntokens);
- free (tags_sorted + ntokens);
+ symbols[i] = symbols_sorted[i];
+ free (symbols_sorted + ntokens);
}
/* Replace all symbol numbers in valid data structures. */
@@ -410,7 +398,7 @@
int i;
fprintf (out, "%s\n\n", _("Useless nonterminals:"));
for (i = 0; i < nuseless_nonterminals; ++i)
- fprintf (out, " %s\n", tags[nsyms + i]);
+ fprintf (out, " %s\n", symbols[nsyms + i]->tag);
fputs ("\n\n", out);
}
@@ -423,7 +411,7 @@
if (!b)
fprintf (out, "%s\n\n", _("Terminals which are not used:"));
b = TRUE;
- fprintf (out, " %s\n", tags[i]);
+ fprintf (out, " %s\n", symbols[i]->tag);
}
if (b)
fputs ("\n\n", out);
@@ -438,9 +426,9 @@
{
rule r;
fprintf (out, "#%-4d ", i - 1);
- fprintf (out, "%s:", tags[rule_table[i].lhs]);
+ fprintf (out, "%s:", symbols[rule_table[i].lhs]->tag);
for (r = &ritem[rule_table[i].rhs]; *r >= 0; r++)
- fprintf (out, " %s", tags[*r]);
+ fprintf (out, " %s", symbols[*r]->tag);
fputs (";\n", out);
}
fputs ("\n\n", out);
@@ -460,7 +448,9 @@
fprintf (out, "Variables\n---------\n\n");
fprintf (out, "Value Sprec Sassoc Tag\n");
for (i = ntokens; i < nsyms; i++)
- fprintf (out, "%5d %5d %5d %s\n", i, sprec[i], sassoc[i], tags[i]);
+ fprintf (out, "%5d %5d %5d %s\n",
+ i,
+ symbols[i]->prec, symbols[i]->assoc, symbols[i]->tag);
fprintf (out, "\n\n");
fprintf (out, "Rules\n-----\n\n");
fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem
range) [Num]\n");
@@ -484,9 +474,9 @@
fprintf (out, "Rules interpreted\n-----------------\n\n");
for (i = 1; i <= nrules; i++)
{
- fprintf (out, "%-5d %s :", i, tags[rule_table[i].lhs]);
+ fprintf (out, "%-5d %s :", i, symbols[rule_table[i].lhs]->tag);
for (r = &ritem[rule_table[i].rhs]; *r >= 0; r++)
- fprintf (out, " %s", tags[*r]);
+ fprintf (out, " %s", symbols[*r]->tag);
fputc ('\n', out);
}
fprintf (out, "\n\n");
@@ -551,7 +541,7 @@
if (!BITISSET (N, start_symbol - ntokens))
fatal (_("Start symbol %s does not derive any sentence"),
- tags[start_symbol]);
+ symbols[start_symbol]->tag);
reduce_grammar_tables ();
if (nuseless_nonterminals > 0)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- 12-fyi-symbols-1.patch,
Akim Demaille <=