Mercurial > ~dholland > hg > tradcpp > index.cgi
annotate directive.c @ 49:8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
Fixes all of the pathological comment behavior we've noticed so far.
| author | David A. Holland |
|---|---|
| date | Sun, 31 Mar 2013 01:04:43 -0400 |
| parents | 337110e7240a |
| children | 90c6052410ce |
| rev | line source |
|---|---|
| 30 | 1 /*- |
| 2 * Copyright (c) 2010 The NetBSD Foundation, Inc. | |
| 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; | |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
53 static bool in_multiline_comment; |
| 15 | 54 |
| 55 //////////////////////////////////////////////////////////// | |
| 56 // common parsing bits | |
| 57 | |
| 58 static | |
| 59 void | |
| 60 oneword(const char *what, struct place *p2, char *line) | |
| 61 { | |
| 62 size_t pos; | |
| 63 | |
| 64 pos = strcspn(line, ws); | |
| 65 if (line[pos] != '\0') { | |
| 66 p2->column += pos; | |
| 67 complain(p2, "Garbage after %s argument", what); | |
| 68 complain_fail(); | |
| 69 line[pos] = '\0'; | |
| 70 } | |
| 71 } | |
| 72 | |
| 73 //////////////////////////////////////////////////////////// | |
| 74 // if handling | |
| 75 | |
| 76 static | |
| 77 struct ifstate * | |
| 78 ifstate_create(struct ifstate *prev, struct place *p, bool startstate) | |
| 79 { | |
| 80 struct ifstate *is; | |
| 81 | |
| 82 is = domalloc(sizeof(*is)); | |
| 83 is->prev = prev; | |
| 84 if (p != NULL) { | |
| 85 is->startplace = *p; | |
| 86 } else { | |
| 87 place_setbuiltin(&is->startplace, 1); | |
| 88 } | |
| 89 is->curtrue = startstate; | |
| 90 is->evertrue = is->curtrue; | |
| 91 is->seenelse = false; | |
| 92 return is; | |
| 93 } | |
| 94 | |
| 95 static | |
| 96 void | |
| 97 ifstate_destroy(struct ifstate *is) | |
| 98 { | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
99 dofree(is, sizeof(*is)); |
| 15 | 100 } |
| 101 | |
| 102 static | |
| 103 void | |
| 104 ifstate_push(struct place *p, bool startstate) | |
| 105 { | |
| 106 ifstate = ifstate_create(ifstate, p, startstate); | |
| 107 } | |
| 108 | |
| 109 static | |
| 110 void | |
| 111 ifstate_pop(void) | |
| 112 { | |
| 113 struct ifstate *is; | |
| 114 | |
| 115 is = ifstate; | |
| 116 ifstate = ifstate->prev; | |
| 117 ifstate_destroy(is); | |
| 118 } | |
| 119 | |
| 120 static | |
| 121 void | |
| 122 d_if(struct place *p, struct place *p2, char *line, size_t len) | |
| 123 { | |
| 124 char *expr; | |
| 125 bool val; | |
| 16 | 126 struct place p3 = *p2; |
| 15 | 127 |
| 128 expr = macroexpand(p2, line, len, true); | |
| 16 | 129 val = eval(&p3, expr); |
| 15 | 130 ifstate_push(p, val); |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
131 dostrfree(expr); |
| 15 | 132 } |
| 133 | |
| 134 static | |
| 135 void | |
| 136 d_ifdef(struct place *p, struct place *p2, char *line, size_t len) | |
| 137 { | |
| 138 oneword("#ifdef", p2, line); | |
| 139 ifstate_push(p, macro_isdefined(line)); | |
| 140 } | |
| 141 | |
| 142 static | |
| 143 void | |
| 144 d_ifndef(struct place *p, struct place *p2, char *line, size_t len) | |
| 145 { | |
| 146 oneword("#ifndef", p2, line); | |
| 147 ifstate_push(p, !macro_isdefined(line)); | |
| 148 } | |
| 149 | |
| 150 static | |
| 151 void | |
| 152 d_elif(struct place *p, struct place *p2, char *line, size_t len) | |
| 153 { | |
| 154 char *expr; | |
| 16 | 155 struct place p3 = *p2; |
| 15 | 156 |
| 157 if (ifstate->seenelse) { | |
| 158 complain(p, "#elif after #else"); | |
| 159 complain_fail(); | |
| 160 } | |
| 161 | |
| 162 if (ifstate->evertrue) { | |
| 163 ifstate->curtrue = false; | |
| 164 } else { | |
| 165 expr = macroexpand(p2, line, len, true); | |
| 16 | 166 ifstate->curtrue = eval(&p3, expr); |
| 15 | 167 ifstate->evertrue = ifstate->curtrue; |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
168 dostrfree(expr); |
| 15 | 169 } |
| 170 } | |
| 171 | |
| 172 static | |
| 173 void | |
| 174 d_else(struct place *p, struct place *p2, char *line, size_t len) | |
| 175 { | |
| 176 if (ifstate->seenelse) { | |
| 177 complain(p, "Multiple #else directives in one conditional"); | |
| 178 complain_fail(); | |
| 179 } | |
| 180 | |
| 181 ifstate->curtrue = !ifstate->evertrue; | |
| 182 ifstate->evertrue = true; | |
| 183 ifstate->seenelse = true; | |
| 184 } | |
| 185 | |
| 186 static | |
| 187 void | |
| 188 d_endif(struct place *p, struct place *p2, char *line, size_t len) | |
| 189 { | |
| 190 if (ifstate->prev == NULL) { | |
| 191 complain(p, "Unmatched #endif"); | |
| 192 complain_fail(); | |
| 193 } else { | |
| 194 ifstate_pop(); | |
| 195 } | |
| 196 } | |
| 197 | |
| 198 //////////////////////////////////////////////////////////// | |
| 199 // macros | |
| 200 | |
| 201 static | |
| 202 void | |
| 203 d_define(struct place *p, struct place *p2, char *line, size_t len) | |
| 204 { | |
| 18 | 205 size_t pos, argpos; |
| 206 struct place p3, p4; | |
| 15 | 207 |
| 208 /* | |
| 209 * line may be: | |
| 210 * macro expansion | |
| 211 * macro(arg, arg, ...) expansion | |
| 212 */ | |
| 213 | |
| 214 pos = strcspn(line, " \t\f\v("); | |
| 215 if (line[pos] == '(') { | |
| 18 | 216 line[pos++] = '\0'; |
| 217 argpos = pos; | |
| 15 | 218 pos = pos + strcspn(line+pos, "()"); |
| 219 if (line[pos] == '(') { | |
| 220 p2->column += pos; | |
| 221 complain(p2, "Left parenthesis in macro parameters"); | |
| 222 complain_fail(); | |
| 223 return; | |
| 224 } | |
| 225 if (line[pos] != ')') { | |
| 226 p2->column += pos; | |
| 227 complain(p2, "Unclosed macro parameter list"); | |
| 228 complain_fail(); | |
| 229 return; | |
| 230 } | |
| 18 | 231 line[pos++] = '\0'; |
|
36
a489cc223483
Don't demand space after the macro argument parenthesis.
David A. Holland
parents:
30
diff
changeset
|
232 #if 0 |
| 15 | 233 if (!strchr(ws, line[pos])) { |
| 234 p2->column += pos; | |
| 235 complain(p2, "Trash after macro parameter list"); | |
| 236 complain_fail(); | |
| 237 return; | |
| 238 } | |
|
36
a489cc223483
Don't demand space after the macro argument parenthesis.
David A. Holland
parents:
30
diff
changeset
|
239 #endif |
| 15 | 240 } else if (line[pos] == '\0') { |
| 18 | 241 argpos = 0; |
| 15 | 242 } else { |
| 243 line[pos++] = '\0'; | |
| 18 | 244 argpos = 0; |
| 15 | 245 } |
| 246 | |
| 247 pos += strspn(line+pos, ws); | |
| 248 | |
| 249 p3 = *p2; | |
| 18 | 250 p3.column += argpos; |
| 251 | |
| 252 p4 = *p2; | |
| 253 p4.column += pos; | |
| 254 | |
| 255 if (argpos) { | |
| 256 macro_define_params(p2, line, &p3, | |
| 257 line + argpos, &p4, | |
| 258 line + pos); | |
| 259 } else { | |
| 260 macro_define_plain(p2, line, &p4, line + pos); | |
| 261 } | |
| 15 | 262 } |
| 263 | |
| 264 static | |
| 265 void | |
| 266 d_undef(struct place *p, struct place *p2, char *line, size_t len) | |
| 267 { | |
| 268 oneword("#undef", p2, line); | |
| 269 macro_undef(line); | |
| 270 } | |
| 271 | |
| 272 //////////////////////////////////////////////////////////// | |
| 273 // includes | |
| 274 | |
| 275 static | |
| 276 bool | |
| 277 tryinclude(struct place *p, char *line, size_t len) | |
| 278 { | |
| 279 if (len > 2 && line[0] == '"' && line[len-1] == '"') { | |
| 280 line[len-1] = '\0'; | |
| 281 file_readquote(p, line+1); | |
| 282 return true; | |
| 283 } | |
| 284 if (len > 2 && line[0] == '<' && line[len-1] == '>') { | |
| 285 line[len-1] = '\0'; | |
| 286 file_readbracket(p, line+1); | |
| 287 return true; | |
| 288 } | |
| 289 return false; | |
| 290 } | |
| 291 | |
| 292 static | |
| 293 void | |
| 294 d_include(struct place *p, struct place *p2, char *line, size_t len) | |
| 295 { | |
| 296 char *text; | |
| 297 | |
| 298 if (tryinclude(p, line, len)) { | |
| 299 return; | |
| 300 } | |
| 301 text = macroexpand(p2, line, len, false); | |
| 302 if (tryinclude(p, text, strlen(text))) { | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
303 dostrfree(text); |
| 15 | 304 return; |
| 305 } | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
306 dostrfree(text); |
| 15 | 307 complain(p, "Illegal #include directive"); |
| 308 complain_fail(); | |
| 309 } | |
| 310 | |
| 311 static | |
| 312 void | |
| 313 d_line(struct place *p, struct place *p2, char *line, size_t len) | |
| 314 { | |
| 315 /* XXX */ | |
| 316 complain(p, "Sorry, no #line yet"); | |
| 317 } | |
| 318 | |
| 319 //////////////////////////////////////////////////////////// | |
| 320 // messages | |
| 321 | |
| 322 static | |
| 323 void | |
| 324 d_warning(struct place *p, struct place *p2, char *line, size_t len) | |
| 325 { | |
| 326 char *msg; | |
| 327 | |
| 328 msg = macroexpand(p2, line, len, false); | |
| 329 complain(p, "#warning: %s", msg); | |
| 330 if (mode.werror) { | |
| 331 complain_fail(); | |
| 332 } | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
333 dostrfree(msg); |
| 15 | 334 } |
| 335 | |
| 336 static | |
| 337 void | |
| 338 d_error(struct place *p, struct place *p2, char *line, size_t len) | |
| 339 { | |
| 340 char *msg; | |
| 341 | |
| 342 msg = macroexpand(p2, line, len, false); | |
| 343 complain(p, "#error: %s", msg); | |
| 344 complain_fail(); | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
345 dostrfree(msg); |
| 15 | 346 } |
| 347 | |
| 348 //////////////////////////////////////////////////////////// | |
| 349 // other | |
| 350 | |
| 351 static | |
| 352 void | |
| 353 d_pragma(struct place *p, struct place *p2, char *line, size_t len) | |
| 354 { | |
| 355 complain(p, "#pragma %s", line); | |
| 356 complain_fail(); | |
| 357 } | |
| 358 | |
| 359 //////////////////////////////////////////////////////////// | |
| 360 // directive table | |
| 361 | |
| 362 static const struct { | |
| 363 const char *name; | |
| 364 bool ifskip; | |
| 365 void (*func)(struct place *, struct place *, char *line, size_t len); | |
| 366 } directives[] = { | |
| 367 { "define", true, d_define }, | |
| 368 { "elif", false, d_elif }, | |
| 369 { "else", false, d_else }, | |
| 370 { "endif", false, d_endif }, | |
| 371 { "error", true, d_error }, | |
| 372 { "if", false, d_if }, | |
| 373 { "ifdef", false, d_ifdef }, | |
| 374 { "ifndef", false, d_ifndef }, | |
| 375 { "include", true, d_include }, | |
| 376 { "line", true, d_line }, | |
| 377 { "pragma", true, d_pragma }, | |
| 378 { "undef", true, d_undef }, | |
| 379 { "warning", true, d_warning }, | |
| 380 }; | |
| 381 static const unsigned numdirectives = HOWMANY(directives); | |
| 382 | |
| 383 static | |
| 384 void | |
| 385 directive_gotdirective(struct place *p, char *line, size_t linelen) | |
| 386 { | |
| 387 struct place p2; | |
| 388 size_t len, skip; | |
| 389 unsigned i; | |
| 390 | |
| 391 p2 = *p; | |
| 392 for (i=0; i<numdirectives; i++) { | |
| 393 len = strlen(directives[i].name); | |
| 394 if (!strncmp(line, directives[i].name, len) && | |
| 395 strchr(ws, line[len])) { | |
| 396 if (directives[i].ifskip && !ifstate->curtrue) { | |
| 397 return; | |
| 398 } | |
| 399 skip = len + strspn(line+len, ws); | |
| 400 p2.column += skip; | |
| 401 line += skip; | |
| 402 linelen -= skip; | |
| 403 linelen = notrailingws(line, linelen); | |
| 404 directives[i].func(p, &p2, line, linelen); | |
| 405 return; | |
| 406 } | |
| 407 } | |
| 408 skip = strcspn(line, ws); | |
| 409 complain(p, "Unknown directive #%.*s", (int)skip, line); | |
| 410 complain_fail(); | |
| 411 } | |
| 412 | |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
413 /* |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
414 * If desired, warn about a nested comment. The comment begins at |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
415 * offset POS from the place P. |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
416 */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
417 static |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
418 void |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
419 warn_nestcomment(const struct place *p, size_t pos) |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
420 { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
421 struct place p2; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
422 |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
423 if (warns.nestcomment) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
424 p2 = *p; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
425 p2.column += pos; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
426 complain(p, "Warning: %c%c within comment", |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
427 '/', '*'); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
428 if (mode.werror) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
429 complain_failed(); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
430 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
431 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
432 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
433 |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
434 /* |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
435 * Check for comment delimiters in LINE. If a multi-line comment is |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
436 * continuing or ending, set ACOMM to its length. If a multi-line |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
437 * comment is starting, set BCOMM to its length. Set TEXT to the |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
438 * length of text that is not commented out, or that contains comments |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
439 * that both begin and end on this line. ACOMM + TEXT + BCOMM == LEN. |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
440 * |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
441 * Updates in_multiline_comment to the appropriate state for after |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
442 * this line is handled. |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
443 */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
444 static |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
445 size_t |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
446 directive_scancomments(const struct place *p, char *line, size_t len, |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
447 size_t *acomm, size_t *text, size_t *bcomm) |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
448 { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
449 size_t pos; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
450 size_t first_commentend; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
451 size_t last_commentstart; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
452 bool incomment; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
453 |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
454 first_commentend = len; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
455 last_commentstart = len; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
456 incomment = in_multiline_comment; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
457 for (pos = 0; pos+1 < len; pos++) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
458 if (line[pos] == '/' && line[pos+1] == '*') { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
459 if (incomment) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
460 warn_nestcomment(p, pos); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
461 } else { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
462 incomment = true; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
463 last_commentstart = pos; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
464 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
465 } else if (line[pos] == '*' && line[pos+1] == '/') { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
466 if (incomment) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
467 incomment = false; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
468 if (first_commentend == len) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
469 first_commentend = pos; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
470 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
471 last_commentstart = len; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
472 } else { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
473 /* stray end-comment; should we care? */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
474 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
475 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
476 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
477 |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
478 if (in_multiline_comment && first_commentend < last_commentstart) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
479 /* multiline comment ends */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
480 /* first_commentend points to the star, adjust */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
481 *acomm = first_commentend + 2; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
482 *text = len - *acomm; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
483 } else if (in_multiline_comment) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
484 /* comment did not end, so another one cannot have started */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
485 assert(last_commentstart == len); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
486 *acomm = len; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
487 *text = 0; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
488 } else { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
489 *acomm = 0; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
490 *text = len; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
491 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
492 |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
493 *bcomm = len - last_commentstart; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
494 *text -= *bcomm; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
495 |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
496 in_multiline_comment = incomment; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
497 return len; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
498 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
499 |
| 15 | 500 void |
| 501 directive_gotline(struct place *p, char *line, size_t len) | |
| 502 { | |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
503 size_t acomm; /* length of comment ending on this line */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
504 size_t text; /* length of non-multi-line-comment text */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
505 size_t bcomm; /* length of comment beginning on this line */ |
| 15 | 506 size_t skip; |
| 507 | |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
508 directive_scancomments(p, line, len, &acomm, &text, &bcomm); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
509 |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
510 if (acomm > 0) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
511 if (mode.output_retain_comments && ifstate->curtrue) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
512 /* |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
513 * Do not expand the comment; send it straight |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
514 * to the output. This will cause it to appear |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
515 * first if we're partway through collecting a |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
516 * macro argument. Too bad. This isn't a |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
517 * standard mode anyway. |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
518 */ |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
519 output(p, line, acomm); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
520 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
521 p->column += acomm; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
522 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
523 |
| 15 | 524 /* check if we have a directive line */ |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
525 skip = strspn(line + acomm, ws); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
526 if (acomm == 0 && line[skip] == '#') { |
| 15 | 527 skip = skip + 1 + strspn(line + skip + 1, ws); |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
528 assert(skip <= text); |
| 15 | 529 p->column += skip; |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
530 directive_gotdirective(p, line+skip, text-skip); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
531 p->column += text-skip; |
| 15 | 532 } else if (ifstate->curtrue) { |
|
49
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
533 macro_sendline(p, line + acomm, text); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
534 p->column += text; |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
535 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
536 |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
537 if (bcomm > 0) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
538 if (mode.output_retain_comments && ifstate->curtrue) { |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
539 output(p, line + acomm + text, bcomm); |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
540 } |
|
8a204d153398
Intercept multiline comments earlier. Leave same-line comments alone.
David A. Holland
parents:
39
diff
changeset
|
541 p->column += bcomm; |
| 15 | 542 } |
| 543 } | |
| 544 | |
| 545 void | |
| 546 directive_goteof(struct place *p) | |
| 547 { | |
| 548 while (ifstate->prev != NULL) { | |
| 549 complain(p, "Missing #endif"); | |
| 550 complain(&ifstate->startplace, "...opened at this point"); | |
| 551 complain_failed(); | |
| 552 ifstate_pop(); | |
| 553 } | |
| 554 macro_sendeof(p); | |
| 555 } | |
| 556 | |
| 557 //////////////////////////////////////////////////////////// | |
| 558 // module initialization | |
| 559 | |
| 560 void | |
| 561 directive_init(void) | |
| 562 { | |
| 563 ifstate = ifstate_create(NULL, NULL, true); | |
| 564 } | |
| 565 | |
| 566 void | |
| 567 directive_cleanup(void) | |
| 568 { | |
| 569 assert(ifstate->prev == NULL); | |
| 570 ifstate_destroy(ifstate); | |
| 571 ifstate = NULL; | |
| 572 } |