annotate macro.c @ 163:e1dfa3f90b6c

Merge mismatch resulted in forgotten initialisation of isspecial.
author Joerg Sonnenberger <joerg@bec.de>
date Fri, 27 Feb 2015 13:44:39 +0100
parents 82cc6fa54b01
children f14f5352956c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30
76c114899f63 copyrights
David A. Holland
parents: 28
diff changeset
1 /*-
99
60184aa42604 add 2013 to copyrights where it seems warranted
David A. Holland
parents: 88
diff changeset
2 * Copyright (c) 2010, 2013 The NetBSD Foundation, Inc.
30
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
33
a5acb7049e4c need stdint.h for uint16_t
David A. Holland
parents: 30
diff changeset
30 #include <stdint.h>
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
31 #include <stdio.h>
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
32 #include <stdlib.h>
76da41da923f added macro table
David A. Holland
parents:
diff changeset
33 #include <string.h>
76da41da923f added macro table
David A. Holland
parents:
diff changeset
34
76da41da923f added macro table
David A. Holland
parents:
diff changeset
35 #include "array.h"
76da41da923f added macro table
David A. Holland
parents:
diff changeset
36 #include "mode.h"
76da41da923f added macro table
David A. Holland
parents:
diff changeset
37 #include "place.h"
76da41da923f added macro table
David A. Holland
parents:
diff changeset
38 #include "macro.h"
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
39 #include "output.h"
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
40
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
41 struct expansionitem {
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
42 enum { EI_PARAM, EI_STRING, EI_FILE, EI_LINE } itemtype;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
43 union {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
44 char *string;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
45 unsigned param;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
46 };
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
47 };
107
33954a07d013 __unused -> UNUSED
David A. Holland
parents: 99
diff changeset
48 DECLARRAY(expansionitem, static UNUSED);
47
2e25e55dba6b Fix inline usage as per the version in dholland-make2.
David A. Holland
parents: 42
diff changeset
49 DEFARRAY(expansionitem, static);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
50
76da41da923f added macro table
David A. Holland
parents:
diff changeset
51 struct macro {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
52 struct place defplace;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
53 struct place expansionplace;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
54 struct stringarray params;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
55 struct expansionitemarray expansion;
158
19278e2f885d Roughly sort by size to reduce padding.
Joerg Sonnenberger <joerg@bec.de>
parents: 145
diff changeset
56 char *name;
19278e2f885d Roughly sort by size to reduce padding.
Joerg Sonnenberger <joerg@bec.de>
parents: 145
diff changeset
57 unsigned hash;
19278e2f885d Roughly sort by size to reduce padding.
Joerg Sonnenberger <joerg@bec.de>
parents: 145
diff changeset
58 bool hasparams;
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
59 bool isspecial;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
60 bool inuse;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
61 };
107
33954a07d013 __unused -> UNUSED
David A. Holland
parents: 99
diff changeset
62 DECLARRAY(macro, static UNUSED);
47
2e25e55dba6b Fix inline usage as per the version in dholland-make2.
David A. Holland
parents: 42
diff changeset
63 DEFARRAY(macro, static);
107
33954a07d013 __unused -> UNUSED
David A. Holland
parents: 99
diff changeset
64 DECLARRAY(macroarray, static UNUSED);
47
2e25e55dba6b Fix inline usage as per the version in dholland-make2.
David A. Holland
parents: 42
diff changeset
65 DEFARRAY(macroarray, static);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
66
76da41da923f added macro table
David A. Holland
parents:
diff changeset
67 static struct macroarrayarray macros;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
68 static unsigned total_macros;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
69 static unsigned hashmask;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
70
76da41da923f added macro table
David A. Holland
parents:
diff changeset
71 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
72 // macro structure ops
76da41da923f added macro table
David A. Holland
parents:
diff changeset
73
76da41da923f added macro table
David A. Holland
parents:
diff changeset
74 static
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
75 struct expansionitem *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
76 expansionitem_create_string(const char *string)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
77 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
78 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
79
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
80 ei = domalloc(sizeof(*ei));
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
81 ei->itemtype = EI_STRING;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
82 ei->string = dostrdup(string);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
83 return ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
84 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
85
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
86 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
87 struct expansionitem *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
88 expansionitem_create_stringlen(const char *string, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
89 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
90 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
91
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
92 ei = domalloc(sizeof(*ei));
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
93 ei->itemtype = EI_STRING;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
94 ei->string = dostrndup(string, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
95 return ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
96 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
97
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
98 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
99 struct expansionitem *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
100 expansionitem_create_param(unsigned param)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
101 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
102 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
103
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
104 ei = domalloc(sizeof(*ei));
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
105 ei->itemtype = EI_PARAM;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
106 ei->param = param;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
107 return ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
108 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
109
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
110 static
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
111 struct expansionitem *
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
112 expansionitem_create_file(void)
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
113 {
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
114 struct expansionitem *ei;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
115
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
116 ei = domalloc(sizeof(*ei));
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
117 ei->itemtype = EI_FILE;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
118 return ei;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
119 }
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
120
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
121 static
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
122 struct expansionitem *
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
123 expansionitem_create_line(void)
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
124 {
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
125 struct expansionitem *ei;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
126
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
127 ei = domalloc(sizeof(*ei));
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
128 ei->itemtype = EI_LINE;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
129 return ei;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
130 }
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
131
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
132 static
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
133 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
134 expansionitem_destroy(struct expansionitem *ei)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
135 {
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
136 if (ei->itemtype == EI_STRING) {
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
137 dostrfree(ei->string);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
138 }
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
139 dofree(ei, sizeof(*ei));
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
140 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
141
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
142 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
143 bool
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
144 expansionitem_eq(const struct expansionitem *ei1,
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
145 const struct expansionitem *ei2)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
146 {
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
147 if ((ei1->itemtype == EI_STRING) != (ei2->itemtype == EI_STRING)) {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
148 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
149 }
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
150 if (ei1->itemtype == EI_STRING) {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
151 if (strcmp(ei1->string, ei2->string) != 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
152 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
153 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
154 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
155 if (ei1->param != ei2->param) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
156 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
157 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
158 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
159 return true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
160 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
161
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
162 static
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
163 struct macro *
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
164 macro_create(struct place *p1, const char *name, unsigned hash,
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
165 struct place *p2)
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
166 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
167 struct macro *m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
168
76da41da923f added macro table
David A. Holland
parents:
diff changeset
169 m = domalloc(sizeof(*m));
76da41da923f added macro table
David A. Holland
parents:
diff changeset
170 m->defplace = *p1;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
171 m->expansionplace = *p2;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
172 m->hash = hash;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
173 m->name = dostrdup(name);
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
174 m->hasparams = false;
163
e1dfa3f90b6c Merge mismatch resulted in forgotten initialisation of isspecial.
Joerg Sonnenberger <joerg@bec.de>
parents: 162
diff changeset
175 m->isspecial = false;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
176 stringarray_init(&m->params);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
177 expansionitemarray_init(&m->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
178 m->inuse = false;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
179 return m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
180 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
181
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
182 DESTROYALL_ARRAY(expansionitem, );
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
183
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
184 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
185 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
186 macro_destroy(struct macro *m)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
187 {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
188 expansionitemarray_destroyall(&m->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
189 expansionitemarray_cleanup(&m->expansion);
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
190 dostrfree(m->name);
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
191 dofree(m, sizeof(*m));
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
192 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
193
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
194 static
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
195 bool
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
196 macro_eq(const struct macro *m1, const struct macro *m2)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
197 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
198 unsigned num1, num2, i;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
199 struct expansionitem *ei1, *ei2;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
200 const char *p1, *p2;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
201
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
202 if (m2->isspecial) {
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
203 return false;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
204 }
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
205
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
206 if (strcmp(m1->name, m2->name) != 0) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
207 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
208 }
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 if (m1->hasparams != m2->hasparams) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
211 return false;
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
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
214 num1 = expansionitemarray_num(&m1->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
215 num2 = expansionitemarray_num(&m2->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
216 if (num1 != num2) {
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
217 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
218 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
219
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
220 for (i=0; i<num1; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
221 ei1 = expansionitemarray_get(&m1->expansion, i);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
222 ei2 = expansionitemarray_get(&m2->expansion, i);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
223 if (!expansionitem_eq(ei1, ei2)) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
224 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
225 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
226 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
227
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
228 num1 = stringarray_num(&m1->params);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
229 num2 = stringarray_num(&m2->params);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
230 if (num1 != num2) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
231 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
232 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
233
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
234 for (i=0; i<num1; i++) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
235 p1 = stringarray_get(&m1->params, i);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
236 p2 = stringarray_get(&m2->params, i);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
237 if (strcmp(p1, p2) != 0) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
238 return false;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
239 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
240 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
241 return true;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
242 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
243
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
244 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
245 // macro table
76da41da923f added macro table
David A. Holland
parents:
diff changeset
246
76da41da923f added macro table
David A. Holland
parents:
diff changeset
247 /*
76da41da923f added macro table
David A. Holland
parents:
diff changeset
248 * Unless I've screwed up, this is something called Fletcher's Checksum
76da41da923f added macro table
David A. Holland
parents:
diff changeset
249 * that showed up in Dr. Dobbs in, according to my notes, May 1992. The
76da41da923f added macro table
David A. Holland
parents:
diff changeset
250 * implementation is new.
76da41da923f added macro table
David A. Holland
parents:
diff changeset
251 */
76da41da923f added macro table
David A. Holland
parents:
diff changeset
252 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
253 unsigned
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
254 hashfunc(const char *s, size_t len)
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
255 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
256 uint16_t x1, x2, a;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
257 size_t i;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
258
76da41da923f added macro table
David A. Holland
parents:
diff changeset
259 x1 = (uint16_t) (len >> 16);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
260 x2 = (uint16_t) (len);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
261 if (x1==0) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
262 x1++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
263 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
264 if (x2==0) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
265 x2++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
266 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
267
76da41da923f added macro table
David A. Holland
parents:
diff changeset
268 for (i=0; i<len; i+=2) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
269 if (i==len-1) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
270 a = (unsigned char)s[i];
76da41da923f added macro table
David A. Holland
parents:
diff changeset
271 /* don't run off the end of the array */
76da41da923f added macro table
David A. Holland
parents:
diff changeset
272 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
273 else {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
274 a = (unsigned char)s[i] +
76da41da923f added macro table
David A. Holland
parents:
diff changeset
275 ((uint16_t)(unsigned char)s[i+1] << 8);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
276 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
277 x1 += a;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
278 if (x1 < a) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
279 x1++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
280 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
281 x2 += x1;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
282 if (x2 < x1) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
283 x2++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
284 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
285 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
286
76da41da923f added macro table
David A. Holland
parents:
diff changeset
287 x1 ^= 0xffff;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
288 x2 ^= 0xffff;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
289 return ((uint32_t)x2)*65535U + x1;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
290 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
291
76da41da923f added macro table
David A. Holland
parents:
diff changeset
292 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
293 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
294 macrotable_init(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
295 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
296 unsigned i;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
297
76da41da923f added macro table
David A. Holland
parents:
diff changeset
298 macroarrayarray_init(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
299 macroarrayarray_setsize(&macros, 4);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
300 for (i=0; i<4; i++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
301 macroarrayarray_set(&macros, i, NULL);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
302 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
303 total_macros = 0;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
304 hashmask = 0x3;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
305 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
306
76da41da923f added macro table
David A. Holland
parents:
diff changeset
307 DESTROYALL_ARRAY(macro, );
76da41da923f added macro table
David A. Holland
parents:
diff changeset
308
76da41da923f added macro table
David A. Holland
parents:
diff changeset
309 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
310 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
311 macrotable_cleanup(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
312 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
313 struct macroarray *bucket;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
314 unsigned numbuckets, i;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
315
76da41da923f added macro table
David A. Holland
parents:
diff changeset
316 numbuckets = macroarrayarray_num(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
317 for (i=0; i<numbuckets; i++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
318 bucket = macroarrayarray_get(&macros, i);
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
319 if (bucket != NULL) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
320 macroarray_destroyall(bucket);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
321 macroarray_destroy(bucket);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
322 }
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
323 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
324 macroarrayarray_setsize(&macros, 0);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
325 macroarrayarray_cleanup(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
326 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
327
76da41da923f added macro table
David A. Holland
parents:
diff changeset
328 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
329 struct macro *
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
330 macrotable_findlen(const char *name, size_t len, bool remove)
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
331 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
332 unsigned hash;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
333 struct macroarray *bucket;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
334 struct macro *m, *m2;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
335 unsigned i, num;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
336 size_t mlen;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
337
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
338 hash = hashfunc(name, len);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
339 bucket = macroarrayarray_get(&macros, hash & hashmask);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
340 if (bucket == NULL) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
341 return NULL;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
342 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
343 num = macroarray_num(bucket);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
344 for (i=0; i<num; i++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
345 m = macroarray_get(bucket, i);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
346 if (hash != m->hash) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
347 continue;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
348 }
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
349 mlen = strlen(m->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
350 if (len == mlen && !memcmp(name, m->name, len)) {
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
351 if (remove) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
352 if (i < num-1) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
353 m2 = macroarray_get(bucket, num-1);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
354 macroarray_set(bucket, i, m2);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
355 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
356 macroarray_setsize(bucket, num-1);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
357 total_macros--;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
358 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
359 return m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
360 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
361 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
362 return NULL;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
363 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
364
76da41da923f added macro table
David A. Holland
parents:
diff changeset
365 static
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
366 struct macro *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
367 macrotable_find(const char *name, bool remove)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
368 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
369 return macrotable_findlen(name, strlen(name), remove);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
370 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
371
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
372 static
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
373 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
374 macrotable_rehash(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
375 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
376 struct macroarray *newbucket, *oldbucket;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
377 struct macro *m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
378 unsigned newmask, tossbit;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
379 unsigned numbuckets, i;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
380 unsigned oldnum, j, k;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
381
76da41da923f added macro table
David A. Holland
parents:
diff changeset
382 numbuckets = macroarrayarray_num(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
383 macroarrayarray_setsize(&macros, numbuckets*2);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
384
76da41da923f added macro table
David A. Holland
parents:
diff changeset
385 assert(hashmask == numbuckets - 1);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
386 newmask = (hashmask << 1) | 1U;
74
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
387 tossbit = newmask & ~hashmask;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
388 hashmask = newmask;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
389
76da41da923f added macro table
David A. Holland
parents:
diff changeset
390 for (i=0; i<numbuckets; i++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
391 newbucket = NULL;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
392 oldbucket = macroarrayarray_get(&macros, i);
74
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
393 if (oldbucket == NULL) {
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
394 macroarrayarray_set(&macros, numbuckets + i, NULL);
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
395 continue;
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
396 }
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
397 oldnum = macroarray_num(oldbucket);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
398 for (j=0; j<oldnum; j++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
399 m = macroarray_get(oldbucket, j);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
400 if (m->hash & tossbit) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
401 if (newbucket == NULL) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
402 newbucket = macroarray_create();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
403 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
404 macroarray_set(oldbucket, j, NULL);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
405 macroarray_add(newbucket, m, NULL);
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 for (j=k=0; j<oldnum; j++) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
409 m = macroarray_get(oldbucket, j);
74
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
410 if (m != NULL) {
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
411 if (k < j) {
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
412 macroarray_set(oldbucket, k, m);
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
413 }
bbbf71859a21 fix stupid bugs
David A. Holland
parents: 47
diff changeset
414 k++;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
415 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
416 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
417 macroarray_setsize(oldbucket, k);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
418 macroarrayarray_set(&macros, numbuckets + i, newbucket);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
419 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
420 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
421
76da41da923f added macro table
David A. Holland
parents:
diff changeset
422 static
76da41da923f added macro table
David A. Holland
parents:
diff changeset
423 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
424 macrotable_add(struct macro *m)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
425 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
426 unsigned hash;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
427 struct macroarray *bucket;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
428 unsigned numbuckets;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
429
76da41da923f added macro table
David A. Holland
parents:
diff changeset
430 numbuckets = macroarrayarray_num(&macros);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
431 if (total_macros > 0 && total_macros / numbuckets > 9) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
432 macrotable_rehash();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
433 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
434
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
435 hash = hashfunc(m->name, strlen(m->name));
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
436 bucket = macroarrayarray_get(&macros, hash & hashmask);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
437 if (bucket == NULL) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
438 bucket = macroarray_create();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
439 macroarrayarray_set(&macros, hash & hashmask, bucket);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
440 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
441 macroarray_add(bucket, m, NULL);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
442 total_macros++;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
443 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
444
76da41da923f added macro table
David A. Holland
parents:
diff changeset
445 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
446 // external macro definition interface
76da41da923f added macro table
David A. Holland
parents:
diff changeset
447
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
448 static
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
449 struct macro *
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
450 macro_define_common_start(struct place *p1, const char *macro,
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
451 struct place *p2)
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
452 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
453 struct macro *m;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
454 unsigned hash;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
455
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
456 if (!is_identifier(macro)) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
457 complain(p1, "Invalid macro name %s", macro);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
458 complain_fail();
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
459 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
460
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
461 hash = hashfunc(macro, strlen(macro));
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
462 m = macro_create(p1, macro, hash, p2);
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
463 return m;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
464 }
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 static
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
467 void
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
468 macro_define_common_end(struct macro *m)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
469 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
470 struct macro *oldm;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
471 bool ok;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
472
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
473 oldm = macrotable_find(m->name, false);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
474 if (oldm != NULL) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
475 ok = macro_eq(m, oldm);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
476 if (ok) {
84
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
477 /* in traditional cpp this is silent */
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
478 //complain(&m->defplace,
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
479 // "Warning: redefinition of %s", m->name);
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
480 //complain(&oldm->defplace,
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
481 // "Previous definition was here");
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
482 //if (mode.werror) {
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
483 // complain_fail();
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
484 //}
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
485 } else {
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
486 complain(&m->defplace,
84
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
487 "Warning: non-identical redefinition of %s",
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
488 m->name);
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
489 complain(&oldm->defplace,
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
490 "Previous definition was here");
7e4723d34248 Complain only about non-identical redefinitions of macros.
David A. Holland
parents: 74
diff changeset
491 /* in traditional cpp this is not fatal */
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
492 if (mode.werror) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
493 complain_fail();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
494 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
495 }
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
496 macro_destroy(m);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
497 return;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
498 }
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
499 macrotable_add(m);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
500 }
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
501
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
502 static
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
503 void
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
504 macro_parse_parameters(struct macro *m, struct place *p, const char *params)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
505 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
506 size_t len;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
507 const char *s;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
508 char *param;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
509
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
510 while (params != NULL) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
511 len = strspn(params, ws);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
512 params += len;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
513 p->column += len;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
514 s = strchr(params, ',');
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
515 if (s) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
516 len = s-params;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
517 param = dostrndup(params, len);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
518 s++;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
519 } else {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
520 len = strlen(params);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
521 param = dostrndup(params, len);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
522 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
523 notrailingws(param, strlen(param));
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
524 if (!is_identifier(param)) {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
525 complain(p, "Invalid macro parameter name %s", param);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
526 complain_fail();
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
527 } else {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
528 stringarray_add(&m->params, param, NULL);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
529 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
530 params = s;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
531 p->column += len;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
532 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
533 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
534
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
535 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
536 bool
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
537 isparam(struct macro *m, const char *name, size_t len, unsigned *num_ret)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
538 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
539 unsigned num, i;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
540 const char *param;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
541
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
542 num = stringarray_num(&m->params);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
543 for (i=0; i<num; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
544 param = stringarray_get(&m->params, i);
27
01c3a2088ab4 fix some more bugs
David A. Holland
parents: 25
diff changeset
545 if (strlen(param) == len && !memcmp(name, param, len)) {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
546 *num_ret = i;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
547 return true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
548 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
549 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
550 return false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
551 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
552
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
553 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
554 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
555 macro_parse_expansion(struct macro *m, const char *buf)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
556 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
557 size_t blockstart, wordstart, pos;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
558 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
559 unsigned param;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
560
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
561 pos = blockstart = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
562 while (buf[pos] != '\0') {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
563 pos += strspn(buf+pos, ws);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
564 if (strchr(alnum, buf[pos])) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
565 wordstart = pos;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
566 pos += strspn(buf+pos, alnum);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
567 if (isparam(m, buf+wordstart, pos-wordstart, &param)) {
144
7ab3d0c09cd8 fix very minor bug
David A. Holland
parents: 129
diff changeset
568 if (wordstart > blockstart) {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
569 ei = expansionitem_create_stringlen(
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
570 buf + blockstart,
27
01c3a2088ab4 fix some more bugs
David A. Holland
parents: 25
diff changeset
571 wordstart - blockstart);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
572 expansionitemarray_add(&m->expansion,
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
573 ei, NULL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
574 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
575 ei = expansionitem_create_param(param);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
576 expansionitemarray_add(&m->expansion, ei,NULL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
577 blockstart = pos;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
578 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
579 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
580 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
581 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
582 pos++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
583 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
584 if (pos > blockstart) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
585 ei = expansionitem_create_stringlen(buf + blockstart,
25
18681e5ae6e4 fix some more bugs
David A. Holland
parents: 21
diff changeset
586 pos - blockstart);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
587 expansionitemarray_add(&m->expansion, ei, NULL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
588 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
589 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
590
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
591 void
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
592 macro_define_plain(struct place *p1, const char *macro,
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
593 struct place *p2, const char *expansion)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
594 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
595 struct macro *m;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
596 struct expansionitem *ei;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
597
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
598 m = macro_define_common_start(p1, macro, p2);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
599 ei = expansionitem_create_string(expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
600 expansionitemarray_add(&m->expansion, ei, NULL);
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
601 macro_define_common_end(m);
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
602 }
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
603
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
604 void
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
605 macro_define_file(struct place *p)
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
606 {
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
607 struct macro *m;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
608 struct expansionitem *ei;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
609
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
610 m = macro_define_common_start(p, "__FILE__", p);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
611 m->isspecial = true;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
612 ei = expansionitem_create_file();
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
613 expansionitemarray_add(&m->expansion, ei, NULL);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
614 macro_define_common_end(m);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
615 }
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
616
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
617 void
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
618 macro_define_line(struct place *p)
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
619 {
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
620 struct macro *m;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
621 struct expansionitem *ei;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
622
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
623 m = macro_define_common_start(p, "__LINE__", p);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
624 m->isspecial = true;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
625 ei = expansionitem_create_line();
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
626 expansionitemarray_add(&m->expansion, ei, NULL);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
627 macro_define_common_end(m);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
628 }
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
629
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
630 void
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
631 macro_define_params(struct place *p1, const char *macro,
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
632 struct place *p2, const char *params,
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
633 struct place *p3, const char *expansion)
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
634 {
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
635 struct macro *m;
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
636
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
637 m = macro_define_common_start(p1, macro, p3);
25
18681e5ae6e4 fix some more bugs
David A. Holland
parents: 21
diff changeset
638 m->hasparams = true;
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
639 macro_parse_parameters(m, p2, params);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
640 macro_parse_expansion(m, expansion);
18
c08a947d8f30 deal with macro parameters
David A. Holland
parents: 17
diff changeset
641 macro_define_common_end(m);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
642 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
643
76da41da923f added macro table
David A. Holland
parents:
diff changeset
644 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
645 macro_undef(const char *macro)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
646 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
647 struct macro *m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
648
76da41da923f added macro table
David A. Holland
parents:
diff changeset
649 m = macrotable_find(macro, true);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
650 if (m) {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
651 macro_destroy(m);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
652 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
653 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
654
76da41da923f added macro table
David A. Holland
parents:
diff changeset
655 bool
76da41da923f added macro table
David A. Holland
parents:
diff changeset
656 macro_isdefined(const char *macro)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
657 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
658 struct macro *m;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
659
76da41da923f added macro table
David A. Holland
parents:
diff changeset
660 m = macrotable_find(macro, false);
76da41da923f added macro table
David A. Holland
parents:
diff changeset
661 return m != NULL;
76da41da923f added macro table
David A. Holland
parents:
diff changeset
662 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
663
76da41da923f added macro table
David A. Holland
parents:
diff changeset
664 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
665 // macro expansion
76da41da923f added macro table
David A. Holland
parents:
diff changeset
666
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
667 struct expstate {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
668 bool honordefined;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
669 enum { ES_NORMAL, ES_WANTLPAREN, ES_NOARG, ES_HAVEARG } state;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
670 struct macro *curmacro;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
671 struct stringarray args;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
672 unsigned argparens;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
673
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
674 bool tobuf;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
675 char *buf;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
676 size_t bufpos, bufmax;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
677 };
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
678
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
679 static struct expstate mainstate;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
680
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
681 static void doexpand(struct expstate *es, struct place *p,
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
682 char *buf, size_t len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
683
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
684 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
685 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
686 expstate_init(struct expstate *es, bool tobuf, bool honordefined)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
687 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
688 es->honordefined = honordefined;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
689 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
690 es->curmacro = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
691 stringarray_init(&es->args);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
692 es->argparens = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
693 es->tobuf = tobuf;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
694 es->buf = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
695 es->bufpos = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
696 es->bufmax = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
697 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
698
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
699 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
700 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
701 expstate_cleanup(struct expstate *es)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
702 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
703 assert(es->state == ES_NORMAL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
704 stringarray_cleanup(&es->args);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
705 if (es->buf) {
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
706 dofree(es->buf, es->bufmax);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
707 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
708 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
709
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
710 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
711 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
712 expstate_destroyargs(struct expstate *es)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
713 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
714 unsigned i, num;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
715
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
716 num = stringarray_num(&es->args);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
717 for (i=0; i<num; i++) {
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
718 dostrfree(stringarray_get(&es->args, i));
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
719 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
720 stringarray_setsize(&es->args, 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
721 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
722
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
723 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
724 void
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
725 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
726 {
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
727 size_t oldmax;
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
728
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
729 if (es->tobuf) {
38
b156910b59b2 Wrap free() in dofree() to allow instrumenting it for debugging.
David A. Holland
parents: 33
diff changeset
730 assert(es->bufpos <= es->bufmax);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
731 if (es->bufpos + len > es->bufmax) {
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
732 oldmax = es->bufmax;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
733 if (es->bufmax == 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
734 es->bufmax = 64;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
735 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
736 while (es->bufpos + len > es->bufmax) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
737 es->bufmax *= 2;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
738 }
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
739 es->buf = dorealloc(es->buf, oldmax, es->bufmax);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
740 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
741 memcpy(es->buf + es->bufpos, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
742 es->bufpos += len;
38
b156910b59b2 Wrap free() in dofree() to allow instrumenting it for debugging.
David A. Holland
parents: 33
diff changeset
743 assert(es->bufpos <= es->bufmax);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
744 } else {
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
745 output(p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
746 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
747 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
748
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
749 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
750 void
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
751 expand_send_eof(struct expstate *es, struct place *p)
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
752 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
753 if (es->tobuf) {
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
754 expand_send(es, p, "", 1);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
755 es->bufpos--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
756 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
757 output_eof();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
758 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
759 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
760
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
761 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
762 void
161
4a4b3d5c41fa Use more const.
Joerg Sonnenberger <joerg@bec.de>
parents: 159
diff changeset
763 expand_newarg(struct expstate *es, const char *buf, size_t len)
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
764 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
765 char *text;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
766
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
767 text = dostrndup(buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
768 stringarray_add(&es->args, text, NULL);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
769 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
770
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
771 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
772 void
161
4a4b3d5c41fa Use more const.
Joerg Sonnenberger <joerg@bec.de>
parents: 159
diff changeset
773 expand_appendarg(struct expstate *es, const char *buf, size_t len)
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
774 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
775 unsigned num;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
776 char *text;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
777 size_t oldlen;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
778
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
779 num = stringarray_num(&es->args);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
780 assert(num > 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
781
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
782 text = stringarray_get(&es->args, num - 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
783 oldlen = strlen(text);
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
784 text = dorealloc(text, oldlen + 1, oldlen + len + 1);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
785 memcpy(text + oldlen, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
786 text[oldlen+len] = '\0';
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
787 stringarray_set(&es->args, num - 1, text);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
788 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
789
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
790 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
791 char *
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
792 expand_substitute(struct place *p, struct expstate *es)
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
793 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
794 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
795 unsigned i, num;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
796 size_t len;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
797 char *arg;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
798 char *ret;
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
799 unsigned numargs, numparams;
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
800 char numbuf[64];
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
801
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
802 numargs = stringarray_num(&es->args);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
803 numparams = stringarray_num(&es->curmacro->params);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
804
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
805 if (numargs == 0 && numparams == 1) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
806 /* no arguments <=> one empty argument */
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
807 stringarray_add(&es->args, dostrdup(""), NULL);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
808 numargs++;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
809 }
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
810 if (numargs != numparams) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
811 complain(p, "Wrong number of arguments for macro %s; "
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
812 "found %u, expected %u",
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
813 es->curmacro->name, numargs, numparams);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
814 complain_fail();
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
815 while (numargs < numparams) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
816 stringarray_add(&es->args, dostrdup(""), NULL);
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
817 numargs++;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
818 }
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
819 }
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
820
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
821 len = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
822 num = expansionitemarray_num(&es->curmacro->expansion);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
823 for (i=0; i<num; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
824 ei = expansionitemarray_get(&es->curmacro->expansion, i);
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
825 switch (ei->itemtype) {
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
826 case EI_STRING:
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
827 len += strlen(ei->string);
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
828 break;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
829 case EI_PARAM:
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
830 arg = stringarray_get(&es->args, ei->param);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
831 len += strlen(arg);
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
832 break;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
833 case EI_FILE:
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
834 len += strlen(place_getname(p)) + 2;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
835 break;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
836 case EI_LINE:
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
837 len += snprintf(numbuf, sizeof(numbuf), "%u", p->line);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
838 break;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
839 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
840 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
841
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
842 ret = domalloc(len+1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
843 *ret = '\0';
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
844 for (i=0; i<num; i++) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
845 ei = expansionitemarray_get(&es->curmacro->expansion, i);
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
846 switch (ei->itemtype) {
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
847 case EI_STRING:
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
848 strcat(ret, ei->string);
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
849 break;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
850 case EI_PARAM:
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
851 arg = stringarray_get(&es->args, ei->param);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
852 strcat(ret, arg);
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
853 break;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
854 case EI_FILE:
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
855 strcat(ret, "\"");
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
856 strcat(ret, place_getname(p));
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
857 strcat(ret, "\"");
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
858 break;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
859 case EI_LINE:
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
860 snprintf(numbuf, sizeof(numbuf), "%u", p->line);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
861 strcat(ret, numbuf);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
862 break;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
863 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
864 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
865
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
866 return ret;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
867 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
868
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
869 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
870 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
871 expand_domacro(struct expstate *es, struct place *p)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
872 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
873 struct macro *m;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
874 char *newbuf, *newbuf2;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
875
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
876 if (es->curmacro == NULL) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
877 /* defined() */
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
878 if (stringarray_num(&es->args) != 1) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
879 complain(p, "Too many arguments for defined()");
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
880 complain_fail();
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
881 expand_send(es, p, "0", 1);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
882 return;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
883 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
884 m = macrotable_find(stringarray_get(&es->args, 0), false);
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
885 expand_send(es, p, (m != NULL) ? "1" : "0", 1);
25
18681e5ae6e4 fix some more bugs
David A. Holland
parents: 21
diff changeset
886 expstate_destroyargs(es);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
887 return;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
888 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
889
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
890 assert(es->curmacro->inuse == false);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
891 es->curmacro->inuse = true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
892
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
893 newbuf = expand_substitute(p, es);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
894 newbuf2 = macroexpand(p, newbuf, strlen(newbuf), false);
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
895 dostrfree(newbuf);
25
18681e5ae6e4 fix some more bugs
David A. Holland
parents: 21
diff changeset
896 expstate_destroyargs(es);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
897 doexpand(es, p, newbuf2, strlen(newbuf2));
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
898 dostrfree(newbuf2);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
899
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
900 es->curmacro->inuse = false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
901 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
902
87
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
903 /*
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
904 * The traditional behavior if a function-like macro appears without
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
905 * arguments is to pretend it isn't a macro; that is, just emit its
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
906 * name.
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
907 */
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
908 static
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
909 void
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
910 expand_missingargs(struct expstate *es, struct place *p, bool needspace)
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
911 {
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
912 if (es->curmacro == NULL) {
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
913 /* defined */
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
914 expand_send(es, p, "defined", 7);
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
915 return;
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
916 }
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
917 expand_send(es, p, es->curmacro->name, strlen(es->curmacro->name));
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
918 /* send a space in case we ate whitespace after the macro name */
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
919 if (needspace) {
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
920 expand_send(es, p, " ", 1);
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
921 }
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
922 }
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
923
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
924 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
925 void
161
4a4b3d5c41fa Use more const.
Joerg Sonnenberger <joerg@bec.de>
parents: 159
diff changeset
926 expand_got_ws(struct expstate *es, struct place *p, const char *buf, size_t len)
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
927 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
928 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
929 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
930 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
931 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
932 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
933 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
934 case ES_NOARG:
118
c13f36775fe8 Preserve leading whitespace in macro arguments.
David A. Holland
parents: 117
diff changeset
935 expand_newarg(es, buf, len);
c13f36775fe8 Preserve leading whitespace in macro arguments.
David A. Holland
parents: 117
diff changeset
936 es->state = ES_HAVEARG;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
937 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
938 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
939 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
940 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
941 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
942 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
943
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
944 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
945 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
946 expand_got_word(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
947 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
948 struct macro *m;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
949 struct expansionitem *ei;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
950 char *newbuf;
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
951
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
952 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
953 case ES_NORMAL:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
954 if (es->honordefined &&
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
955 len == 7 && !memcmp(buf, "defined", 7)) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
956 es->curmacro = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
957 es->state = ES_WANTLPAREN;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
958 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
959 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
960 m = macrotable_findlen(buf, len, false);
42
ad7763329eba Don't crash if a macro tries to expand itself recursively.
David A. Holland
parents: 40
diff changeset
961 if (m == NULL || m->inuse) {
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
962 expand_send(es, p, buf, len);
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
963 } else if (m->isspecial) {
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
964 es->curmacro = m;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
965 newbuf = expand_substitute(p, es);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
966 expand_send(es, p, newbuf, strlen(newbuf));
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
967 dostrfree(newbuf);
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
968 es->curmacro = NULL;
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
969 m->inuse = false;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
970 } else if (!m->hasparams) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
971 m->inuse = true;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
972 assert(expansionitemarray_num(&m->expansion) == 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
973 ei = expansionitemarray_get(&m->expansion, 0);
159
8cef6d7227a8 Expand __FILE__ and __LINE__.
Joerg Sonnenberger <joerg@bec.de>
parents: 158
diff changeset
974 assert(ei->itemtype == EI_STRING);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
975 newbuf = macroexpand(p, ei->string,
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
976 strlen(ei->string), false);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
977 doexpand(es, p, newbuf, strlen(newbuf));
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
978 dostrfree(newbuf);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
979 m->inuse = false;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
980 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
981 es->curmacro = m;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
982 es->state = ES_WANTLPAREN;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
983 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
984 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
985 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
986 if (es->curmacro != NULL) {
87
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
987 expand_missingargs(es, p, true);
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
988 es->state = ES_NORMAL;
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
989 /* try again */
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
990 expand_got_word(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
991 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
992 /* "defined foo" means "defined(foo)" */
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
993 expand_newarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
994 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
995 expand_domacro(es, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
996 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
997 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
998 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
999 expand_newarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1000 es->state = ES_HAVEARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1001 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1002 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1003 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1004 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1005 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1006 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1007
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1008 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1009 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1010 expand_got_lparen(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1011 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1012 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1013 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
1014 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1015 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1016 case ES_WANTLPAREN:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1017 es->state = ES_NOARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1018 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1019 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1020 expand_newarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1021 es->state = ES_HAVEARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1022 es->argparens++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1023 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1024 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1025 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1026 es->argparens++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1027 break;
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
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1031 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1032 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1033 expand_got_rparen(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1034 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1035 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1036 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
1037 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1038 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1039 case ES_WANTLPAREN:
87
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1040 expand_missingargs(es, p, false);
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1041 es->state = ES_NORMAL;
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1042 /* try again */
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1043 expand_got_rparen(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1044 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1045 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1046 assert(es->argparens == 0);
117
c46959e2d9ef Handle empty arguments properly when there's more than one argument.
David A. Holland
parents: 107
diff changeset
1047 if (stringarray_num(&es->args) > 0) {
c46959e2d9ef Handle empty arguments properly when there's more than one argument.
David A. Holland
parents: 107
diff changeset
1048 /* we are after a comma; enter an empty argument */
c46959e2d9ef Handle empty arguments properly when there's more than one argument.
David A. Holland
parents: 107
diff changeset
1049 expand_newarg(es, buf, 0);
c46959e2d9ef Handle empty arguments properly when there's more than one argument.
David A. Holland
parents: 107
diff changeset
1050 }
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1051 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1052 expand_domacro(es, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1053 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1054 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1055 if (es->argparens > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1056 es->argparens--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1057 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1058 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1059 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1060 expand_domacro(es, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1061 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1062 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1063 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1064 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1065
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1066 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1067 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1068 expand_got_comma(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1069 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1070 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1071 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
1072 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1073 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1074 case ES_WANTLPAREN:
87
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1075 expand_missingargs(es, p, false);
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1076 es->state = ES_NORMAL;
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1077 /* try again */
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1078 expand_got_comma(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1079 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1080 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1081 assert(es->argparens == 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1082 expand_newarg(es, buf, 0);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1083 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1084 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1085 if (es->argparens > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1086 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1087 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1088 es->state = ES_NOARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1089 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1090 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1091 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1092 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1093
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1094 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1095 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1096 expand_got_other(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1097 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1098 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1099 case ES_NORMAL:
21
e3fab8f1b52c strip comments.
David A. Holland
parents: 19
diff changeset
1100 expand_send(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1101 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1102 case ES_WANTLPAREN:
87
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1103 expand_missingargs(es, p, false);
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1104 es->state = ES_NORMAL;
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1105 /* try again */
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1106 expand_got_other(es, p, buf, len);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1107 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1108 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1109 expand_newarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1110 es->state = ES_HAVEARG;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1111 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1112 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1113 expand_appendarg(es, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1114 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1115 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1116 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1117
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1118 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1119 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1120 expand_got_eof(struct expstate *es, struct place *p)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1121 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1122 switch (es->state) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1123 case ES_NORMAL:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1124 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1125 case ES_WANTLPAREN:
87
2b153df78214 Don't bomb out if a function-like macro is given no arguments.
David A. Holland
parents: 85
diff changeset
1126 expand_missingargs(es, p, false);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1127 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1128 case ES_NOARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1129 case ES_HAVEARG:
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1130 if (es->curmacro) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1131 complain(p, "Unclosed argument list for macro %s",
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1132 es->curmacro->name);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1133 } else {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1134 complain(p, "Unclosed argument list for defined()");
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1135 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1136 complain_fail();
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1137 expstate_destroyargs(es);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1138 break;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1139 }
88
36066289e31a Always send the expansion state an EOF.
David A. Holland
parents: 87
diff changeset
1140 expand_send_eof(es, p);
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1141 es->state = ES_NORMAL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1142 es->curmacro = NULL;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1143 es->argparens = 0;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1144 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1145
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1146 static
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1147 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1148 doexpand(struct expstate *es, struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1149 {
85
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1150 char *s;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1151 size_t x;
85
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1152 bool inquote = false;
128
1cda505ddc78 Don't expand macros within character constants.
David A. Holland
parents: 118
diff changeset
1153 char quote = '\0';
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1154
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1155 while (len > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1156 x = strspn(buf, ws);
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1157 if (x > len) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1158 /* XXX gross, need strnspn */
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1159 x = len;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1160 }
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1161
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1162 if (x > 0) {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1163 expand_got_ws(es, p, buf, x);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1164 buf += x;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1165 len -= x;
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1166 continue;
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1167 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1168
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1169 x = strspn(buf, alnum);
28
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1170 if (x > len) {
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1171 /* XXX gross, need strnspn */
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1172 x = len;
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1173 }
8a955e3dda2c two more tests, more fixes
David A. Holland
parents: 27
diff changeset
1174
145
a403605d3166 Fix handling of macros in quoted strings.
David A. Holland
parents: 144
diff changeset
1175 if (!inquote && x > 0) {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1176 expand_got_word(es, p, buf, x);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1177 buf += x;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1178 len -= x;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1179 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1180 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1181
85
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1182 if (!inquote && len > 1 && buf[0] == '/' && buf[1] == '*') {
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1183 s = strstr(buf, "*/");
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1184 if (s) {
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1185 x = s - buf;
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1186 } else {
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1187 x = len;
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1188 }
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1189 expand_got_ws(es, p, buf, x);
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1190 buf += x;
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1191 len -= x;
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1192 continue;
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1193 }
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1194
129
2e1496dd96c4 Don't recognize macro argument parens or commas within quotes.
David A. Holland
parents: 128
diff changeset
1195 if (!inquote && buf[0] == '(') {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1196 expand_got_lparen(es, p, buf, 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1197 buf++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1198 len--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1199 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1200 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1201
129
2e1496dd96c4 Don't recognize macro argument parens or commas within quotes.
David A. Holland
parents: 128
diff changeset
1202 if (!inquote && buf[0] == ')') {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1203 expand_got_rparen(es, p, buf, 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1204 buf++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1205 len--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1206 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1207 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1208
129
2e1496dd96c4 Don't recognize macro argument parens or commas within quotes.
David A. Holland
parents: 128
diff changeset
1209 if (!inquote && buf[0] == ',') {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1210 expand_got_comma(es, p, buf, 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1211 buf++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1212 len--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1213 continue;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1214 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1215
128
1cda505ddc78 Don't expand macros within character constants.
David A. Holland
parents: 118
diff changeset
1216 if (len > 1 && buf[0] == '\\' &&
1cda505ddc78 Don't expand macros within character constants.
David A. Holland
parents: 118
diff changeset
1217 (buf[1] == '"' || buf[1] == '\'')) {
85
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1218 expand_got_other(es, p, buf, 2);
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1219 buf += 2;
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1220 len -= 2;
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1221 continue;
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1222 }
128
1cda505ddc78 Don't expand macros within character constants.
David A. Holland
parents: 118
diff changeset
1223 if (!inquote && (buf[0] == '"' || buf[0] == '\'')) {
1cda505ddc78 Don't expand macros within character constants.
David A. Holland
parents: 118
diff changeset
1224 inquote = true;
1cda505ddc78 Don't expand macros within character constants.
David A. Holland
parents: 118
diff changeset
1225 quote = buf[0];
1cda505ddc78 Don't expand macros within character constants.
David A. Holland
parents: 118
diff changeset
1226 } else if (inquote && buf[0] == quote) {
1cda505ddc78 Don't expand macros within character constants.
David A. Holland
parents: 118
diff changeset
1227 inquote = false;
85
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1228 }
c91dc1315745 Don't expand macros inside comments.
David A. Holland
parents: 84
diff changeset
1229
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1230 expand_got_other(es, p, buf, 1);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1231 buf++;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1232 len--;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1233 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1234 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1235
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1236 char *
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1237 macroexpand(struct place *p, char *buf, size_t len, bool honordefined)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1238 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1239 struct expstate es;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1240 char *ret;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1241
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1242 expstate_init(&es, true, honordefined);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1243 doexpand(&es, p, buf, len);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1244 expand_got_eof(&es, p);
40
291fefe664f2 Oops, fix previous.
David A. Holland
parents: 39
diff changeset
1245
291fefe664f2 Oops, fix previous.
David A. Holland
parents: 39
diff changeset
1246 /* trim to fit, so the malloc debugging won't complain */
291fefe664f2 Oops, fix previous.
David A. Holland
parents: 39
diff changeset
1247 es.buf = dorealloc(es.buf, es.bufmax, strlen(es.buf) + 1);
291fefe664f2 Oops, fix previous.
David A. Holland
parents: 39
diff changeset
1248
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1249 ret = es.buf;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1250 es.buf = NULL;
39
337110e7240a Pass the size to free; it makes debug checking easier.
David A. Holland
parents: 38
diff changeset
1251 es.bufpos = es.bufmax = 0;
40
291fefe664f2 Oops, fix previous.
David A. Holland
parents: 39
diff changeset
1252
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1253 expstate_cleanup(&es);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1254
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1255 return ret;
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1256 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1257
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1258 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1259 macro_sendline(struct place *p, char *buf, size_t len)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1260 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1261 doexpand(&mainstate, p, buf, len);
162
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1262 switch (mainstate.state) {
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1263 case ES_NORMAL:
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1264 output(p, "\n", 1);
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1265 break;
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1266 case ES_WANTLPAREN:
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1267 case ES_NOARG:
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1268 case ES_HAVEARG:
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1269 expand_got_ws(&mainstate, p, " ", 1);
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1270 break;
82cc6fa54b01 newline during a macro invocation counts as space. Behavior differs from
Joerg Sonnenberger <joerg@bec.de>
parents: 161
diff changeset
1271 }
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1272 }
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1273
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1274 void
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1275 macro_sendeof(struct place *p)
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1276 {
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1277 expand_got_eof(&mainstate, p);
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1278 }
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1279
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1280 ////////////////////////////////////////////////////////////
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1281 // module initialization
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1282
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1283 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1284 macros_init(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1285 {
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1286 macrotable_init();
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1287 expstate_init(&mainstate, false, false);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1288 }
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1289
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1290 void
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1291 macros_cleanup(void)
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1292 {
19
f9792a9ec704 macro expansion.
David A. Holland
parents: 18
diff changeset
1293 expstate_cleanup(&mainstate);
17
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1294 macrotable_cleanup();
76da41da923f added macro table
David A. Holland
parents:
diff changeset
1295 }