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

maint: style changes

Browse Source 
* src/scan-code.l: Remove useless braces.
Formatting changes.
Prefer NULL to 0.
* src/muscle-tab.c, src/system.h: Formatting changes.
This commit is contained in:
Akim Demaille
2012-07-25 17:57:57 +02:00
parent f9b8635172
commit 9b8585410a
4 changed files with 110 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/muscle-tab.c
View File

@@ -284,23 +284,23 @@ muscle_location_grow (char const *key, location loc)
muscle_grow (key, "]]", ""); muscle_grow (key, "]]", "");
} }
#define MUSCLE_COMMON_DECODE(Value) \ #define MUSCLE_COMMON_DECODE(Value) \
case '$': \ case '$': \
aver (*++(Value) == ']'); \ aver (*++(Value) == ']'); \
aver (*++(Value) == '['); \ aver (*++(Value) == '['); \
obstack_sgrow (&muscle_obstack, "$"); \ obstack_sgrow (&muscle_obstack, "$"); \
break; \ break; \
case '@': \ case '@': \
switch (*++(Value)) \ switch (*++(Value)) \
{ \ { \
case '@': obstack_sgrow (&muscle_obstack, "@" ); break; \ case '@': obstack_sgrow (&muscle_obstack, "@" ); break; \
case '{': obstack_sgrow (&muscle_obstack, "[" ); break; \ case '{': obstack_sgrow (&muscle_obstack, "[" ); break; \
case '}': obstack_sgrow (&muscle_obstack, "]" ); break; \ case '}': obstack_sgrow (&muscle_obstack, "]" ); break; \
default: aver (false); break; \ default: aver (false); break; \
} \ } \
break; \ break; \
default: \ default: \
obstack_1grow (&muscle_obstack, *(Value)); \ obstack_1grow (&muscle_obstack, *(Value)); \
break; break;
/* Reverse of MUSCLE_OBSTACK_SGROW. */ /* Reverse of MUSCLE_OBSTACK_SGROW. */

102
src/muscle-tab.h
View File

