Mercurial > hg > index.cgi
annotate lwcc/cpp.c @ 305:54f213c8fb81 ccdev
Various bugfixes and output tuning
Tuned output of preprocessor to include line markers similar to the ones
added by the gcc preprocessor.
Also, many fixes for various bits of dumbosity leading to misbehaviour and
crashing.
| author | William Astle <lost@l-w.ca> |
|---|---|
| date | Wed, 18 Sep 2013 19:17:52 -0600 |
| parents | d85d173ba120 |
| children | b08787e5b9f3 |
| rev | line source |
|---|---|
| 295 | 1 /* |
| 2 lwcc/cpp.c | |
| 3 | |
| 4 Copyright © 2013 William Astle | |
| 5 | |
| 6 This file is part of LWTOOLS. | |
| 7 | |
| 8 LWTOOLS is free software: you can redistribute it and/or modify it under the | |
| 9 terms of the GNU General Public License as published by the Free Software | |
| 10 Foundation, either version 3 of the License, or (at your option) any later | |
| 11 version. | |
| 12 | |
| 13 This program is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | |
| 16 more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License along with | |
| 19 this program. If not, see <http://www.gnu.org/licenses/>. | |
| 20 */ | |
| 21 | |
| 22 #include <stdarg.h> | |
| 23 #include <stdio.h> | |
| 24 #include <stdlib.h> | |
| 25 #include <string.h> | |
| 26 | |
| 27 #include <lw_alloc.h> | |
| 28 #include <lw_string.h> | |
| 29 | |
| 30 #include "cpp.h" | |
|
304
d85d173ba120
Checkpoint lwcc development - preprocessor is runnable but nonfunctional
William Astle <lost@l-w.ca>
parents:
296
diff
changeset
|
31 #include "strpool.h" |
| 295 | 32 |
| 33 struct token *preproc_lex_next_token(struct preproc_info *); | |
| 34 | |
| 35 struct preproc_info *preproc_init(const char *fn) | |
| 36 { | |
| 37 FILE *fp; | |
| 38 struct preproc_info *pp; | |
| 39 | |
| 40 if (!fn || (fn[0] == '-' && fn[1] == '0')) | |
| 41 { | |
| 42 fp = stdin; | |
| 43 } | |
| 44 else | |
| 45 { | |
| 46 fp = fopen(fn, "rb"); | |
| 47 } | |
| 48 if (!fp) | |
| 49 return NULL; | |
| 50 | |
| 51 pp = lw_alloc(sizeof(struct preproc_info)); | |
| 52 memset(pp, 0, sizeof(struct preproc_info)); | |
|
304
d85d173ba120
Checkpoint lwcc development - preprocessor is runnable but nonfunctional
William Astle <lost@l-w.ca>
parents:
296
diff
changeset
|
53 pp -> strpool = strpool_create(); |
|
d85d173ba120
Checkpoint lwcc development - preprocessor is runnable but nonfunctional
William Astle <lost@l-w.ca>
parents:
296
diff
changeset
|
54 pp -> fn = strpool_strdup(pp -> strpool, fn); |
| 295 | 55 pp -> fp = fp; |
| 56 pp -> ra = CPP_NOUNG; | |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
57 pp -> unget = CPP_NOUNG; |
| 296 | 58 pp -> ppeolseen = 1; |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
59 pp -> lineno = 1; |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
60 pp -> n = NULL; |
| 295 | 61 return pp; |
| 62 } | |
| 63 | |
| 64 struct token *preproc_next_token(struct preproc_info *pp) | |
| 65 { | |
| 66 struct token *t; | |
| 67 | |
| 296 | 68 if (pp -> curtok) |
| 69 token_free(pp -> curtok); | |
| 70 | |
| 71 /* | |
| 72 If there is a list of tokens to process, move it to the "unget" queue | |
| 73 with an EOF marker at the end of it. | |
| 74 */ | |
| 75 if (pp -> sourcelist) | |
| 76 { | |
| 77 for (t = pp -> sourcelist; t -> next; t = t -> next) | |
| 78 /* do nothing */ ; | |
| 79 t -> next = token_create(TOK_EOF, NULL, -1, -1, ""); | |
| 80 t -> next -> next = pp -> tokqueue; | |
| 81 pp -> tokqueue = pp -> sourcelist; | |
| 82 pp -> sourcelist = NULL; | |
| 83 } | |
| 84 again: | |
| 295 | 85 if (pp -> tokqueue) |
| 86 { | |
| 87 t = pp -> tokqueue; | |
| 88 pp -> tokqueue = t -> next; | |
| 89 if (pp -> tokqueue) | |
| 90 pp -> tokqueue -> prev = NULL; | |
| 91 t -> next = NULL; | |
| 92 t -> prev = NULL; | |
| 296 | 93 pp -> curtok = t; |
| 94 goto ret; | |
| 295 | 95 } |
| 296 | 96 pp -> curtok = preproc_lex_next_token(pp); |
| 97 t = pp -> curtok; | |
| 98 ret: | |
| 99 if (t -> ttype == TOK_ENDEXPAND) | |
| 100 { | |
| 101 struct expand_e *e; | |
| 102 e = pp -> expand_list; | |
| 103 pp -> expand_list = e -> next; | |
| 104 lw_free(e); | |
| 105 goto again; | |
| 106 } | |
| 107 return t; | |
| 108 } | |
| 109 | |
| 110 void preproc_unget_token(struct preproc_info *pp, struct token *t) | |
| 111 { | |
| 112 t -> next = pp -> tokqueue; | |
| 113 pp -> tokqueue = t; | |
| 114 if (pp -> curtok == t) | |
| 115 pp -> curtok = NULL; | |
| 295 | 116 } |
| 117 | |
| 118 void preproc_finish(struct preproc_info *pp) | |
| 119 { | |
| 120 fclose(pp -> fp); | |
| 296 | 121 if (pp -> curtok) |
| 122 token_free(pp -> curtok); | |
| 123 while (pp -> tokqueue) | |
| 124 { | |
| 125 preproc_next_token(pp); | |
| 126 token_free(pp -> curtok); | |
| 127 } | |
|
304
d85d173ba120
Checkpoint lwcc development - preprocessor is runnable but nonfunctional
William Astle <lost@l-w.ca>
parents:
296
diff
changeset
|
128 strpool_free(pp -> strpool); |
| 295 | 129 lw_free(pp); |
| 130 } | |
| 131 | |
| 132 void preproc_register_error_callback(struct preproc_info *pp, void (*cb)(const char *)) | |
| 133 { | |
| 134 pp -> errorcb = cb; | |
| 135 } | |
| 136 | |
| 137 void preproc_register_warning_callback(struct preproc_info *pp, void (*cb)(const char *)) | |
| 138 { | |
| 139 pp -> warningcb = cb; | |
| 140 } | |
| 141 | |
| 142 static void preproc_throw_error_default(const char *m) | |
| 143 { | |
| 144 fprintf(stderr, "ERROR: %s\n", m); | |
| 145 } | |
| 146 | |
| 147 static void preproc_throw_warning_default(const char *m) | |
| 148 { | |
| 149 fprintf(stderr, "WARNING: %s\n", m); | |
| 150 } | |
| 151 | |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
152 static void preproc_throw_message(struct preproc_info *pp, void (*cb)(const char *), const char *m, va_list args) |
| 295 | 153 { |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
154 int s, s2; |
| 295 | 155 char *b; |
| 156 | |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
157 s2 = snprintf(NULL, 0, "(%s:%d:%d) ", pp -> fn, pp -> lineno, pp -> column); |
| 295 | 158 s = vsnprintf(NULL, 0, m, args); |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
159 b = lw_alloc(s + s2 + 1); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
160 snprintf(b, s2 + 1, "(%s:%d:%d) ", pp -> fn, pp -> lineno, pp -> column); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
161 vsnprintf(b + s2, s + 1, m, args); |
| 295 | 162 (*cb)(b); |
| 163 lw_free(b); | |
| 164 } | |
| 165 | |
| 166 void preproc_throw_error(struct preproc_info *pp, const char *m, ...) | |
| 167 { | |
| 168 va_list args; | |
| 169 va_start(args, m); | |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
170 preproc_throw_message(pp, pp -> errorcb ? pp -> errorcb : preproc_throw_error_default, m, args); |
| 295 | 171 va_end(args); |
| 172 exit(1); | |
| 173 } | |
| 174 | |
| 175 void preproc_throw_warning(struct preproc_info *pp, const char *m, ...) | |
| 176 { | |
| 177 va_list args; | |
| 178 va_start(args, m); | |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
304
diff
changeset
|
179 preproc_throw_message(pp, pp -> warningcb ? pp -> warningcb : preproc_throw_warning_default, m, args); |
| 295 | 180 va_end(args); |
| 181 } |