annotate macro.c @ 28:8a955e3dda2c posted-20101220

two more tests, more fixes
author David A. Holland
date Mon, 20 Dec 2010 05:42:15 -0500
parents 01c3a2088ab4
children 76c114899f63
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1 #include <stdlib.h>
76da41da923f added macro table
David A. Holland
parents:
diff changeset
2 #include <string.h>
76da41da923f added macro table
David A. Holland
parents:
diff changeset
3
76da41da923f added macro table
David A. Holland
parents:
diff changeset
4 #include "array.h"
76da41da923f added macro table
David A. Holland
parents:
diff changeset
5 #include "mode.h"
76da41da923f added macro table
David A. Holland
parents:
diff changeset
6 #include "place.h"
76da41da923f added macro table
David A. Holland
parents:
diff changeset
7 #include "macro.h"
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
8 #include "output.h"
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
9
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
10 struct expansionitem {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
11 bool isstring;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
12 union {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
13 char *string;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
14 unsigned param;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
15 };
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
16 };
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
17 DECLARRAY(expansionitem);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
18 DEFARRAY(expansionitem, );
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
19
76da41da923f added macro table
David A. Holland
parents:
diff changeset
20 struct macro {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
21 struct place defplace;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
22 struct place expansionplace;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
23 unsigned hash;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
24 char *name;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
25 bool hasparams;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
26 struct stringarray params;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
27 struct expansionitemarray expansion;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
28 bool inuse;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
29 };
76da41da923f added macro table
David A. Holland
parents:
diff changeset
30 DECLARRAY(macro);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
31 DEFARRAY(macro, );
76da41da923f added macro table
David A. Holland
parents:
diff changeset
32 DECLARRAY(macroarray);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
33 DEFARRAY(macroarray, );
76da41da923f added macro table
David A. Holland
parents:
diff changeset
34
76da41da923f added macro table
David A. Holland
parents:
diff changeset
35 static struct macroarrayarray macros;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
36 static unsigned total_macros;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
37 static unsigned hashmask;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
38
76da41da923f added macro table
David A. Holland
parents:
diff changeset
39 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
40 // macro structure ops
76da41da923f added macro table
David A. Holland
parents:
diff changeset
41
76da41da923f added macro table
David A. Holland
parents:
diff changeset
42 static
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
43 struct expansionitem *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
44 expansionitem_create_string(const char *string)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
45 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
46 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
47
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
48 ei = domalloc(sizeof(*ei));
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
49 ei->isstring = true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
50 ei->string = dostrdup(string);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
51 return ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
52 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
53
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
54 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
55 struct expansionitem *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
56 expansionitem_create_stringlen(const char *string, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
57 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
58 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
59
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
60 ei = domalloc(sizeof(*ei));
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
61 ei->isstring = true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
62 ei->string = dostrndup(string, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
63 return ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
64 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
65
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
66 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
67 struct expansionitem *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
68 expansionitem_create_param(unsigned param)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
69 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
70 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
71
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
72 ei = domalloc(sizeof(*ei));
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
73 ei->isstring = false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
74 ei->param = param;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
75 return ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
76 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
77
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
78 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
79 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
80 expansionitem_destroy(struct expansionitem *ei)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
81 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
82 if (ei->isstring) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
83 free(ei->string);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
84 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
85 free(ei);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
86 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
87
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
88 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
89 bool
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
90 expansionitem_eq(const struct expansionitem *ei1,
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
91 const struct expansionitem *ei2)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
92 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
93 if (ei1->isstring != ei2->isstring) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
94 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
95 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
96 if (ei1->isstring) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
97 if (strcmp(ei1->string, ei2->string) != 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
98 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
99 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
100 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
101 if (ei1->param != ei2->param) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
102 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
103 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
104 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
105 return true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
106 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
107
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
108 static
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
109 struct macro *
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
110 macro_create(struct place *p1, const char *name, unsigned hash,
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
111 struct place *p2)
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
112 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
113 struct macro *m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
114
76da41da923f added macro table
David A. Holland
parents:
diff changeset
115 m = domalloc(sizeof(*m));
76da41da923f added macro table
David A. Holland
parents:
diff changeset
116 m->defplace = *p1;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
117 m->expansionplace = *p2;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
118 m->hash = hash;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
119 m->name = dostrdup(name);
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
120 m->hasparams = false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
121 stringarray_init(&m->params);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
122 expansionitemarray_init(&m->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
123 m->inuse = false;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
124 return m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
125 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
126
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
127 DESTROYALL_ARRAY(expansionitem, );
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
128
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
129 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
130 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
131 macro_destroy(struct macro *m)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
132 {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
133 expansionitemarray_destroyall(&m->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
134 expansionitemarray_cleanup(&m->expansion);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
135 free(m->name);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
136 free(m);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
137 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
138
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
139 static
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
140 bool
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
141 macro_eq(const struct macro *m1, const struct macro *m2)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
142 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
143 unsigned num1, num2, i;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
144 struct expansionitem *ei1, *ei2;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
145 const char *p1, *p2;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
146
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
147 if (strcmp(m1->name, m2->name) != 0) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
148 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
149 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
150
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
151 if (m1->hasparams != m2->hasparams) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
152 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
153 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
154
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
155 num1 = expansionitemarray_num(&m1->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
156 num2 = expansionitemarray_num(&m2->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
157 if (num1 != num2) {
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
158 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
159 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
160
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
161 for (i=0; i<num1; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
162 ei1 = expansionitemarray_get(&m1->expansion, i);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
163 ei2 = expansionitemarray_get(&m2->expansion, i);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
164 if (!expansionitem_eq(ei1, ei2)) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
165 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
166 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
167 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
168
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
169 num1 = stringarray_num(&m1->params);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
170 num2 = stringarray_num(&m2->params);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
171 if (num1 != num2) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
172 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
173 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
174
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
175 for (i=0; i<num1; i++) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
176 p1 = stringarray_get(&m1->params, i);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
177 p2 = stringarray_get(&m2->params, i);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
178 if (strcmp(p1, p2) != 0) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
179 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
180 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
181 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
182 return true;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
183 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
184
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
185 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
186 // macro table
76da41da923f added macro table
David A. Holland
parents:
diff changeset
187
76da41da923f added macro table
David A. Holland
parents:
diff changeset
188 /*
76da41da923f added macro table
David A. Holland
parents:
diff changeset
189 * Unless I've screwed up, this is something called Fletcher's Checksum
76da41da923f added macro table
David A. Holland
parents:
diff changeset
190 * that showed up in Dr. Dobbs in, according to my notes, May 1992. The
76da41da923f added macro table
David A. Holland
parents:
diff changeset
191 * implementation is new.
76da41da923f added macro table
David A. Holland
parents:
diff changeset
192 */
76da41da923f added macro table
David A. Holland
parents:
diff changeset
193 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
194 unsigned
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
195 hashfunc(const char *s, size_t len)
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
196 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
197 uint16_t x1, x2, a;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
198 size_t i;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
199
76da41da923f added macro table
David A. Holland
parents:
diff changeset
200 x1 = (uint16_t) (len >> 16);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
201 x2 = (uint16_t) (len);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
202 if (x1==0) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
203 x1++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
204 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
205 if (x2==0) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
206 x2++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
207 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
208
76da41da923f added macro table
David A. Holland
parents:
diff changeset
209 for (i=0; i<len; i+=2) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
210 if (i==len-1) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
211 a = (unsigned char)s[i];
76da41da923f added macro table
David A. Holland
parents:
diff changeset
212 /* don't run off the end of the array */
76da41da923f added macro table
David A. Holland
parents:
diff changeset
213 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
214 else {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
215 a = (unsigned char)s[i] +
76da41da923f added macro table
David A. Holland
parents:
diff changeset
216 ((uint16_t)(unsigned char)s[i+1] << 8);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
217 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
218 x1 += a;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
219 if (x1 < a) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
220 x1++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
221 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
222 x2 += x1;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
223 if (x2 < x1) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
224 x2++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
225 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
226 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
227
76da41da923f added macro table
David A. Holland
parents:
diff changeset
228 x1 ^= 0xffff;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
229 x2 ^= 0xffff;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
230 return ((uint32_t)x2)*65535U + x1;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
231 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
232
76da41da923f added macro table
David A. Holland
parents:
diff changeset
233 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
234 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
235 macrotable_init(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
236 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
237 unsigned i;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
238
76da41da923f added macro table
David A. Holland
parents:
diff changeset
239 macroarrayarray_init(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
240 macroarrayarray_setsize(&macros, 4);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
241 for (i=0; i<4; i++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
242 macroarrayarray_set(&macros, i, NULL);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
243 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
244 total_macros = 0;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
245 hashmask = 0x3;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
246 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
247
76da41da923f added macro table
David A. Holland
parents:
diff changeset
248 DESTROYALL_ARRAY(macro, );
76da41da923f added macro table
David A. Holland
parents:
diff changeset
249
76da41da923f added macro table
David A. Holland
parents:
diff changeset
250 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
251 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
252 macrotable_cleanup(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
253 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
254 struct macroarray *bucket;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
255 unsigned numbuckets, i;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
256
76da41da923f added macro table
David A. Holland
parents:
diff changeset
257 numbuckets = macroarrayarray_num(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
258 for (i=0; i<numbuckets; i++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
259 bucket = macroarrayarray_get(&macros, i);
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
260 if (bucket != NULL) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
261 macroarray_destroyall(bucket);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
262 macroarray_destroy(bucket);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
263 }
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
264 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
265 macroarrayarray_setsize(&macros, 0);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
266 macroarrayarray_cleanup(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
267 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
268
76da41da923f added macro table
David A. Holland
parents:
diff changeset
269 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
270 struct macro *
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
271 macrotable_findlen(const char *name, size_t len, bool remove)
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
272 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
273 unsigned hash;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
274 struct macroarray *bucket;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
275 struct macro *m, *m2;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
276 unsigned i, num;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
277 size_t mlen;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
278
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
279 hash = hashfunc(name, len);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
280 bucket = macroarrayarray_get(&macros, hash & hashmask);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
281 if (bucket == NULL) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
282 return NULL;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
283 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
284 num = macroarray_num(bucket);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
285 for (i=0; i<num; i++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
286 m = macroarray_get(bucket, i);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
287 if (hash != m->hash) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
288 continue;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
289 }
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
290 mlen = strlen(m->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
291 if (len == mlen && !memcmp(name, m->name, len)) {
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
292 if (remove) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
293 if (i < num-1) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
294 m2 = macroarray_get(bucket, num-1);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
295 macroarray_set(bucket, i, m2);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
296 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
297 macroarray_setsize(bucket, num-1);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
298 total_macros--;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
299 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
300 return m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
301 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
302 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
303 return NULL;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
304 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
305
76da41da923f added macro table
David A. Holland
parents:
diff changeset
306 static
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
307 struct macro *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
308 macrotable_find(const char *name, bool remove)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
309 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
310 return macrotable_findlen(name, strlen(name), remove);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
311 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
312
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
313 static
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
314 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
315 macrotable_rehash(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
316 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
317 struct macroarray *newbucket, *oldbucket;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
318 struct macro *m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
319 unsigned newmask, tossbit;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
320 unsigned numbuckets, i;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
321 unsigned oldnum, j, k;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
322
76da41da923f added macro table
David A. Holland
parents:
diff changeset
323 numbuckets = macroarrayarray_num(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
324 macroarrayarray_setsize(&macros, numbuckets*2);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
325
76da41da923f added macro table
David A. Holland
parents:
diff changeset
326 assert(hashmask == numbuckets - 1);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
327 newmask = (hashmask << 1) | 1U;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
328 tossbit = newmask && ~hashmask;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
329 hashmask = newmask;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
330
76da41da923f added macro table
David A. Holland
parents:
diff changeset
331 for (i=0; i<numbuckets; i++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
332 newbucket = NULL;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
333 oldbucket = macroarrayarray_get(&macros, i);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
334 oldnum = macroarray_num(oldbucket);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
335 for (j=0; j<oldnum; j++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
336 m = macroarray_get(oldbucket, j);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
337 if (m->hash & tossbit) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
338 if (newbucket == NULL) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
339 newbucket = macroarray_create();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
340 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
341 macroarray_set(oldbucket, j, NULL);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
342 macroarray_add(newbucket, m, NULL);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
343 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
344 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
345 for (j=k=0; j<oldnum; j++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
346 m = macroarray_get(oldbucket, j);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
347 if (m != NULL && k < j) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
348 macroarray_set(oldbucket, k++, m);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
349 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
350 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
351 macroarray_setsize(oldbucket, k);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
352 macroarrayarray_set(&macros, numbuckets + i, newbucket);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
353 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
354 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
355
76da41da923f added macro table
David A. Holland
parents:
diff changeset
356 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
357 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
358 macrotable_add(struct macro *m)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
359 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
360 unsigned hash;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
361 struct macroarray *bucket;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
362 unsigned numbuckets;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
363
76da41da923f added macro table
David A. Holland
parents:
diff changeset
364 numbuckets = macroarrayarray_num(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
365 if (total_macros > 0 && total_macros / numbuckets > 9) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
366 macrotable_rehash();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
367 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
368
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
369 hash = hashfunc(m->name, strlen(m->name));
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
370 bucket = macroarrayarray_get(&macros, hash & hashmask);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
371 if (bucket == NULL) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
372 bucket = macroarray_create();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
373 macroarrayarray_set(&macros, hash & hashmask, bucket);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
374 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
375 macroarray_add(bucket, m, NULL);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
376 total_macros++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
377 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
378
76da41da923f added macro table
David A. Holland
parents:
diff changeset
379 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
380 // external macro definition interface
76da41da923f added macro table
David A. Holland
parents:
diff changeset
381
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
382 static
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
383 struct macro *
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
384 macro_define_common_start(struct place *p1, const char *macro,
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
385 struct place *p2)
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
386 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
387 struct macro *m;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
388 unsigned hash;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
389
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
390 if (!is_identifier(macro)) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
391 complain(p1, "Invalid macro name %s", macro);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
392 complain_fail();
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
393 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
394
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
395 hash = hashfunc(macro, strlen(macro));
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
396 m = macro_create(p1, macro, hash, p2);
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
397 return m;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
398 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
399
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
400 static
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
401 void
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
402 macro_define_common_end(struct macro *m)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
403 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
404 struct macro *oldm;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
405 bool ok;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
406
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
407 oldm = macrotable_find(m->name, false);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
408 if (oldm != NULL) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
409 ok = macro_eq(m, oldm);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
410 if (ok) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
411 complain(&m->defplace,
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
412 "Warning: redefinition of %s", m->name);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
413 if (mode.werror) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
414 complain_fail();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
415 }
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
416 } else {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
417 complain(&m->defplace,
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
418 "Redefinition of %s is not identical",
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
419 m->name);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
420 complain_fail();
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
421 }
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
422 complain(&oldm->defplace, "Previous definition was here");
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
423 macro_destroy(m);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
424 return;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
425 }
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
426 macrotable_add(m);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
427 }
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
428
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
429 static
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
430 void
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
431 macro_parse_parameters(struct macro *m, struct place *p, const char *params)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
432 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
433 size_t len;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
434 const char *s;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
435 char *param;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
436
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
437 while (params != NULL) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
438 len = strspn(params, ws);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
439 params += len;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
440 p->column += len;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
441 s = strchr(params, ',');
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
442 if (s) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
443 len = s-params;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
444 param = dostrndup(params, len);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
445 s++;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
446 } else {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
447 len = strlen(params);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
448 param = dostrndup(params, len);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
449 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
450 notrailingws(param, strlen(param));
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
451 if (!is_identifier(param)) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
452 complain(p, "Invalid macro parameter name %s", param);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
453 complain_fail();
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
454 } else {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
455 stringarray_add(&m->params, param, NULL);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
456 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
457 params = s;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
458 p->column += len;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
459 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
460 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
461
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
462 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
463 bool
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
464 isparam(struct macro *m, const char *name, size_t len, unsigned *num_ret)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
465 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
466 unsigned num, i;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
467 const char *param;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
468
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
469 num = stringarray_num(&m->params);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
470 for (i=0; i<num; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
471 param = stringarray_get(&m->params, i);
27
01c3a2088ab4 fix some more bugs
David A. Holland
parents: 25
diff changeset
472 if (strlen(param) == len && !memcmp(name, param, len)) {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
473 *num_ret = i;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
474 return true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
475 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
476 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
477 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
478 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
479
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
480 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
481 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
482 macro_parse_expansion(struct macro *m, const char *buf)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
483 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
484 size_t blockstart, wordstart, pos;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
485 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
486 unsigned param;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
487
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
488 pos = blockstart = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
489 while (buf[pos] != '\0') {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
490 pos += strspn(buf+pos, ws);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
491 if (strchr(alnum, buf[pos])) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
492 wordstart = pos;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
493 pos += strspn(buf+pos, alnum);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
494 if (isparam(m, buf+wordstart, pos-wordstart, &param)) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
495 if (pos > blockstart) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
496 ei = expansionitem_create_stringlen(
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
497 buf + blockstart,
27
01c3a2088ab4 fix some more bugs
David A. Holland
parents: 25
diff changeset
498 wordstart - blockstart);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
499 expansionitemarray_add(&m->expansion,
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
500 ei, NULL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
501 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
502 ei = expansionitem_create_param(param);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
503 expansionitemarray_add(&m->expansion, ei,NULL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
504 blockstart = pos;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
505 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
506 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
507 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
508 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
509 pos++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
510 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
511 if (pos > blockstart) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
512 ei = expansionitem_create_stringlen(buf + blockstart,
25
18681e5ae6e4 fix some more bugs
David A. Holland
parents: 21
diff changeset
513 pos - blockstart);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
514 expansionitemarray_add(&m->expansion, ei, NULL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
515 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
516 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
517
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
518 void
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
519 macro_define_plain(struct place *p1, const char *macro,
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
520 struct place *p2, const char *expansion)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
521 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
522 struct macro *m;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
523 struct expansionitem *ei;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
524
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
525 m = macro_define_common_start(p1, macro, p2);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
526 ei = expansionitem_create_string(expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
527 expansionitemarray_add(&m->expansion, ei, NULL);
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
528 macro_define_common_end(m);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
529 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
530
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
531 void
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
532 macro_define_params(struct place *p1, const char *macro,
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
533 struct place *p2, const char *params,
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
534 struct place *p3, const char *expansion)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
535 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
536 struct macro *m;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
537
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
538 m = macro_define_common_start(p1, macro, p3);
25
18681e5ae6e4 fix some more bugs
David A. Holland
parents: 21
diff changeset
539 m->hasparams = true;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
540 macro_parse_parameters(m, p2, params);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
541 macro_parse_expansion(m, expansion);
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
542 macro_define_common_end(m);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
543 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
544
76da41da923f added macro table
David A. Holland
parents:
diff changeset
545 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
546 macro_undef(const char *macro)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
547 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
548 struct macro *m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
549
76da41da923f added macro table
David A. Holland
parents:
diff changeset
550 m = macrotable_find(macro, true);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
551 if (m) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
552 macro_destroy(m);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
553 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
554 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
555
76da41da923f added macro table
David A. Holland
parents:
diff changeset
556 bool
76da41da923f added macro table
David A. Holland
parents:
diff changeset
557 macro_isdefined(const char *macro)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
558 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
559 struct macro *m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
560
76da41da923f added macro table
David A. Holland
parents:
diff changeset
561 m = macrotable_find(macro, false);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
562 return m != NULL;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
563 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
564
76da41da923f added macro table
David A. Holland
parents:
diff changeset
565 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
566 // macro expansion
76da41da923f added macro table
David A. Holland
parents:
diff changeset
567
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
568 struct expstate {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
569 bool honordefined;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
570 enum { ES_NORMAL, ES_WANTLPAREN, ES_NOARG, ES_HAVEARG } state;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
571 struct macro *curmacro;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
572 struct stringarray args;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
573 unsigned argparens;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
574
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
575 bool tobuf;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
576 char *buf;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
577 size_t bufpos, bufmax;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
578 };
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
579
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
580 static struct expstate mainstate;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
581
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
582 static void doexpand(struct expstate *es, struct place *p,
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
583 char *buf, size_t len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
584
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
585 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
586 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
587 expstate_init(struct expstate *es, bool tobuf, bool honordefined)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
588 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
589 es->honordefined = honordefined;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
590 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
591 es->curmacro = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
592 stringarray_init(&es->args);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
593 es->argparens = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
594 es->tobuf = tobuf;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
595 es->buf = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
596 es->bufpos = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
597 es->bufmax = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
598 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
599
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
600 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
601 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
602 expstate_cleanup(struct expstate *es)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
603 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
604 assert(es->state == ES_NORMAL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
605 stringarray_cleanup(&es->args);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
606 if (es->buf) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
607 free(es->buf);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
608 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
609 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
610
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
611 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
612 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
613 expstate_destroyargs(struct expstate *es)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
614 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
615 unsigned i, num;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
616
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
617 num = stringarray_num(&es->args);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
618 for (i=0; i<num; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
619 free(stringarray_get(&es->args, i));
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
620 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
621 stringarray_setsize(&es->args, 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
622 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
623
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
624 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
625 void
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
626 expand_send(struct expstate *es, struct place *p, const char *buf, size_t len)
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
627 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
628 if (es->tobuf) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
629 if (es->bufpos + len > es->bufmax) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
630 if (es->bufmax == 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
631 es->bufmax = 64;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
632 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
633 while (es->bufpos + len > es->bufmax) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
634 es->bufmax *= 2;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
635 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
636 es->buf = dorealloc(es->buf, es->bufmax);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
637 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
638 memcpy(es->buf + es->bufpos, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
639 es->bufpos += len;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
640 } else {
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
641 output(p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
642 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
643 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
644
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
645 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
646 void
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
647 expand_send_eof(struct expstate *es, struct place *p)
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
648 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
649 if (es->tobuf) {
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
650 expand_send(es, p, "", 1);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
651 es->bufpos--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
652 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
653 output_eof();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
654 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
655 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
656
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
657 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
658 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
659 expand_newarg(struct expstate *es, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
660 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
661 char *text;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
662
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
663 text = dostrndup(buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
664 stringarray_add(&es->args, text, NULL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
665 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
666
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
667 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
668 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
669 expand_appendarg(struct expstate *es, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
670 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
671 unsigned num;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
672 char *text;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
673 size_t oldlen;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
674
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
675 num = stringarray_num(&es->args);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
676 assert(num > 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
677
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
678 text = stringarray_get(&es->args, num - 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
679 oldlen = strlen(text);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
680 text = dorealloc(text, oldlen + len + 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
681 memcpy(text + oldlen, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
682 text[oldlen+len] = '\0';
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
683 stringarray_set(&es->args, num - 1, text);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
684 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
685
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
686 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
687 char *
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
688 expand_substitute(struct place *p, struct expstate *es)
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
689 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
690 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
691 unsigned i, num;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
692 size_t len;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
693 char *arg;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
694 char *ret;
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
695 unsigned numargs, numparams;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
696
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
697 numargs = stringarray_num(&es->args);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
698 numparams = stringarray_num(&es->curmacro->params);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
699
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
700 if (numargs == 0 && numparams == 1) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
701 /* no arguments <=> one empty argument */
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
702 stringarray_add(&es->args, dostrdup(""), NULL);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
703 numargs++;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
704 }
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
705 if (numargs != numparams) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
706 complain(p, "Wrong number of arguments for macro %s; "
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
707 "found %u, expected %u",
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
708 es->curmacro->name, numargs, numparams);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
709 complain_fail();
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
710 while (numargs < numparams) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
711 stringarray_add(&es->args, dostrdup(""), NULL);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
712 numargs++;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
713 }
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
714 }
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
715
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
716 len = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
717 num = expansionitemarray_num(&es->curmacro->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
718 for (i=0; i<num; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
719 ei = expansionitemarray_get(&es->curmacro->expansion, i);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
720 if (ei->isstring) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
721 len += strlen(ei->string);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
722 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
723 arg = stringarray_get(&es->args, ei->param);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
724 len += strlen(arg);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
725 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
726 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
727
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
728 ret = domalloc(len+1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
729 *ret = '\0';
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
730 for (i=0; i<num; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
731 ei = expansionitemarray_get(&es->curmacro->expansion, i);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
732 if (ei->isstring) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
733 strcat(ret, ei->string);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
734 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
735 arg = stringarray_get(&es->args, ei->param);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
736 strcat(ret, arg);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
737 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
738 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
739
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
740 return ret;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
741 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
742
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
743 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
744 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
745 expand_domacro(struct expstate *es, struct place *p)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
746 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
747 struct macro *m;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
748 char *newbuf, *newbuf2;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
749
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
750 if (es->curmacro == NULL) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
751 /* defined() */
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
752 if (stringarray_num(&es->args) != 1) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
753 complain(p, "Too many arguments for defined()");
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
754 complain_fail();
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
755 expand_send(es, p, "0", 1);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
756 return;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
757 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
758 m = macrotable_find(stringarray_get(&es->args, 0), false);
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
759 expand_send(es, p, (m != NULL) ? "1" : "0", 1);
25
18681e5ae6e4 fix some more bugs
David A. Holland
parents: 21
diff changeset
760 expstate_destroyargs(es);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
761 return;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
762 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
763
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
764 assert(es->curmacro->inuse == false);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
765 es->curmacro->inuse = true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
766
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
767 newbuf = expand_substitute(p, es);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
768 newbuf2 = macroexpand(p, newbuf, strlen(newbuf), false);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
769 free(newbuf);
25
18681e5ae6e4 fix some more bugs
David A. Holland
parents: 21
diff changeset
770 expstate_destroyargs(es);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
771 doexpand(es, p, newbuf2, strlen(newbuf2));
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
772 free(newbuf2);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
773
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
774 es->curmacro->inuse = false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
775 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
776
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
777 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
778 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
779 expand_got_ws(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
780 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
781 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
782 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
783 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
784 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
785 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
786 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
787 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
788 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
789 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
790 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
791 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
792 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
793 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
794
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
795 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
796 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
797 expand_got_word(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
798 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
799 struct macro *m;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
800 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
801 char *newbuf;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
802
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
803 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
804 case ES_NORMAL:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
805 if (es->honordefined &&
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
806 len == 7 && !memcmp(buf, "defined", 7)) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
807 es->curmacro = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
808 es->state = ES_WANTLPAREN;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
809 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
810 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
811 m = macrotable_findlen(buf, len, false);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
812 if (m == NULL) {
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
813 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
814 } else if (!m->hasparams) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
815 m->inuse = true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
816 assert(expansionitemarray_num(&m->expansion) == 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
817 ei = expansionitemarray_get(&m->expansion, 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
818 assert(ei->isstring);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
819 newbuf = macroexpand(p, ei->string,
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
820 strlen(ei->string), false);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
821 doexpand(es, p, newbuf, strlen(newbuf));
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
822 free(newbuf);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
823 m->inuse = false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
824 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
825 es->curmacro = m;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
826 es->state = ES_WANTLPAREN;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
827 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
828 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
829 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
830 if (es->curmacro != NULL) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
831 complain(p, "Expected arguments for macro %s",
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
832 es->curmacro->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
833 complain_fail();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
834 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
835 /* "defined foo" means "defined(foo)" */
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
836 expand_newarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
837 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
838 expand_domacro(es, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
839 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
840 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
841 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
842 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
843 expand_newarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
844 es->state = ES_HAVEARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
845 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
846 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
847 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
848 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
849 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
850 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
851
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
852 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
853 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
854 expand_got_lparen(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
855 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
856 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
857 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
858 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
859 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
860 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
861 es->state = ES_NOARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
862 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
863 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
864 expand_newarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
865 es->state = ES_HAVEARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
866 es->argparens++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
867 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
868 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
869 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
870 es->argparens++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
871 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
872 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
873 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
874
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
875 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
876 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
877 expand_got_rparen(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
878 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
879 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
880 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
881 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
882 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
883 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
884 if (es->curmacro) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
885 complain(p, "Expected arguments for macro %s",
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
886 es->curmacro->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
887 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
888 complain(p, "Expected arguments for defined()");
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
889 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
890 complain_fail();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
891 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
892 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
893 assert(es->argparens == 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
894 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
895 expand_domacro(es, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
896 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
897 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
898 if (es->argparens > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
899 es->argparens--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
900 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
901 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
902 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
903 expand_domacro(es, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
904 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
905 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
906 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
907 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
908
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
909 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
910 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
911 expand_got_comma(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
912 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
913 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
914 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
915 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
916 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
917 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
918 if (es->curmacro) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
919 complain(p, "Expected arguments for macro %s",
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
920 es->curmacro->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
921 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
922 complain(p, "Expected arguments for defined()");
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
923 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
924 complain_fail();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
925 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
926 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
927 assert(es->argparens == 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
928 expand_newarg(es, buf, 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
929 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
930 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
931 if (es->argparens > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
932 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
933 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
934 es->state = ES_NOARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
935 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
936 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
937 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
938 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
939
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
940 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
941 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
942 expand_got_other(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
943 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
944 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
945 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
946 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
947 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
948 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
949 if (es->curmacro) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
950 complain(p, "Expected arguments for macro %s",
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
951 es->curmacro->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
952 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
953 complain(p, "Expected arguments for defined()");
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
954 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
955 complain_fail();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
956 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
957 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
958 expand_newarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
959 es->state = ES_HAVEARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
960 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
961 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
962 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
963 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
964 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
965 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
966
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
967 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
968 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
969 expand_got_eof(struct expstate *es, struct place *p)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
970 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
971 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
972 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
973 expand_send_eof(es, p);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
974 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
975 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
976 if (es->curmacro) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
977 complain(p, "Expected arguments for macro %s",
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
978 es->curmacro->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
979 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
980 complain(p, "Expected arguments for defined()");
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
981 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
982 complain_fail();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
983 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
984 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
985 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
986 if (es->curmacro) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
987 complain(p, "Unclosed argument list for macro %s",
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
988 es->curmacro->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
989 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
990 complain(p, "Unclosed argument list for defined()");
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
991 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
992 complain_fail();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
993 expstate_destroyargs(es);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
994 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
995 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
996 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
997 es->curmacro = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
998 es->argparens = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
999 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1000
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1001 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1002 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1003 doexpand(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1004 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1005 size_t x;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1006
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1007 while (len > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1008 x = strspn(buf, ws);
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1009 if (x > len) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1010 /* XXX gross, need strnspn */
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1011 x = len;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1012 }
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1013
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1014 if (x > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1015 expand_got_ws(es, p, buf, x);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1016 buf += x;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1017 len -= x;
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1018 continue;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1019 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1020
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1021 x = strspn(buf, alnum);
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1022 if (x > len) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1023 /* XXX gross, need strnspn */
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1024 x = len;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1025 }
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1026
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1027 if (x > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1028 expand_got_word(es, p, buf, x);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1029 buf += x;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1030 len -= x;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1031 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1032 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1033
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1034 if (buf[0] == '(') {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1035 expand_got_lparen(es, p, buf, 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1036 buf++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1037 len--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1038 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1039 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1040
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1041 if (buf[0] == ')') {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1042 expand_got_rparen(es, p, buf, 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1043 buf++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1044 len--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1045 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1046 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1047
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1048 if (buf[0] == ',') {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1049 expand_got_comma(es, p, buf, 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1050 buf++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1051 len--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1052 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1053 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1054
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1055 expand_got_other(es, p, buf, 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1056 buf++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1057 len--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1058 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1059 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1060
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1061 char *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1062 macroexpand(struct place *p, char *buf, size_t len, bool honordefined)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1063 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1064 struct expstate es;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1065 char *ret;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1066
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1067 expstate_init(&es, true, honordefined);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1068 doexpand(&es, p, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1069 expand_got_eof(&es, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1070 ret = es.buf;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1071 es.buf = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1072 expstate_cleanup(&es);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1073
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1074 return ret;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1075 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1076
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1077 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1078 macro_sendline(struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1079 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1080 doexpand(&mainstate, p, buf, len);
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
1081 output(p, "\n", 1);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1082 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1083
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1084 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1085 macro_sendeof(struct place *p)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1086 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1087 expand_got_eof(&mainstate, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1088 }
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1089
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1090 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1091 // module initialization
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1092
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1093 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1094 macros_init(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1095 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1096 macrotable_init();
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1097 expstate_init(&mainstate, false, false);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1098 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1099
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1100 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1101 macros_cleanup(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1102 {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1103 expstate_cleanup(&mainstate);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1104 macrotable_cleanup();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1105 }