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

* data/glr.c: Reformat whitespace with tabs.

Browse Source 
(b4_lpure_formals): Remove this unused m4 macro.
* tests/cxx-type.at: Reformat whitespace with tabs.
(_AT_TEST_GLR_CXXTYPES): In union Node, rename node_info to nodeInfo
since it's a member.  Rename type to isNterm for clarity.
This commit is contained in:
Akim Demaille
2006-01-02 15:28:03 +00:00
parent c4d497a010
commit 9ecafbbfe7
3 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2006-01-02 Joel E. Denny <jdenny@ces.clemson.edu>
* data/glr.c: Reformat whitespace with tabs.
(b4_lpure_formals): Remove this unused m4 macro.
* tests/cxx-type.at: Reformat whitespace with tabs.
(_AT_TEST_GLR_CXXTYPES): In union Node, rename node_info to nodeInfo
since it's a member. Rename type to isNterm for clarity.
2005-12-29 Akim <akim@sulaco.local> 2005-12-29 Akim <akim@sulaco.local>
Let glr.cc catch up with symbol_value_print. Let glr.cc catch up with symbol_value_print.

11
data/glr.c
View File

@@ -92,13 +92,6 @@ m4_define([b4_pure_formals],
[b4_pure_if([b4_location_if([, YYLTYPE *yylocp])])[]b4_user_formals]) [b4_pure_if([b4_location_if([, YYLTYPE *yylocp])])[]b4_user_formals])
# b4_lpure_formals
# ----------------
# Same as above, but on the look-ahead, hence yyllocp instead of yylocp.
m4_define([b4_lpure_formals],
[b4_pure_if([b4_location_if([YYLTYPE *yyllocp])])[]b4_user_formals])
## ----------------- ## ## ----------------- ##
## Semantic Values. ## ## Semantic Values. ##
## ----------------- ## ## ----------------- ##
@@ -584,8 +577,8 @@ do { \
if (yydebug) \ if (yydebug) \
{ \ { \
YYFPRINTF (stderr, "%s ", Title); \ YYFPRINTF (stderr, "%s ", Title); \
yy_symbol_print (stderr, \ yy_symbol_print (stderr, Type, \
Type, Value]b4_location_if([, Location])[]b4_user_args[); \ Value]b4_location_if([, Location])[]b4_user_args[); \
YYFPRINTF (stderr, "\n"); \ YYFPRINTF (stderr, "\n"); \
} \ } \
} while (YYID (0)) } while (YYID (0))

26
tests/cxx-type.at
View File

@@ -36,17 +36,17 @@ $1
#include <stdio.h> #include <stdio.h>
union Node { union Node {
struct { struct {
int type; int isNterm;
int parents; int parents;
} node_info; } nodeInfo;
struct { struct {
int type; /* 1 */ int isNterm; /* 1 */
int parents; int parents;
char const *form; char const *form;
union Node *children[3]; union Node *children[3];
} nterm; } nterm;
struct { struct {
int type; /* 0 */ int isNterm; /* 0 */
int parents; int parents;
char *text; char *text;
} term; } term;
@@ -232,18 +232,18 @@ static Node *
new_nterm (char const *form, Node *child0, Node *child1, Node *child2) new_nterm (char const *form, Node *child0, Node *child1, Node *child2)
{ {
Node *node = (Node *) malloc (sizeof (Node)); Node *node = (Node *) malloc (sizeof (Node));
node->nterm.type = 1; node->nterm.isNterm = 1;
node->nterm.parents = 0; node->nterm.parents = 0;
node->nterm.form = form; node->nterm.form = form;
node->nterm.children[0] = child0; node->nterm.children[0] = child0;
if (child0) if (child0)
child0->node_info.parents += 1; child0->nodeInfo.parents += 1;
node->nterm.children[1] = child1; node->nterm.children[1] = child1;
if (child1) if (child1)
child1->node_info.parents += 1; child1->nodeInfo.parents += 1;
node->nterm.children[2] = child2; node->nterm.children[2] = child2;
if (child2) if (child2)
child2->node_info.parents += 1; child2->nodeInfo.parents += 1;
return node; return node;
} }
@@ -251,7 +251,7 @@ static Node *
new_term (char *text) new_term (char *text)
{ {
Node *node = (Node *) malloc (sizeof (Node)); Node *node = (Node *) malloc (sizeof (Node));
node->term.type = 0; node->term.isNterm = 0;
node->term.parents = 0; node->term.parents = 0;
node->term.text = text; node->term.text = text;
return node; return node;
@@ -262,11 +262,11 @@ free_node (Node *node)
{ {
if (!node) if (!node)
return; return;
node->node_info.parents -= 1; node->nodeInfo.parents -= 1;
/* Free only if 0 (last parent) or -1 (no parents). */ /* Free only if 0 (last parent) or -1 (no parents). */
if (node->node_info.parents > 0) if (node->nodeInfo.parents > 0)
return; return;
if (node->node_info.type == 1) if (node->nodeInfo.isNterm == 1)
{ {
free_node (node->nterm.children[0]); free_node (node->nterm.children[0]);
free_node (node->nterm.children[1]); free_node (node->nterm.children[1]);
@@ -289,7 +289,7 @@ node_to_string (Node *node)
buffer = (char *) malloc (1); buffer = (char *) malloc (1);
buffer[0] = 0; buffer[0] = 0;
} }
else if (node->node_info.type == 1) else if (node->nodeInfo.isNterm == 1)
{ {
child0 = node_to_string (node->nterm.children[0]); child0 = node_to_string (node->nterm.children[0]);
child1 = node_to_string (node->nterm.children[1]); child1 = node_to_string (node->nterm.children[1]);