annotate macro.c @ 31:39901e11b1aa

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