@@ -35,62 +35,62 @@ void muscle_free (void);
/* An obstack dedicated to receive muscle keys and values. */ /* An obstack dedicated to receive muscle keys and values. */
extern struct obstack muscle_obstack; extern struct obstack muscle_obstack;
#define MUSCLE_INSERT_BOOL(Key, Value) \ #define MUSCLE_INSERT_BOOL(Key, Value) \
do { \ do { \
int v = Value; \ int v = Value; \
MUSCLE_INSERT_INT (Key, v); \ MUSCLE_INSERT_INT (Key, v); \
} while(0) } while (0)
#define MUSCLE_INSERT_INT(Key, Value) \ #define MUSCLE_INSERT_INT(Key, Value) \
do { \ do { \
obstack_fgrow1 (&muscle_obstack, "%d", Value); \ obstack_fgrow1 (&muscle_obstack, "%d", Value); \
obstack_1grow (&muscle_obstack, 0); \ obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \
} while(0) } while (0)
#define MUSCLE_INSERT_LONG_INT(Key, Value) \ #define MUSCLE_INSERT_LONG_INT(Key, Value) \
do { \ do { \
obstack_fgrow1 (&muscle_obstack, "%ld", Value); \ obstack_fgrow1 (&muscle_obstack, "%ld", Value); \
obstack_1grow (&muscle_obstack, 0); \ obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \
} while(0) } while (0)
#define MUSCLE_INSERT_STRING_RAW(Key, Value) \ #define MUSCLE_INSERT_STRING_RAW(Key, Value) \
do { \ do { \
obstack_sgrow (&muscle_obstack, Value); \ obstack_sgrow (&muscle_obstack, Value); \
obstack_1grow (&muscle_obstack, 0); \ obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \
} while(0) } while (0)
#define MUSCLE_INSERT_STRING(Key, Value) \ #define MUSCLE_INSERT_STRING(Key, Value) \
do { \ do { \
MUSCLE_OBSTACK_SGROW (&muscle_obstack, Value); \ MUSCLE_OBSTACK_SGROW (&muscle_obstack, Value); \
obstack_1grow (&muscle_obstack, 0); \ obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \
} while(0) } while (0)
#define MUSCLE_OBSTACK_SGROW(Obstack, Value) \ #define MUSCLE_OBSTACK_SGROW(Obstack, Value) \
do { \ do { \
char const *p; \ char const *p; \
for (p = Value; *p; p++) \ for (p = Value; *p; p++) \
switch (*p) \ switch (*p) \
{ \ { \
case '$': obstack_sgrow (Obstack, "$]["); break; \ case '$': obstack_sgrow (Obstack, "$]["); break; \
case '@': obstack_sgrow (Obstack, "@@" ); break; \ case '@': obstack_sgrow (Obstack, "@@" ); break; \
case '[': obstack_sgrow (Obstack, "@{" ); break; \ case '[': obstack_sgrow (Obstack, "@{" ); break; \
case ']': obstack_sgrow (Obstack, "@}" ); break; \ case ']': obstack_sgrow (Obstack, "@}" ); break; \
default: obstack_1grow (Obstack, *p); break; \ default: obstack_1grow (Obstack, *p); break; \
} \ } \
} while(0) } while (0)
#define MUSCLE_INSERT_C_STRING(Key, Value) \ #define MUSCLE_INSERT_C_STRING(Key, Value) \
do { \ do { \
MUSCLE_OBSTACK_SGROW (&muscle_obstack, \ MUSCLE_OBSTACK_SGROW (&muscle_obstack, \
quotearg_style (c_quoting_style, \ quotearg_style (c_quoting_style, \
Value)); \ Value)); \
obstack_1grow (&muscle_obstack, 0); \ obstack_1grow (&muscle_obstack, 0); \
muscle_insert (Key, obstack_finish (&muscle_obstack)); \ muscle_insert (Key, obstack_finish (&muscle_obstack)); \
} while(0) } while (0)
/* Append VALUE to the current value of KEY. If KEY did not already /* Append VALUE to the current value of KEY. If KEY did not already
exist, create it. Use MUSCLE_OBSTACK. De-allocate the previously exist, create it. Use MUSCLE_OBSTACK. De-allocate the previously
@@ -110,7 +110,7 @@ void muscle_code_grow (const char *key, const char *value, location loc);
muscle values are output *double* quoted, one needs to strip the first level muscle values are output *double* quoted, one needs to strip the first level
of quotes to reach the list itself. */ of quotes to reach the list itself. */
void muscle_pair_list_grow (const char *muscle, void muscle_pair_list_grow (const char *muscle,
const char *a1, const char *a2); const char *a1, const char *a2);
/* In the format `[[file_name:line.column]], [[file_name:line.column]]', append /* In the format `[[file_name:line.column]], [[file_name:line.column]]', append
LOC to MUSCLE. Use digraphs for special characters in each file name. */ LOC to MUSCLE. Use digraphs for special characters in each file name. */

18
src/scan-code.l
View File

