Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-15 07:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/struniq.h, src/struniq.c (struniq_t): Is const.

Browse Source 
(STRUNIQ_EQ, struniq_assert, struniq_assert_p): New.
Use struniq for symbols.
* src/symtab.h (symbol_t): The tag member is a struniq.
(symbol_type_set): Adjust.
* src/symtab.c (symbol_new): Takes a struniq.
(symbol_free): Don't free the tag member.
(hash_compare_symbol_t, hash_symbol_t): Rename as...
(hash_compare_symbol, hash_symbol): these.
Use the fact that tags as struniqs.
(symbol_get): Use struniq_new.
* src/symlist.h, src/symlist.c (symbol_list_n_type_name_get):
Returns a strniq.
* src/reader.h (merger_list, grammar_currentmerge_set): The name
and type members are struniqs.
* src/reader.c (get_merge_function)
(grammar_current_rule_merge_set): Adjust.
(TYPE, current_type): Are struniq.
Use struniq for file names.
* src/files.h, src/files.c (infile): Split into...
(grammar_file, current_file): these.
* src/scan-gram.c (YY_USER_INIT, handle_syncline): Adjust.
* src/reduce.c (reduce_print): Likewise.
* src/getargs.c (getargs): Likewise.
* src/complain.h, src/complain.c: Likewise.
* src/main.c (main): Call struniqs_new early enough to use it for
file names.
Don't free the input file name.
This commit is contained in:
Akim Demaille
2002-11-12 08:05:59 +00:00
parent 3e6656f9ab
commit 95612cfa60
21 changed files with 214 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/struniq.c
View File

@@ -20,6 +20,7 @@
#include "system.h"
#include "quotearg.h"
#include "error.h"
#include "hash.h"
#include "struniq.h"
@@ -39,20 +40,36 @@ static struct hash_table *struniqs_table = NULL;
const struniq_t
struniq_new (const char *s)
{
/* Keep the struniqs in a printable form. */
struniq_t res = hash_lookup (struniqs_table,
quotearg_style (escape_quoting_style, s));
struniq_t res = hash_lookup (struniqs_table, s);
if (!res)
{
/* First insertion in the hash. */
res = xstrdup (quotearg_style (escape_quoting_style, s));
res = xstrdup (s);
hash_insert (struniqs_table, res);
}
return res;
}
/*---------------------------------.
| Return TRUE iff S is a struniq. |
`---------------------------------*/
bool
struniq_assert_p (const char *s)
{
if (!hash_lookup (struniqs_table, s))
{
error (0, 0, "not a struniq: %s", quotearg (s));
return false;
}
else
{
return true;
}
}
/*--------------------.
| Print the struniq. |
`--------------------*/