Mercurial > hg > index.cgi
annotate lwcc/symbol.c @ 560:dba08c7dff96
Fix off by one handling MOD directive optional arguments
Fixes an off by one in handling the optional arguments to the MOD directive
as of changeset 928c033c0cd0.
Thanks to Alex Evans <varmfskii@gmail.com> for reporting the problem and a
suggested fix. This fix is different but should be more stable should the
rest of the parsing code be refactored in the future.
| author | William Astle <lost@l-w.ca> |
|---|---|
| date | Fri, 22 Sep 2023 12:15:09 -0600 |
| parents | 54f213c8fb81 |
| children |
| rev | line source |
|---|---|
| 296 | 1 /* |
| 2 lwcc/symbol.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 <string.h> | |
| 23 | |
| 24 #include <lw_alloc.h> | |
| 25 #include <lw_string.h> | |
| 26 | |
| 27 #include "cpp.h" | |
| 28 #include "symbol.h" | |
| 29 #include "token.h" | |
| 30 | |
| 31 void symbol_free(struct symtab_e *s) | |
| 32 { | |
| 33 int i; | |
|
299
856caf91ffaa
Added token list structure and switched some stuff to use it
William Astle <lost@l-w.ca>
parents:
296
diff
changeset
|
34 |
| 296 | 35 lw_free(s -> name); |
| 36 | |
| 37 for (i = 0; i < s -> nargs; i++) | |
| 38 lw_free(s -> params[i]); | |
| 39 lw_free(s -> params); | |
|
299
856caf91ffaa
Added token list structure and switched some stuff to use it
William Astle <lost@l-w.ca>
parents:
296
diff
changeset
|
40 token_list_destroy(s -> tl); |
| 296 | 41 } |
| 42 | |
| 43 struct symtab_e *symtab_find(struct preproc_info *pp, char *name) | |
| 44 { | |
| 45 struct symtab_e *s; | |
| 46 | |
| 47 for (s = pp -> sh; s; s = s -> next) | |
| 48 { | |
| 49 if (strcmp(s -> name, name) == 0) | |
| 50 { | |
| 51 return s; | |
| 52 } | |
| 53 } | |
| 54 return NULL; | |
| 55 } | |
| 56 | |
| 57 void symtab_undef(struct preproc_info *pp, char *name) | |
| 58 { | |
| 59 struct symtab_e *s, **p; | |
| 60 | |
| 61 p = &(pp -> sh); | |
| 62 for (s = pp -> sh; s; s = s -> next) | |
| 63 { | |
| 64 if (strcmp(s -> name, name) == 0) | |
| 65 { | |
| 66 (*p) -> next = s -> next; | |
| 67 symbol_free(s); | |
| 68 return; | |
| 69 } | |
| 70 p = &((*p) -> next); | |
| 71 } | |
| 72 } | |
| 73 | |
|
299
856caf91ffaa
Added token list structure and switched some stuff to use it
William Astle <lost@l-w.ca>
parents:
296
diff
changeset
|
74 void symtab_define(struct preproc_info *pp, char *name, struct token_list *def, int nargs, char **params, int vargs) |
| 296 | 75 { |
| 76 struct symtab_e *s; | |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
77 int i; |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
78 |
| 296 | 79 s = lw_alloc(sizeof(struct symtab_e)); |
| 80 s -> name = lw_strdup(name); | |
| 81 s -> tl = def; | |
| 82 s -> nargs = nargs; | |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
83 s -> params = NULL; |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
84 if (params) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
85 { |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
86 s -> params = lw_alloc(sizeof(char *) * nargs); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
87 for (i = 0; i < nargs; i++) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
88 s -> params[i] = lw_strdup(params[i]); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
89 } |
| 296 | 90 s -> vargs = vargs; |
| 91 s -> next = pp -> sh; | |
| 92 pp -> sh = s; | |
| 93 } | |
|
305
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
94 |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
95 void symtab_dump(struct preproc_info *pp) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
96 { |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
97 struct symtab_e *s; |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
98 struct token *t; |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
99 int i; |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
100 |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
101 for (s = pp -> sh; s; s = s -> next) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
102 { |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
103 printf("%s", s -> name); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
104 if (s -> nargs >= 0) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
105 { |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
106 printf("("); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
107 for (i = 0; i < s -> nargs; i++) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
108 { |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
109 if (i) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
110 printf(","); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
111 printf("%s", s -> params[i]); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
112 } |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
113 if (s -> vargs) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
114 { |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
115 if (s -> nargs) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
116 printf(","); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
117 printf("..."); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
118 } |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
119 printf(")"); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
120 } |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
121 printf(" => "); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
122 if (s -> tl) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
123 { |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
124 for (t = s -> tl -> head; t; t = t -> next) |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
125 { |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
126 token_print(t, stdout); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
127 } |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
128 } |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
129 printf("\n"); |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
130 } |
|
54f213c8fb81
Various bugfixes and output tuning
William Astle <lost@l-w.ca>
parents:
299
diff
changeset
|
131 } |