@@ -181,19 +181,17 @@ ref -?[0-9]+|{id}|"["{id}"]"|"$"
<SC_RULE_ACTION> <SC_RULE_ACTION>
{ {
"$"("<"{tag}">")?{ref} { "$"("<"{tag}">")?{ref} {
ref_tail_fields = 0; ref_tail_fields = NULL;
handle_action_dollar (self->rule, yytext, *loc); handle_action_dollar (self->rule, yytext, *loc);
if (ref_tail_fields) { if (ref_tail_fields)
obstack_sgrow (&obstack_for_string, ref_tail_fields); obstack_sgrow (&obstack_for_string, ref_tail_fields);
}
need_semicolon = true; need_semicolon = true;
} }
"@"{ref} { "@"{ref} {
ref_tail_fields = 0; ref_tail_fields = NULL;
handle_action_at (self->rule, yytext, *loc); handle_action_at (self->rule, yytext, *loc);
if (ref_tail_fields) { if (ref_tail_fields)
obstack_sgrow (&obstack_for_string, ref_tail_fields); obstack_sgrow (&obstack_for_string, ref_tail_fields);
}
need_semicolon = true; need_semicolon = true;
} }
"$" { "$" {
@@ -345,7 +343,7 @@ typedef struct
not visible from current midrule. */ not visible from current midrule. */
#define VARIANT_NOT_VISIBLE_FROM_MIDRULE (1 << 2) #define VARIANT_NOT_VISIBLE_FROM_MIDRULE (1 << 2)
static variant *variant_table = 0; static variant *variant_table = NULL;
static unsigned variant_table_size = 0; static unsigned variant_table_size = 0;
static unsigned variant_count = 0; static unsigned variant_count = 0;
@@ -367,7 +365,7 @@ static void
variant_table_free (void) variant_table_free (void)
{ {
free (variant_table); free (variant_table);
variant_table = 0; variant_table = NULL;
variant_table_size = variant_count = 0; variant_table_size = variant_count = 0;
} }
@@ -410,7 +408,7 @@ variant_add (uniqstr id, location id_loc, unsigned symbol_index,
} }
static const char * static const char *
get_at_spec(unsigned symbol_index) get_at_spec (unsigned symbol_index)
{ {
static char at_buf[20]; static char at_buf[20];
if (symbol_index == 0) if (symbol_index == 0)
@@ -826,7 +824,7 @@ handle_action_at (symbol_list *rule, char *text, location at_loc)
locations_flag = true; locations_flag = true;
n = parse_ref (cp, effective_rule, effective_rule_length, n = parse_ref (cp, effective_rule, effective_rule_length,
rule->midrule_parent_rhs_index, text, at_loc, '@'); rule->midrule_parent_rhs_index, text, at_loc, '@');
switch (n) switch (n)
{ {
case INVALID_REF: case INVALID_REF:

68
src/system.h
View File

@@ -160,36 +160,36 @@ typedef size_t uintptr_t;
# define obstack_chunk_free free # define obstack_chunk_free free
# include <obstack.h> # include <obstack.h>
# define obstack_sgrow(Obs, Str) \ # define obstack_sgrow(Obs, Str) \
obstack_grow (Obs, Str, strlen (Str)) obstack_grow (Obs, Str, strlen (Str))
# define obstack_fgrow1(Obs, Format, Arg1) \ # define obstack_fgrow1(Obs, Format, Arg1) \
do { \ do { \
char buf[4096]; \ char buf[4096]; \
sprintf (buf, Format, Arg1); \ sprintf (buf, Format, Arg1); \
obstack_grow (Obs, buf, strlen (buf)); \ obstack_grow (Obs, buf, strlen (buf)); \
} while (0) } while (0)
# define obstack_fgrow2(Obs, Format, Arg1, Arg2) \ # define obstack_fgrow2(Obs, Format, Arg1, Arg2) \
do { \ do { \
char buf[4096]; \ char buf[4096]; \
sprintf (buf, Format, Arg1, Arg2); \ sprintf (buf, Format, Arg1, Arg2); \
obstack_grow (Obs, buf, strlen (buf)); \ obstack_grow (Obs, buf, strlen (buf)); \
} while (0) } while (0)
# define obstack_fgrow3(Obs, Format, Arg1, Arg2, Arg3) \ # define obstack_fgrow3(Obs, Format, Arg1, Arg2, Arg3) \
do { \ do { \
char buf[4096]; \ char buf[4096]; \
sprintf (buf, Format, Arg1, Arg2, Arg3); \ sprintf (buf, Format, Arg1, Arg2, Arg3); \
obstack_grow (Obs, buf, strlen (buf)); \ obstack_grow (Obs, buf, strlen (buf)); \
} while (0) } while (0)
# define obstack_fgrow4(Obs, Format, Arg1, Arg2, Arg3, Arg4) \ # define obstack_fgrow4(Obs, Format, Arg1, Arg2, Arg3, Arg4) \
do { \ do { \
char buf[4096]; \ char buf[4096]; \
sprintf (buf, Format, Arg1, Arg2, Arg3, Arg4); \ sprintf (buf, Format, Arg1, Arg2, Arg3, Arg4); \
obstack_grow (Obs, buf, strlen (buf)); \ obstack_grow (Obs, buf, strlen (buf)); \
} while (0) } while (0)
@@ -215,15 +215,15 @@ do { \
| Free a linked list. | | Free a linked list. |
`---------------------*/ `---------------------*/
# define LIST_FREE(Type, List) \ # define LIST_FREE(Type, List) \
do { \ do { \
Type *_node, *_next; \ Type *_node, *_next; \
for (_node = List; _node; _node = _next) \ for (_node = List; _node; _node = _next) \
{ \ { \
_next = _node->next; \ _next = _node->next; \
free (_node); \ free (_node); \
} \ } \
} while (0) } while (0)
/*---------------------------------------------. /*---------------------------------------------.