]>
Commit | Line | Data |
---|---|---|
46b413cc | 1 | --- rdist-6.1.5/src/gram.y.bison 1998-11-10 05:10:42.000000000 +0100 |
2 | +++ rdist-6.1.5/src/gram.y 2003-06-04 16:02:19.000000000 +0200 | |
3 | @@ -90,10 +90,10 @@ | |
4 | struct namelist *namel; | |
5 | } | |
6 | ||
7 | -%type <optval> OPTION, options | |
8 | -%type <string> NAME, STRING | |
9 | -%type <subcmd> INSTALL, NOTIFY, EXCEPT, PATTERN, SPECIAL, CMDSPECIAL, cmdlist, cmd | |
10 | -%type <namel> namelist, names, opt_namelist nlist | |
11 | +%type <optval> OPTION options | |
12 | +%type <string> NAME STRING | |
13 | +%type <subcmd> INSTALL NOTIFY EXCEPT PATTERN SPECIAL CMDSPECIAL cmdlist cmd | |
14 | +%type <namel> namelist names opt_namelist nlist | |
15 | ||
16 | %% | |
17 | ||
18 | @@ -101,19 +101,19 @@ | |
19 | | file command | |
20 | ; | |
21 | ||
22 | -command: NAME '=' namelist = { | |
23 | +command: NAME '=' namelist { | |
24 | (void) lookup($1, INSERT, $3); | |
25 | } | |
26 | - | namelist ARROW namelist cmdlist = { | |
27 | + | namelist ARROW namelist cmdlist { | |
28 | insert((char *)NULL, $1, $3, $4); | |
29 | } | |
30 | - | NAME COLON namelist ARROW namelist cmdlist = { | |
31 | + | NAME COLON namelist ARROW namelist cmdlist { | |
32 | insert($1, $3, $5, $6); | |
33 | } | |
34 | - | namelist DCOLON NAME cmdlist = { | |
35 | + | namelist DCOLON NAME cmdlist { | |
36 | append((char *)NULL, $1, $3, $4); | |
37 | } | |
38 | - | NAME COLON namelist DCOLON NAME cmdlist = { | |
39 | + | NAME COLON namelist DCOLON NAME cmdlist { | |
40 | append($1, $3, $5, $6); | |
41 | } | |
42 | | error | |
43 | @@ -133,10 +133,10 @@ | |
44 | } | |
45 | ; | |
46 | ||
47 | -nlist: NAME = { | |
48 | +nlist: NAME { | |
49 | $$ = makenl($1); | |
50 | } | |
51 | - | '(' names ')' = { | |
52 | + | '(' names ')' { | |
53 | $$ = $2; | |
54 | } | |
55 | ; | |
56 | @@ -144,7 +144,7 @@ | |
57 | names: /* VOID */ { | |
58 | $$ = last_n = NULL; | |
59 | } | |
60 | - | names NAME = { | |
61 | + | names NAME { | |
62 | if (last_n == NULL) | |
63 | $$ = last_n = makenl($2); | |
64 | else { | |
65 | @@ -158,7 +158,7 @@ | |
66 | cmdlist: /* VOID */ { | |
67 | $$ = last_sc = NULL; | |
68 | } | |
69 | - | cmdlist cmd = { | |
70 | + | cmdlist cmd { | |
71 | if (last_sc == NULL) | |
72 | $$ = last_sc = $2; | |
73 | else { | |
74 | @@ -169,7 +169,7 @@ | |
75 | } | |
76 | ; | |
77 | ||
78 | -cmd: INSTALL options opt_namelist ';' = { | |
79 | +cmd: INSTALL options opt_namelist ';' { | |
80 | register struct namelist *nl; | |
81 | ||
82 | $1->sc_options = $2 | options; | |
83 | @@ -185,17 +185,17 @@ | |
84 | } | |
85 | $$ = $1; | |
86 | } | |
87 | - | NOTIFY namelist ';' = { | |
88 | + | NOTIFY namelist ';' { | |
89 | if ($2 != NULL) | |
90 | $1->sc_args = expand($2, E_VARS); | |
91 | $$ = $1; | |
92 | } | |
93 | - | EXCEPT namelist ';' = { | |
94 | + | EXCEPT namelist ';' { | |
95 | if ($2 != NULL) | |
96 | $1->sc_args = expand($2, E_ALL); | |
97 | $$ = $1; | |
98 | } | |
99 | - | PATTERN namelist ';' = { | |
100 | + | PATTERN namelist ';' { | |
101 | struct namelist *nl; | |
102 | char *cp, *re_comp(); | |
103 | ||
104 | @@ -205,13 +205,13 @@ | |
105 | $1->sc_args = expand($2, E_VARS); | |
106 | $$ = $1; | |
107 | } | |
108 | - | SPECIAL opt_namelist STRING ';' = { | |
109 | + | SPECIAL opt_namelist STRING ';' { | |
110 | if ($2 != NULL) | |
111 | $1->sc_args = expand($2, E_ALL); | |
112 | $1->sc_name = $3; | |
113 | $$ = $1; | |
114 | } | |
115 | - | CMDSPECIAL opt_namelist STRING ';' = { | |
116 | + | CMDSPECIAL opt_namelist STRING ';' { | |
117 | if ($2 != NULL) | |
118 | $1->sc_args = expand($2, E_ALL); | |
119 | $1->sc_name = $3; | |
120 | @@ -219,18 +219,18 @@ | |
121 | } | |
122 | ; | |
123 | ||
124 | -options: /* VOID */ = { | |
125 | +options: /* VOID */ { | |
126 | $$ = 0; | |
127 | } | |
128 | - | options OPTION = { | |
129 | + | options OPTION { | |
130 | $$ |= $2; | |
131 | } | |
132 | ; | |
133 | ||
134 | -opt_namelist: /* VOID */ = { | |
135 | +opt_namelist: /* VOID */ { | |
136 | $$ = NULL; | |
137 | } | |
138 | - | namelist = { | |
139 | + | namelist { | |
140 | $$ = $1; | |
141 | } | |
142 | ; |