Mercurial > ~dholland > hg > tradcpp > index.cgi
annotate directive.c @ 127:a0a86380456e
fix for #if handling:
Don't eval the control expression of the first #if of a block when
already in a false block; it might not be valid. Reported by
Baptiste Daroussin.
| author | David A. Holland |
|---|---|
| date | Wed, 12 Jun 2013 10:52:56 -0400 |
| parents | 4483a14ee101 |
| children | 1cda505ddc78 |
| rev | line source |
|---|---|
| 30 | 1 /*- |
|
99
60184aa42604
add 2013 to copyrights where it seems warranted
David A. Holland
parents:
90
diff
changeset
|
2 * Copyright (c) 2010, 2013 The NetBSD Foundation, Inc. |
| 30 | 3 * All rights reserved. |
| 4 * | |
| 5 * This code is derived from software contributed to The NetBSD Foundation | |
| 6 * by David A. Holland. | |
| 7 * | |
| 8 * Redistribution and use in source and binary forms, with or without | |
| 9 * modification, are permitted provided that the following conditions | |
| 10 * are met: | |
| 11 * 1. Redistributions of source code must retain the above copyright | |
| 12 * notice, this list of conditions and the following disclaimer. | |
| 13 * 2. Redistributions in binary form must reproduce the above copyright | |
| 14 * notice, this list of conditions and the following disclaimer in the | |
| 15 * documentation and/or other materials provided with the distribution. | |
| 16 * | |
| 17 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
| 18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
| 19 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
| 20 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
| 21 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
| 22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
| 23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
| 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
| 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
| 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
| 27 * POSSIBILITY OF SUCH DAMAGE. | |
| 28 */ | |
| 29 | |
| 15 | 30 #include <assert.h> |
| 31 #include <stdbool.h> | |
| 32 #include <stdlib.h> | |
| 33 #include <string.h> | |
| 34 | |
| 35 #include "utils.h" | |
| 36 #include "mode.h" | |
| 37 #include "place.h" | |
| 38 #include "files.h" | |
| 39 #include "directive.h" | |
| 40 #include "macro.h" | |
| 41 #include "eval.h" | |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
42 #include "output.h" |
| 15 | 43 |
| 44 struct ifstate { | |
| 45 struct ifstate *prev; | |
| 46 struct place startplace; | |
| 47 bool curtrue; | |
| 48 bool evertrue; | |
| 49 bool seenelse; | |
| 50 }; | |
| 51 | |
| 52 static struct ifstate *ifstate; | |
| 53 | |
| 54 //////////////////////////////////////////////////////////// | |
| 55 // common parsing bits | |
| 56 | |
| 57 static | |
| 58 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
59 uncomment(char *buf) |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
60 { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
61 char *s, *t, *u = NULL; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
62 bool incomment = false; |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
63 bool inesc = false; |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
64 bool inquote = false; |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
65 |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
66 for (s = t = buf; *s; s++) { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
67 if (incomment) { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
68 if (s[0] == '*' && s[1] == '/') { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
69 s++; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
70 incomment = false; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
71 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
72 } else { |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
73 if (!inquote && s[0] == '/' && s[1] == '*') { |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
74 incomment = true; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
75 } else { |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
76 if (inesc) { |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
77 inesc = false; |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
78 } else if (s[0] == '\\') { |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
79 inesc = true; |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
80 } else if (s[0] == '"') { |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
81 inquote = !inquote; |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
82 } |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
77
diff
changeset
|
83 |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
84 if (t != s) { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
85 *t = *s; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
86 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
87 if (!strchr(ws, *t)) { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
88 u = t; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
89 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
90 t++; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
91 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
92 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
93 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
94 if (u) { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
95 /* end string after last non-whitespace char */ |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
96 u[1] = '\0'; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
97 } else { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
98 *t = '\0'; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
99 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
100 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
101 |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
102 static |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
103 void |
| 15 | 104 oneword(const char *what, struct place *p2, char *line) |
| 105 { | |
| 106 size_t pos; | |
| 107 | |
| 108 pos = strcspn(line, ws); | |
| 109 if (line[pos] != '\0') { | |
| 110 p2->column += pos; | |
| 111 complain(p2, "Garbage after %s argument", what); | |
| 112 complain_fail(); | |
| 113 line[pos] = '\0'; | |
| 114 } | |
| 115 } | |
| 116 | |
| 117 //////////////////////////////////////////////////////////// | |
| 118 // if handling | |
| 119 | |
| 120 static | |
| 121 struct ifstate * | |
| 122 ifstate_create(struct ifstate *prev, struct place *p, bool startstate) | |
| 123 { | |
| 124 struct ifstate *is; | |
| 125 | |
| 126 is = domalloc(sizeof(*is)); | |
| 127 is->prev = prev; | |
| 128 if (p != NULL) { | |
| 129 is->startplace = *p; | |
| 130 } else { | |
| 131 place_setbuiltin(&is->startplace, 1); | |
| 132 } | |
| 133 is->curtrue = startstate; | |
| 134 is->evertrue = is->curtrue; | |
| 135 is->seenelse = false; | |
| 136 return is; | |
| 137 } | |
| 138 | |
| 139 static | |
| 140 void | |
| 141 ifstate_destroy(struct ifstate *is) | |
| 142 { | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
143 dofree(is, sizeof(*is)); |
| 15 | 144 } |
| 145 | |
| 146 static | |
| 147 void | |
| 148 ifstate_push(struct place *p, bool startstate) | |
| 149 { | |
| 72 | 150 struct ifstate *newstate; |
| 151 | |
| 152 newstate = ifstate_create(ifstate, p, startstate); | |
| 153 if (!ifstate->curtrue) { | |
| 154 newstate->curtrue = false; | |
| 155 newstate->evertrue = true; | |
| 156 } | |
| 157 ifstate = newstate; | |
| 15 | 158 } |
| 159 | |
| 160 static | |
| 161 void | |
| 162 ifstate_pop(void) | |
| 163 { | |
| 164 struct ifstate *is; | |
| 165 | |
| 166 is = ifstate; | |
| 167 ifstate = ifstate->prev; | |
| 168 ifstate_destroy(is); | |
| 169 } | |
| 170 | |
| 171 static | |
| 172 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
173 d_if(struct place *p, struct place *p2, char *line) |
| 15 | 174 { |
| 175 char *expr; | |
| 176 bool val; | |
| 16 | 177 struct place p3 = *p2; |
|
82
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
178 size_t oldlen; |
| 15 | 179 |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
180 expr = macroexpand(p2, line, strlen(line), true); |
|
82
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
181 |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
182 oldlen = strlen(expr); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
183 uncomment(expr); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
184 /* trim to fit, so the malloc debugging won't complain */ |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
185 expr = dorealloc(expr, oldlen + 1, strlen(expr) + 1); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
186 |
| 127 | 187 if (ifstate->curtrue) { |
| 188 val = eval(&p3, expr); | |
| 189 } else { | |
| 190 val = 0; | |
| 191 } | |
| 15 | 192 ifstate_push(p, val); |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
193 dostrfree(expr); |
| 15 | 194 } |
| 195 | |
| 196 static | |
| 197 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
198 d_ifdef(struct place *p, struct place *p2, char *line) |
| 15 | 199 { |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
200 uncomment(line); |
| 15 | 201 oneword("#ifdef", p2, line); |
| 202 ifstate_push(p, macro_isdefined(line)); | |
| 203 } | |
| 204 | |
| 205 static | |
| 206 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
207 d_ifndef(struct place *p, struct place *p2, char *line) |
| 15 | 208 { |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
209 uncomment(line); |
| 15 | 210 oneword("#ifndef", p2, line); |
| 211 ifstate_push(p, !macro_isdefined(line)); | |
| 212 } | |
| 213 | |
| 214 static | |
| 215 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
216 d_elif(struct place *p, struct place *p2, char *line) |
| 15 | 217 { |
| 218 char *expr; | |
| 16 | 219 struct place p3 = *p2; |
|
82
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
220 size_t oldlen; |
| 15 | 221 |
| 222 if (ifstate->seenelse) { | |
| 223 complain(p, "#elif after #else"); | |
| 224 complain_fail(); | |
| 225 } | |
| 226 | |
| 227 if (ifstate->evertrue) { | |
| 228 ifstate->curtrue = false; | |
| 229 } else { | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
230 expr = macroexpand(p2, line, strlen(line), true); |
|
82
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
231 |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
232 oldlen = strlen(expr); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
233 uncomment(expr); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
234 /* trim to fit, so the malloc debugging won't complain */ |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
235 expr = dorealloc(expr, oldlen + 1, strlen(expr) + 1); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
236 |
| 16 | 237 ifstate->curtrue = eval(&p3, expr); |
| 15 | 238 ifstate->evertrue = ifstate->curtrue; |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
239 dostrfree(expr); |
| 15 | 240 } |
| 241 } | |
| 242 | |
| 243 static | |
| 244 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
245 d_else(struct place *p, struct place *p2, char *line) |
| 15 | 246 { |
| 103 | 247 (void)p2; |
| 248 (void)line; | |
| 249 | |
| 15 | 250 if (ifstate->seenelse) { |
| 251 complain(p, "Multiple #else directives in one conditional"); | |
| 252 complain_fail(); | |
| 253 } | |
| 254 | |
| 255 ifstate->curtrue = !ifstate->evertrue; | |
| 256 ifstate->evertrue = true; | |
| 257 ifstate->seenelse = true; | |
| 258 } | |
| 259 | |
| 260 static | |
| 261 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
262 d_endif(struct place *p, struct place *p2, char *line) |
| 15 | 263 { |
| 103 | 264 (void)p2; |
| 265 (void)line; | |
| 266 | |
| 15 | 267 if (ifstate->prev == NULL) { |
| 268 complain(p, "Unmatched #endif"); | |
| 269 complain_fail(); | |
| 270 } else { | |
| 271 ifstate_pop(); | |
| 272 } | |
| 273 } | |
| 274 | |
| 275 //////////////////////////////////////////////////////////// | |
| 276 // macros | |
| 277 | |
| 278 static | |
| 279 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
280 d_define(struct place *p, struct place *p2, char *line) |
| 15 | 281 { |
| 18 | 282 size_t pos, argpos; |
| 283 struct place p3, p4; | |
| 15 | 284 |
| 103 | 285 (void)p; |
| 286 | |
| 15 | 287 /* |
| 288 * line may be: | |
| 289 * macro expansion | |
| 290 * macro(arg, arg, ...) expansion | |
| 291 */ | |
| 292 | |
| 293 pos = strcspn(line, " \t\f\v("); | |
| 294 if (line[pos] == '(') { | |
| 18 | 295 line[pos++] = '\0'; |
| 296 argpos = pos; | |
| 15 | 297 pos = pos + strcspn(line+pos, "()"); |
| 298 if (line[pos] == '(') { | |
| 299 p2->column += pos; | |
| 300 complain(p2, "Left parenthesis in macro parameters"); | |
| 301 complain_fail(); | |
| 302 return; | |
| 303 } | |
| 304 if (line[pos] != ')') { | |
| 305 p2->column += pos; | |
| 306 complain(p2, "Unclosed macro parameter list"); | |
| 307 complain_fail(); | |
| 308 return; | |
| 309 } | |
| 18 | 310 line[pos++] = '\0'; |
|
36
a489cc223483
Don't demand space after the macro argument parenthesis.
David A. Holland
parents:
30
diff
changeset
|
311 #if 0 |
| 15 | 312 if (!strchr(ws, line[pos])) { |
| 313 p2->column += pos; | |
| 314 complain(p2, "Trash after macro parameter list"); | |
| 315 complain_fail(); | |
| 316 return; | |
| 317 } | |
|
36
a489cc223483
Don't demand space after the macro argument parenthesis.
David A. Holland
parents:
30
diff
changeset
|
318 #endif |
| 15 | 319 } else if (line[pos] == '\0') { |
| 18 | 320 argpos = 0; |
| 15 | 321 } else { |
| 322 line[pos++] = '\0'; | |
| 18 | 323 argpos = 0; |
| 15 | 324 } |
| 325 | |
| 326 pos += strspn(line+pos, ws); | |
| 327 | |
| 328 p3 = *p2; | |
| 18 | 329 p3.column += argpos; |
| 330 | |
| 331 p4 = *p2; | |
| 332 p4.column += pos; | |
| 333 | |
| 334 if (argpos) { | |
| 335 macro_define_params(p2, line, &p3, | |
| 336 line + argpos, &p4, | |
| 337 line + pos); | |
| 338 } else { | |
| 339 macro_define_plain(p2, line, &p4, line + pos); | |
| 340 } | |
| 15 | 341 } |
| 342 | |
| 343 static | |
| 344 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
345 d_undef(struct place *p, struct place *p2, char *line) |
| 15 | 346 { |
| 103 | 347 (void)p; |
| 348 | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
349 uncomment(line); |
| 15 | 350 oneword("#undef", p2, line); |
| 351 macro_undef(line); | |
| 352 } | |
| 353 | |
| 354 //////////////////////////////////////////////////////////// | |
| 355 // includes | |
| 356 | |
| 357 static | |
| 358 bool | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
359 tryinclude(struct place *p, char *line) |
| 15 | 360 { |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
361 size_t len; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
362 |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
363 len = strlen(line); |
| 15 | 364 if (len > 2 && line[0] == '"' && line[len-1] == '"') { |
| 365 line[len-1] = '\0'; | |
| 366 file_readquote(p, line+1); | |
|
62
90c6052410ce
Don't truncate the candidate include path strings.
David A. Holland
parents:
49
diff
changeset
|
367 line[len-1] = '"'; |
| 15 | 368 return true; |
| 369 } | |
| 370 if (len > 2 && line[0] == '<' && line[len-1] == '>') { | |
| 371 line[len-1] = '\0'; | |
| 372 file_readbracket(p, line+1); | |
|
62
90c6052410ce
Don't truncate the candidate include path strings.
David A. Holland
parents:
49
diff
changeset
|
373 line[len-1] = '>'; |
| 15 | 374 return true; |
| 375 } | |
| 376 return false; | |
| 377 } | |
| 378 | |
| 379 static | |
| 380 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
381 d_include(struct place *p, struct place *p2, char *line) |
| 15 | 382 { |
| 383 char *text; | |
|
82
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
384 size_t oldlen; |
| 15 | 385 |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
386 uncomment(line); |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
387 if (tryinclude(p, line)) { |
| 15 | 388 return; |
| 389 } | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
390 text = macroexpand(p2, line, strlen(line), false); |
|
82
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
391 |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
392 oldlen = strlen(text); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
393 uncomment(text); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
394 /* trim to fit, so the malloc debugging won't complain */ |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
395 text = dorealloc(text, oldlen + 1, strlen(text) + 1); |
|
05a94332f08b
In #if/#elif, prune comments *after* macro expansion.
David A. Holland
parents:
81
diff
changeset
|
396 |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
397 if (tryinclude(p, text)) { |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
398 dostrfree(text); |
| 15 | 399 return; |
| 400 } | |
| 90 | 401 complain(p, "Illegal #include directive"); |
| 402 complain(p, "Before macro expansion: #include %s", line); | |
| 403 complain(p, "After macro expansion: #include %s", text); | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
404 dostrfree(text); |
| 15 | 405 complain_fail(); |
| 406 } | |
| 407 | |
| 408 static | |
| 409 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
410 d_line(struct place *p, struct place *p2, char *line) |
| 15 | 411 { |
| 103 | 412 (void)p2; |
| 413 (void)line; | |
| 414 | |
| 15 | 415 /* XXX */ |
| 416 complain(p, "Sorry, no #line yet"); | |
| 417 } | |
| 418 | |
| 419 //////////////////////////////////////////////////////////// | |
| 420 // messages | |
| 421 | |
| 422 static | |
| 423 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
424 d_warning(struct place *p, struct place *p2, char *line) |
| 15 | 425 { |
| 426 char *msg; | |
| 427 | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
428 msg = macroexpand(p2, line, strlen(line), false); |
| 15 | 429 complain(p, "#warning: %s", msg); |
| 430 if (mode.werror) { | |
| 431 complain_fail(); | |
| 432 } | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
433 dostrfree(msg); |
| 15 | 434 } |
| 435 | |
| 436 static | |
| 437 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
438 d_error(struct place *p, struct place *p2, char *line) |
| 15 | 439 { |
| 440 char *msg; | |
| 441 | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
442 msg = macroexpand(p2, line, strlen(line), false); |
| 15 | 443 complain(p, "#error: %s", msg); |
| 444 complain_fail(); | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
445 dostrfree(msg); |
| 15 | 446 } |
| 447 | |
| 448 //////////////////////////////////////////////////////////// | |
| 449 // other | |
| 450 | |
| 451 static | |
| 452 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
453 d_pragma(struct place *p, struct place *p2, char *line) |
| 15 | 454 { |
| 103 | 455 (void)p2; |
| 456 | |
| 15 | 457 complain(p, "#pragma %s", line); |
| 458 complain_fail(); | |
| 459 } | |
| 460 | |
| 461 //////////////////////////////////////////////////////////// | |
| 462 // directive table | |
| 463 | |
| 464 static const struct { | |
| 465 const char *name; | |
| 466 bool ifskip; | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
467 void (*func)(struct place *, struct place *, char *line); |
| 15 | 468 } directives[] = { |
| 469 { "define", true, d_define }, | |
| 470 { "elif", false, d_elif }, | |
| 471 { "else", false, d_else }, | |
| 472 { "endif", false, d_endif }, | |
| 473 { "error", true, d_error }, | |
| 474 { "if", false, d_if }, | |
| 475 { "ifdef", false, d_ifdef }, | |
| 476 { "ifndef", false, d_ifndef }, | |
| 477 { "include", true, d_include }, | |
| 478 { "line", true, d_line }, | |
| 479 { "pragma", true, d_pragma }, | |
| 480 { "undef", true, d_undef }, | |
| 481 { "warning", true, d_warning }, | |
| 482 }; | |
| 483 static const unsigned numdirectives = HOWMANY(directives); | |
| 484 | |
| 485 static | |
| 486 void | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
487 directive_gotdirective(struct place *p, char *line) |
| 15 | 488 { |
| 489 struct place p2; | |
| 490 size_t len, skip; | |
| 491 unsigned i; | |
| 492 | |
| 493 p2 = *p; | |
| 494 for (i=0; i<numdirectives; i++) { | |
| 495 len = strlen(directives[i].name); | |
| 496 if (!strncmp(line, directives[i].name, len) && | |
| 497 strchr(ws, line[len])) { | |
| 498 if (directives[i].ifskip && !ifstate->curtrue) { | |
| 499 return; | |
| 500 } | |
| 501 skip = len + strspn(line+len, ws); | |
| 502 p2.column += skip; | |
| 503 line += skip; | |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
504 |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
505 len = strlen(line); |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
506 len = notrailingws(line, len); |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
507 if (len < strlen(line)) { |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
508 line[len] = '\0'; |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
509 } |
|
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
510 directives[i].func(p, &p2, line); |
| 15 | 511 return; |
| 512 } | |
| 513 } | |
|
83
3e505c16b0b0
Accept # by itself, including with a comment after it.
David A. Holland
parents:
82
diff
changeset
|
514 /* ugh. allow # by itself, including with a comment after it */ |
|
3e505c16b0b0
Accept # by itself, including with a comment after it.
David A. Holland
parents:
82
diff
changeset
|
515 uncomment(line); |
|
3e505c16b0b0
Accept # by itself, including with a comment after it.
David A. Holland
parents:
82
diff
changeset
|
516 if (line[0] == '\0') { |
|
3e505c16b0b0
Accept # by itself, including with a comment after it.
David A. Holland
parents:
82
diff
changeset
|
517 return; |
|
3e505c16b0b0
Accept # by itself, including with a comment after it.
David A. Holland
parents:
82
diff
changeset
|
518 } |
|
3e505c16b0b0
Accept # by itself, including with a comment after it.
David A. Holland
parents:
82
diff
changeset
|
519 |
| 15 | 520 skip = strcspn(line, ws); |
| 521 complain(p, "Unknown directive #%.*s", (int)skip, line); | |
| 522 complain_fail(); | |
| 523 } | |
| 524 | |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
525 /* |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
526 * Check for nested comment delimiters in LINE. |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
527 */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
528 static |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
529 size_t |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
530 directive_scancomments(const struct place *p, char *line, size_t len) |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
531 { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
532 size_t pos; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
533 bool incomment; |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
534 struct place p2; |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
535 |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
536 p2 = *p; |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
537 incomment = 0; |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
538 for (pos = 0; pos+1 < len; pos++) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
539 if (line[pos] == '/' && line[pos+1] == '*') { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
540 if (incomment) { |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
541 complain(&p2, "Warning: %c%c within comment", |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
542 '/', '*'); |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
543 if (mode.werror) { |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
544 complain_failed(); |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
545 } |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
546 } else { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
547 incomment = true; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
548 } |
| 109 | 549 pos++; |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
550 } else if (line[pos] == '*' && line[pos+1] == '/') { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
551 if (incomment) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
552 incomment = false; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
553 } else { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
554 /* stray end-comment; should we care? */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
555 } |
| 109 | 556 pos++; |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
557 } |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
558 if (line[pos] == '\n') { |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
559 p2.line++; |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
560 p2.column = 0; |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
561 } else { |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
562 p2.column++; |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
563 } |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
564 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
565 |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
566 /* multiline comments are supposed to arrive in a single buffer */ |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
567 assert(!incomment); |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
568 return len; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
569 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
570 |
| 15 | 571 void |
| 572 directive_gotline(struct place *p, char *line, size_t len) | |
| 573 { | |
| 574 size_t skip; | |
| 575 | |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
576 if (warns.nestcomment) { |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
577 directive_scancomments(p, line, len); |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
578 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
579 |
|
66
f8507e5ed84c
Recognize directive lines only when the # is exactly in column 0.
David A. Holland
parents:
64
diff
changeset
|
580 /* check if we have a directive line (# exactly in column 0) */ |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
581 if (line[0] == '#') { |
|
66
f8507e5ed84c
Recognize directive lines only when the # is exactly in column 0.
David A. Holland
parents:
64
diff
changeset
|
582 skip = 1 + strspn(line + 1, ws); |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
583 assert(skip <= len); |
| 15 | 584 p->column += skip; |
|
64
f50b4ea6cbfe
Prune single-line comments from (most) directive lines.
David A. Holland
parents:
62
diff
changeset
|
585 assert(line[len] == '\0'); |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
586 directive_gotdirective(p, line+skip /*, length = len-skip */); |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
587 p->column += len-skip; |
| 15 | 588 } else if (ifstate->curtrue) { |
|
77
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
589 macro_sendline(p, line, len); |
|
123168887da8
Clean out old not-really-working nested comment handling.
David A. Holland
parents:
72
diff
changeset
|
590 p->column += len; |
| 15 | 591 } |
| 592 } | |
| 593 | |
| 594 void | |
| 595 directive_goteof(struct place *p) | |
| 596 { | |
| 597 while (ifstate->prev != NULL) { | |
| 598 complain(p, "Missing #endif"); | |
| 599 complain(&ifstate->startplace, "...opened at this point"); | |
| 600 complain_failed(); | |
| 601 ifstate_pop(); | |
| 602 } | |
| 603 macro_sendeof(p); | |
| 604 } | |
| 605 | |
| 606 //////////////////////////////////////////////////////////// | |
| 607 // module initialization | |
| 608 | |
| 609 void | |
| 610 directive_init(void) | |
| 611 { | |
| 612 ifstate = ifstate_create(NULL, NULL, true); | |
| 613 } | |
| 614 | |
| 615 void | |
| 616 directive_cleanup(void) | |
| 617 { | |
| 618 assert(ifstate->prev == NULL); | |
| 619 ifstate_destroy(ifstate); | |
| 620 ifstate = NULL; | |
| 621 } |