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

* src/main.c (main): Standardize.

Browse Source 
* src/output.c (output_table_data, output_parser): Likewise.
* src/macrotab.h, src/macrotab.c, src/bison.simple: Likewise.
This commit is contained in:
Pascal Bart
2001-08-31 16:56:44 +00:00
parent 63c2d5de0f
commit e8cb70b957
6 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2001-08-31 Pascal Bart <pascal.bart@epita.fr>
* src/main.c (main): Standardize.
* src/output.c (output_table_data, output_parser): Likewise.
* src/macrotab.h, src/macrotab.c, src/bison.simple: Likewise.
2001-08-31 Pascal Bart <pascal.bart@epita.fr>, Marc Autret <autret_m@epita.fr>
* src/reader.c (read_additionnal_code): Rename %%user_code to

20
src/bison.simple
View File

@@ -160,8 +160,8 @@ static const short yyrline[] =
#endif
#if YYDEBUG || YYERROR_VERBOSE
/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
static const char* const yytname[] =
/* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
static const char *const yytname[] =
{
%%tname
};
@@ -617,12 +617,12 @@ yybackup:
%%yychar = YYLEX;
}
/* Convert token to internal form (in yychar1) for indexing tables with */
/* Convert token to internal form (in yychar1) for indexing tables with. */
if (%%yychar <= 0) /* This means end of input. */
{
yychar1 = 0;
%%yychar = YYEOF; /* Don't call YYLEX any more */
%%yychar = YYEOF; /* Don't call YYLEX any more. */
YYDPRINTF ((stderr, "Now at end of input.\n"));
}
@@ -845,16 +845,16 @@ yyerrlab:
goto yyerrlab1;
/*--------------------------------------------------.
| yyerrlab1 -- error raised explicitly by an action |
`--------------------------------------------------*/
/*----------------------------------------------------.
| yyerrlab1 -- error raised explicitly by an action. |
`----------------------------------------------------*/
yyerrlab1:
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse lookahead token after an
error, discard it. */
/* return failure if at end of input */
/* Return failure if at end of input. */
if (%%yychar == YYEOF)
YYABORT;
YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
@@ -865,7 +865,7 @@ yyerrlab1:
/* Else will try to reuse lookahead token after shifting the error
token. */
yyerrstatus = 3; /* Each real token shifted decrements this */
yyerrstatus = 3; /* Each real token shifted decrements this. */
goto yyerrhandle;
@@ -888,7 +888,7 @@ yyerrdefault:
/*---------------------------------------------------------------.
| yyerrpop -- pop the current state because it cannot handle the |
| error token |
| error token. |
`---------------------------------------------------------------*/
yyerrpop:
if (yyssp == yyss)

16
src/macrotab.c
View File

@@ -29,21 +29,21 @@
struct hash_table macro_table;
static unsigned long
mhash1 (const void* item)
mhash1 (const void *item)
{
return_STRING_HASH_1 (((macro_entry_t*) item)->key);
return_STRING_HASH_1 (((macro_entry_t *) item)->key);
}
static unsigned long
mhash2 (const void* item)
mhash2 (const void *item)
{
return_STRING_HASH_2 (((macro_entry_t*) item)->key);
return_STRING_HASH_2 (((macro_entry_t *) item)->key);
}
static int
mcmp (const void* x, const void* y)
mcmp (const void *x, const void *y)
{
return strcmp (((macro_entry_t*) x)->key, ((macro_entry_t*) y)->key);
return strcmp (((macro_entry_t*) x)->key, ((macro_entry_t *) y)->key);
}
void
@@ -113,7 +113,7 @@ macro_init (void)
void
macro_insert (const char *key, const char *value)
{
macro_entry_t* pair = XMALLOC (macro_entry_t, 1);
macro_entry_t *pair = XMALLOC (macro_entry_t, 1);
pair->key = key;
pair->value = value;
hash_insert (&macro_table, pair);
@@ -123,6 +123,6 @@ const char*
macro_find (const char *key)
{
macro_entry_t pair = { key, 0 };
macro_entry_t* result = hash_find_item (&macro_table, &pair);
macro_entry_t *result = hash_find_item (&macro_table, &pair);
return result ? result->value : 0;
}

6
src/macrotab.h
View File

@@ -25,12 +25,12 @@
typedef struct macro_entry_s
{
const char* key;
const char* value;
const char *key;
const char *value;
} macro_entry_t;
void macro_init PARAMS ((void));
void macro_insert PARAMS ((const char *key, const char *value));
const char* macro_find PARAMS ((const char *key));
const char *macro_find PARAMS ((const char *key));
#endif /* not MACROTAB_H_ */

8
src/output.c
View File

@@ -129,8 +129,8 @@ struct obstack output_obstack;
/* FIXME. */
static inline void
output_table_data (struct obstack* oout,
short* table_data,
output_table_data (struct obstack *oout,
short *table_data,
short first,
short begin,
short end)
@@ -984,8 +984,8 @@ output_parser (void)
else if ((c = getc (fskel)) == '%')
{
/* Read the macro. */
const char* macro_key = 0;
const char* macro_value = 0;
const char *macro_key = 0;
const char *macro_value = 0;
while (isalnum (c = getc (fskel)) || c == '_')
obstack_1grow (&macro_obstack, c);
obstack_1grow (&macro_obstack, 0);