1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
$FreeBSD$
$NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
--- gram.y.orig Thu Sep 22 13:14:31 1988
+++ gram.y Wed Sep 25 14:48:16 2002
@@ -60,8 +60,6 @@
static char *mcolors[2]; /* Color values used in menus. */
MenuLink *menu_link; /* Temporary menu link pointer. */
-char *calloc();
-
%}
%union {
@@ -117,18 +115,18 @@
case IsString:
if ($3 == C_STRING) {
strcpy(KeywordTable[$1].sptr,
- yylval.sval);
+ $<sval>2);
} else {
yyerror("illegal construct");
}
- free(yylval.sval);
+ free($<sval>2);
break;
case IsNumeric:
if ($3 == C_STRING) {
*(KeywordTable[$1].nptr) =
- y_atoi(yylval.sval);
+ y_atoi($<sval>2);
} else yyerror("illegal construct");
- free(yylval.sval);
+ free($<sval>2);
break;
case IsBoolTrue:
case IsBoolFalse:
@@ -197,12 +195,12 @@
ml_ptr = $3;
}
| STRING
- { $$ = C_STRING; }
+ { $$ = C_STRING; $<sval>0 = $1; }
;
boolvar: STRING
{
- ki = keywordlookup(yylval.sval);
+ ki = keywordlookup($1);
switch (KeywordTable[ki].type) {
case IsBoolTrue:
*(KeywordTable[ki].bptr) = TRUE;
@@ -220,7 +218,7 @@
;
keyword: STRING {
- $$ = keywordlookup(yylval.sval);
+ $$ = keywordlookup($1);
}
;
@@ -246,9 +244,9 @@
{ $$ = CheckButtonState($1); }
;
-kmask: STRING { $$ = keyexprlookup(yylval.sval); }
+kmask: STRING { $$ = keyexprlookup($1); }
-contmask: STRING { $$ = contexprlookup(yylval.sval); }
+contmask: STRING { $$ = contexprlookup($1); }
buttmodexpr: buttmodifier
{ $$ = $1; }
@@ -257,7 +255,7 @@
;
buttmodifier: STRING
- { $$ = buttexprlookup(yylval.sval); }
+ { $$ = buttexprlookup($1); }
;
menuname: STRING
@@ -304,7 +302,7 @@
menuaction: STRING
{
- ki = keywordlookup(yylval.sval);
+ ki = keywordlookup($1);
if ((ki != -1) &&
(KeywordTable[ki].type != IsFunction) &&
(KeywordTable[ki].type != IsQuitFunction) &&
@@ -350,7 +348,7 @@
}
;
-strings: STRING { $$ = yylval.sval; }
+strings: STRING { $$ = $1; }
| strings STRING
{ $$ = strconcat($1, $2); }
;
@@ -387,7 +385,7 @@
}
;
-color: STRING { $$ = yylval.sval; }
+color: STRING { $$ = $1; }
| /* empty */ { $$ = NULL; }
;
%%
@@ -503,7 +501,6 @@
strconcat(s1, s2)
char *s1, *s2;
{
- char *malloc();
char *p;
p = malloc(strlen(s1) + strlen(s2) + 2);
@@ -572,6 +569,8 @@
setbinding(ICON, index, mask, name);
if (context & WINDOW)
setbinding(WINDOW, index, mask, name);
+ if (name)
+ free(name);
}
/*
@@ -599,12 +598,13 @@
char *mname; /* Pointer to menu name, if needed. */
{
Binding *ptr;
+ extern char *stash();
ptr = AllocBinding();
ptr->context = cont;
ptr->mask = m;
ptr->func = KeywordTable[i].fptr;
- ptr->menuname = mname;
+ ptr->menuname = mname ? stash(mname) : NULL;
switch (m & (LeftMask | MiddleMask | RightMask)) {
case LeftMask:
@@ -771,9 +771,8 @@
else {
for(ptr = list; ptr->next; ptr = ptr->next) /* NULL */;
ptr->next = link;
- ptr = ptr->next;
- ptr->next = NULL;
}
+ link->next = NULL;
return(list);
}
|
