annotate directive.c @ 171:5922e6ca6b80

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